summaryrefslogtreecommitdiff
path: root/src/glx/dri2.c
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-07-22 21:11:02 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-07-22 21:11:20 -0400
commitab434f6b7641a64d30725a9ac24929240362d466 (patch)
tree239ee2ff7b3078f5af5fd17b25f3cfec991af5e2 /src/glx/dri2.c
parentc20a3628c7c6b7c41efe309b712bf93eb4e92039 (diff)
glx: Use _Xglobal_lock for protecting extension display list
Avoids double locking glXLock in the X wire to event handlers.
Diffstat (limited to 'src/glx/dri2.c')
-rw-r--r--src/glx/dri2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index ab530baf0f..d53431c19a 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -88,7 +88,7 @@ static Bool
DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
- XExtDisplayInfo *glx_info = __glXFindDisplay(dpy);
+ __GLXdisplayPrivate *glx_dpy = __glXInitialize(dpy);
XextCheckExtension(dpy, info, dri2ExtensionName, False);
@@ -107,7 +107,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
return False;
aevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *) wire);
- aevent->type = glx_info->codes->first_event + GLX_BufferSwapComplete;
+ aevent->type = glx_dpy->codes->first_event + GLX_BufferSwapComplete;
aevent->send_event = (awire->type & 0x80) != 0;
aevent->display = dpy;
aevent->drawable = awire->drawable;