diff options
author | Brian Paul <brianp@vmware.com> | 2009-10-08 09:28:07 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-10-08 09:28:07 -0600 |
commit | f67bc2e87255298ac22e8ccd98f482cc62d0ec26 (patch) | |
tree | c529b62cd2febd8ebab70ecf6a5df54a53b2ef72 /src/gallium/state_trackers | |
parent | f7455ad7af09b5ef31ccc454b79422a13c59af9a (diff) | |
parent | f7fb30f03badf7f3ac5d66e87acb8cbb1c5aee0b (diff) | |
download | external_mesa3d-f67bc2e87255298ac22e8ccd98f482cc62d0ec26.zip external_mesa3d-f67bc2e87255298ac22e8ccd98f482cc62d0ec26.tar.gz external_mesa3d-f67bc2e87255298ac22e8ccd98f482cc62d0ec26.tar.bz2 |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/common/meta.c
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | 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 */ } |