From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 23 Apr 2010 15:56:55 +0000 (+0100)
Subject: sw/xlib: Fallback to XPutImage when shmget fails.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=405f925d4e5fa74961754af93e7fb309774551cc;p=mesa.git

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.
---

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) {