diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-09 11:02:37 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-09 11:02:37 +0000 |
| commit | 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330 (patch) | |
| tree | eb8aa86b722ac91c775042bd84e152c29970529c /progs/xdemos/glsync.c | |
| parent | 95c5c69b505f562b61e23fa7dd500dbdd432a70d (diff) | |
| parent | 6f4ce4a4fed9f0f0f0ee89a63e406ab86dae7150 (diff) | |
Merge commit 'origin/master' into gallium-sw-api-2
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_winsys.h
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/egl/x11/native_ximage.c
Diffstat (limited to 'progs/xdemos/glsync.c')
| -rw-r--r-- | progs/xdemos/glsync.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/progs/xdemos/glsync.c b/progs/xdemos/glsync.c index c00ba9e468..3751373e23 100644 --- a/progs/xdemos/glsync.c +++ b/progs/xdemos/glsync.c @@ -63,10 +63,9 @@ void (*swap_interval)(); static int GLXExtensionSupported(Display *dpy, const char *extension) { - const char *extensionsString, *client_extensions, *pos; + const char *extensionsString, *pos; extensionsString = glXQueryExtensionsString(dpy, DefaultScreen(dpy)); - client_extensions = glXGetClientString(dpy, GLX_EXTENSIONS); pos = strstr(extensionsString, extension); @@ -74,12 +73,6 @@ static int GLXExtensionSupported(Display *dpy, const char *extension) (pos[strlen(extension)] == ' ' || pos[strlen(extension)] == '\0')) return 1; - pos = strstr(client_extensions, extension); - - if (pos != NULL && (pos == extensionsString || pos[-1] == ' ') && - (pos[strlen(extension)] == ' ' || pos[strlen(extension)] == '\0')) - return 1; - return 0; } @@ -235,7 +228,7 @@ int main(int argc, char *argv[]) XMapWindow(disp, winGL); ret = glXMakeCurrent(disp, winGL, context); - if (ret) { + if (!ret) { fprintf(stderr, "failed to make context current: %d\n", ret); } |