progs/xdemos: fix up GLX extension checking

A few of my programs were using the client string in addition to the
main extensions string to see if a feature was present.  Correct this to
only check for the currently available and working extensions.

1 files changed, 2 insertions, 9 deletions

diff --git a/progs/xdemos/glsync.c b/progs/xdemos/glsync.c
index c00ba9e4687..3751373e23b 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);
 	}