summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-04-16 05:55:34 -0400
committerKeith Packard <keithp@keithp.com>2010-04-16 14:53:31 -0700
commit1da1f33f2dd5b437dd56cd9f5d6782de4ad5a1bc (patch)
treedea02f3ee4902efb1118c0c8cba422edbe753712 /glx
parent22da7aa9d743deee198aaf6df5d370a446db9763 (diff)
DRI2: Track DRI2 drawables as resources, not privates
The main motivation here is to have the resource system clean up the DRI2 drawable automatically so glx doesn't have to. Right now, the glx drawable resource must be destroyed before the X drawable, so that calling DRI2DestroyDrawable doesn't crash. By making the DRI2 drawable a resource, GLX doesn't have to worry about that and the resource destruction order becomes irrelevant. https://bugs.freedesktop.org/show_bug.cgi?id=26394 Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'glx')
-rw-r--r--glx/glxdri2.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 4c9f381c6..74d6ebc5d 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -105,11 +105,6 @@ __glXDRIdrawableDestroy(__GLXdrawable *drawable)
(*core->destroyDrawable)(private->driDrawable);
- /* If the X window was destroyed, the dri DestroyWindow hook will
- * aready have taken care of this, so only call if pDraw isn't NULL. */
- if (drawable->pDraw != NULL)
- DRI2DestroyDrawable(drawable->pDraw);
-
__glXDrawableRelease(drawable);
xfree(private);