From 276c123614e8ee639e26a6b013df2c6726761b8d Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 22 Nov 2015 02:41:51 +0000 Subject: import Mesa 11.0.6 --- lib/mesa/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/mesa/src/gallium') 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 a4c1d5045..515ecd9f7 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 { - align_free(xlib_dt->data); + FREE(xlib_dt->data); if (xlib_dt->tempImage && xlib_dt->tempImage->data == xlib_dt->data) { xlib_dt->tempImage->data = NULL; } @@ -391,12 +391,10 @@ 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; unsigned nblocksy, size; - int ignore; xlib_dt = CALLOC_STRUCT(xlib_displaytarget); if (!xlib_dt) @@ -411,8 +409,7 @@ xlib_displaytarget_create(struct sw_winsys *winsys, xlib_dt->stride = align(util_format_get_stride(format, width), alignment); size = xlib_dt->stride * nblocksy; - if (!debug_get_option_xlib_no_shm() && - XQueryExtension(xlib_dt->display, "MIT-SHM", &ignore, &ignore, &ignore)) { + if (!debug_get_option_xlib_no_shm()) { xlib_dt->data = alloc_shm(xlib_dt, size); if (xlib_dt->data) { xlib_dt->shm = True; -- cgit v1.2.3