summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-08 09:28:07 -0600
committerBrian Paul <brianp@vmware.com>2009-10-08 09:28:07 -0600
commitf67bc2e87255298ac22e8ccd98f482cc62d0ec26 (patch)
treec529b62cd2febd8ebab70ecf6a5df54a53b2ef72 /src/mesa/drivers/x11
parentf7455ad7af09b5ef31ccc454b79422a13c59af9a (diff)
parentf7fb30f03badf7f3ac5d66e87acb8cbb1c5aee0b (diff)
Merge branch 'mesa_7_6_branch'
Conflicts: src/mesa/drivers/common/meta.c
Diffstat (limited to 'src/mesa/drivers/x11')
-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 525db3b7cb7..5c0084f37aa 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 */
}