Import Mesa 11.2.2

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/mesa/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/lib/mesa/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
index 515ecd9f7..875313910 100644
--- a/lib/mesa/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
+++ b/lib/mesa/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
@@ -268,7 +268,7 @@ xlib_displaytarget_destroy(struct sw_winsys *ws,
             xlib_dt->tempImage->data = NULL;
       }
       else {
-         FREE(xlib_dt->data);
+         align_free(xlib_dt->data);
          if (xlib_dt->tempImage && xlib_dt->tempImage->data == xlib_dt->data) {
             xlib_dt->tempImage->data = NULL;
          }
@@ -391,6 +391,7 @@ xlib_displaytarget_create(struct sw_winsys *winsys,
                           enum pipe_format format,
                           unsigned width, unsigned height,
                           unsigned alignment,
+                          const void *front_private,
                           unsigned *stride)
 {
    struct xlib_displaytarget *xlib_dt;