summaryrefslogtreecommitdiff
path: root/src/glx/dri2_glx.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-07-19 21:00:09 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-07-19 22:45:51 -0400
commit037755122e9011c768e5caa4d4cb83aba783d3e9 (patch)
tree9191eec52cd546d61391fee90a2d6035c0720366 /src/glx/dri2_glx.c
parent8d0228912bfef173139296a96a097f1a6348c963 (diff)
glx: Don't use __glXInitialize() when we might be holding __glXLock()
Diffstat (limited to 'src/glx/dri2_glx.c')
-rw-r--r--src/glx/dri2_glx.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 032d620a34..6ac03cf0cf 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -186,11 +186,8 @@ dri2DestroyDrawable(__GLXDRIdrawable *base)
{
struct dri2_screen *psc = (struct dri2_screen *) base->psc;
struct dri2_drawable *pdraw = (struct dri2_drawable *) base;
- __GLXdisplayPrivate *dpyPriv;
- struct dri2_display *pdp;
-
- dpyPriv = __glXInitialize(base->psc->dpy);
- pdp = (struct dri2_display *)dpyPriv->dri2Display;
+ __GLXdisplayPrivate *dpyPriv = psc->base.display;
+ struct dri2_display *pdp = (struct dri2_display *)dpyPriv->dri2Display;
__glxHashDelete(pdp->dri2Hash, pdraw->base.xDrawable);
(*psc->core->destroyDrawable) (pdraw->driDrawable);