Mesa (mesa_7_6_branch): gallium/xlib: call XQueryExtension() in glXQueryExtension()

[Brian Paul]

Module: Mesa
Branch: mesa_7_6_branch
Commit: ee3fbe70672f32ae598a0005e027a6883a130e7b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee3fbe70672f32ae598a0005e027a6883a130e7b

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Oct  7 14:43:27 2009 -0600

gallium/xlib: call XQueryExtension() in glXQueryExtension()

See bug 24321.

---

 src/gallium/state_trackers/glx/xlib/glx_api.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 556eefb..f2881b9 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -1311,13 +1311,15 @@ glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
 Bool
 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 */
 }