94 lines
3.4 KiB
Diff
94 lines
3.4 KiB
Diff
From 070319e6e49f762ccaba06c7241c00e4afcb7c05 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Wed, 30 Mar 2011 16:03:53 -0400
|
|
Subject: [PATCH 8/9] glx: Fix lifetime tracking for pixmaps
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
glx/glxcmds.c | 11 +++++++----
|
|
glx/glxext.c | 22 +++++++++++++---------
|
|
2 files changed, 20 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
|
|
index 66d4c7e..d5b764f 100644
|
|
--- a/glx/glxcmds.c
|
|
+++ b/glx/glxcmds.c
|
|
@@ -1127,10 +1127,11 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen *pGlxScreen,
|
|
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;
|
|
@@ -1161,6 +1162,8 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config
|
|
err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId,
|
|
glxDrawableId, GLX_DRAWABLE_PIXMAP);
|
|
|
|
+ ((PixmapPtr)pDraw)->refcnt++;
|
|
+
|
|
return err;
|
|
}
|
|
|
|
diff --git a/glx/glxext.c b/glx/glxext.c
|
|
index 3f3dd79..9cfc096 100644
|
|
--- a/glx/glxext.c
|
|
+++ b/glx/glxext.c
|
|
@@ -118,15 +118,15 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
|
|
{
|
|
__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) {
|
|
@@ -143,6 +143,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
|
|
c->readPriv = NULL;
|
|
}
|
|
|
|
+ /* 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;
|
|
--
|
|
1.7.4.4
|
|
|