From 405f925d4e5fa74961754af93e7fb309774551cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Fri, 23 Apr 2010 16:56:55 +0100 Subject: [PATCH] sw/xlib: Fallback to XPutImage when shmget fails. After continuously running regression tests on Ubuntu for 2 days, shmget mysteriously starts to fail. Even when the X server is reset. This allow rendering to proceed, albeit using a slower presentation path. --- src/gallium/winsys/sw/xlib/xlib_sw_winsys.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c index ec4f919d082..278a191a0e5 100644 --- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c +++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c @@ -385,13 +385,12 @@ xm_displaytarget_create(struct sw_winsys *winsys, if (!debug_get_bool_option("XLIB_NO_SHM", FALSE)) { - xm_dt->shminfo.shmid = -1; - xm_dt->shminfo.shmaddr = (char *) -1; - xm_dt->shm = TRUE; - xm_dt->data = alloc_shm(xm_dt, size); - if(!xm_dt->data) - goto no_data; + if(!xm_dt->data) { + xm_dt->shminfo.shmid = -1; + xm_dt->shminfo.shmaddr = (char *) -1; + xm_dt->shm = TRUE; + } } if(!xm_dt->data) { -- 2.30.2