Attachment 527869 Details for Bug 807205

[patch] Proposed fix

llvmpip-shmget-fix.patch (text/plain), 1.21 KB, created by Stefan Brüns on 2013-03-03 21:35:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Brüns

Created: 2013-03-03 21:35:16 UTC

Size: 1.21 KB

patch

obsolete

>diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
>index cf45ffd..6c47031 100644
>--- a/src/glx/drisw_glx.c
>+++ b/src/glx/drisw_glx.c
>@@ -209,7 +209,7 @@ swrastPutImage(__DRIdrawable * draw, int op,
>    ximage->data = NULL;
> }
> 
>-static int shm_error;
>+static int shm_error = 0;
> 
> static int
> shm_handler(Display *d, XErrorEvent *e)
>@@ -243,7 +243,7 @@ swrastShmGetImage(__DRIdrawable *read, char *data, struct drisw_drawable *prp)
>     XShmSegmentInfo seg = { 0, -1, (void *)-1, 0 };
>     int (*old_handler)(Display *, XErrorEvent *);
> 
>-    if (!XShmQueryExtension(dpy))
>+    if (shm_error || !XShmQueryExtension(dpy))
> 	goto out;
> 
>     /* image setup */
>@@ -290,8 +290,8 @@ swrastShmGetImage(__DRIdrawable *read, char *data, struct drisw_drawable *prp)
> out:
>     ximage->obdata = NULL;
>     ximage->data = NULL;
>-    shm_error = 0;
>-    XShmDetach(dpy, &seg);
>+    if (shm_error == 0) 
>+	XShmDetach(dpy, &seg);
>     if (seg.shmaddr != (void *)-1)
> 	shmdt(seg.shmaddr);
>     if (seg.shmid > -1)
>@@ -322,6 +322,7 @@ swrastGetImage(__DRIdrawable * read,
>       return;
> 
>    /* shm failed, fall back to protocol */
>+   XSync(dpy, 0);
>    ximage->data = data;
> 
>    XGetSubImage(dpy, readable, x, y, w, h, ~0L, ZPixmap, ximage, 0, 0);

Actions: View | Diff

Attachments on bug 807205: 527869