fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 08:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: Don't use __glXInitialize() when we might be holding __glXLock()

Browse source
This commit is contained in:
Kristian Høgsberg 2010-07-19 21:00:09 -04:00
parent 8d0228912b
commit 037755122e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/glx/dri2_glx.c
View file

@ -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);

2
src/glx/glxclient.h
View file

@ -523,6 +523,8 @@ struct __GLXscreenConfigsRec
*/
const struct glx_context_vtable *direct_context_vtable;
__GLXdisplayPrivate *display;
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
/**
* Per screen direct rendering interface functions and data.

1
src/glx/glxext.c
View file

@ -759,6 +759,7 @@ glx_screen_init(__GLXscreenConfigs *psc,
psc->scr = screen;
psc->dpy = priv->dpy;
psc->drawHash = __glxHashCreate();
psc->display = priv;
if (psc->drawHash == NULL)
return GL_FALSE;