From 037755122e9011c768e5caa4d4cb83aba783d3e9 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Mon, 19 Jul 2010 21:00:09 -0400 Subject: glx: Don't use __glXInitialize() when we might be holding __glXLock() --- src/glx/dri2_glx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/glx/dri2_glx.c') 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); -- cgit v1.2.3