forked from pool/xorg-x11-server
84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
|
From 6a433b67ca15fd1ea58334e607f867554f227451 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Jackson <ajax@redhat.com>
|
||
|
|
Date: Mon, 28 Mar 2011 16:30:09 +0000
|
||
|
|
Subject: glx: Fix lifetime tracking for pixmaps
|
||
|
|
|
||
|
|
GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap
|
||
|
|
IDs can be destroyed in either order with no error. Only windows need
|
||
|
|
to be tracked under both XIDs.
|
||
|
|
|
||
|
|
Fixes piglit/glx-pixmap-life.
|
||
|
|
|
||
|
|
Reviewed-by: Michel Dänzer <michel@daenzer.net>
|
||
|
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||
|
|
---
|
||
|
|
Index: xorg-server-1.9.3/glx/glxcmds.c
|
||
|
|
===================================================================
|
||
|
|
--- xorg-server-1.9.3.orig/glx/glxcmds.c
|
||
|
|
+++ xorg-server-1.9.3/glx/glxcmds.c
|
||
|
|
@@ -1132,10 +1132,11 @@ DoCreateGLXDrawable(ClientPtr client, __
|
||
|
|
return BadAlloc;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Add the glx drawable under the XID of the underlying X drawable
|
||
|
|
- * too. That way we'll get a callback in DrawableGone and can
|
||
|
|
- * clean up properly when the drawable is destroyed. */
|
||
|
|
- if (drawableId != glxDrawableId &&
|
||
|
|
+ /*
|
||
|
|
+ * Windows aren't refcounted, so track both the X and the GLX window
|
||
|
|
+ * so we get called regardless of destruction order.
|
||
|
|
+ */
|
||
|
|
+ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW &&
|
||
|
|
!AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) {
|
||
|
|
pGlxDraw->destroy (pGlxDraw);
|
||
|
|
return BadAlloc;
|
||
|
|
@@ -1166,6 +1167,8 @@ DoCreateGLXPixmap(ClientPtr client, __GL
|
||
|
|
err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId,
|
||
|
|
glxDrawableId, GLX_DRAWABLE_PIXMAP);
|
||
|
|
|
||
|
|
+ ((PixmapPtr)pDraw)->refcnt++;
|
||
|
|
+
|
||
|
|
return err;
|
||
|
|
}
|
||
|
|
|
||
|
|
Index: xorg-server-1.9.3/glx/glxext.c
|
||
|
|
===================================================================
|
||
|
|
--- xorg-server-1.9.3.orig/glx/glxext.c
|
||
|
|
+++ xorg-server-1.9.3/glx/glxext.c
|
||
|
|
@@ -126,15 +126,15 @@ static Bool DrawableGone(__GLXdrawable *
|
||
|
|
{
|
||
|
|
__GLXcontext *c, *next;
|
||
|
|
|
||
|
|
- /* If this drawable was created using glx 1.3 drawable
|
||
|
|
- * constructors, we added it as a glx drawable resource under both
|
||
|
|
- * its glx drawable ID and it X drawable ID. Remove the other
|
||
|
|
- * resource now so we don't a callback for freed memory. */
|
||
|
|
- if (glxPriv->drawId != glxPriv->pDraw->id) {
|
||
|
|
- if (xid == glxPriv->drawId)
|
||
|
|
- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
|
||
|
|
- else
|
||
|
|
- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
|
||
|
|
+ if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
|
||
|
|
+ /* If this was created by glXCreateWindow, free the matching resource */
|
||
|
|
+ if (glxPriv->drawId != glxPriv->pDraw->id) {
|
||
|
|
+ if (xid == glxPriv->drawId)
|
||
|
|
+ FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
|
||
|
|
+ else
|
||
|
|
+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
|
||
|
|
+ }
|
||
|
|
+ /* otherwise this window was implicitly created by MakeCurrent */
|
||
|
|
}
|
||
|
|
|
||
|
|
for (c = glxAllContexts; c; c = next) {
|
||
|
|
@@ -170,6 +170,10 @@ static Bool DrawableGone(__GLXdrawable *
|
||
|
|
__glXFreeContext(c);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* drop our reference to any backing pixmap */
|
||
|
|
+ if (glxPriv->type == GLX_DRAWABLE_PIXMAP)
|
||
|
|
+ glxPriv->pDraw->pScreen->DestroyPixmap((PixmapPtr)glxPriv->pDraw);
|
||
|
|
+
|
||
|
|
glxPriv->destroy(glxPriv);
|
||
|
|
|
||
|
|
return True;
|