summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-07 14:42:14 -0600
committerBrian Paul <brianp@vmware.com>2009-10-07 14:42:16 -0600
commit9f002e4aaa2d7ea085cd0a3c66ff0fa533905382 (patch)
tree2e900b0eb51ecbc82e7bae6d5af6fd41732248eb /src
parent7dd2c0afd68a90bb6b1f5f030c8d60bf6a562071 (diff)
mesa/xlib: call XQueryExtension() in glXQueryExtension()
See bug 24321.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 525db3b7cb..5c0084f37a 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1639,13 +1639,15 @@ Fake_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
static Bool
Fake_glXQueryExtension( Display *dpy, int *errorBase, int *eventBase )
{
+ int op, ev, err;
/* Mesa's GLX isn't really an X extension but we try to act like one. */
- (void) dpy;
+ if (!XQueryExtension(dpy, GLX_EXTENSION_NAME, &op, &ev, &err))
+ ev = err = 0;
if (errorBase)
- *errorBase = 0;
+ *errorBase = err;
if (eventBase)
- *eventBase = 0;
- return True;
+ *eventBase = ev;
+ return True; /* we're faking GLX so always return success */
}