glwrap: Don't hardcode "libGL.so.1" for looking up real OpenGL symbols

[fips] / test / glx-dlopen-gpaa.c

diff --git a/test/glx-dlopen-gpaa.c b/test/glx-dlopen-gpaa.c
index b4aea47a0a7be1531857cb1d7a83f3a17fb4cdca..61129a187968fcb0d4a9a41f8e5202d77ad9adb0 100644 (file)
--- a/test/glx-dlopen-gpaa.c
+++ b/test/glx-dlopen-gpaa.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 void* (*my_glXGetProcAddressARB) (char *);
 void (*my_glClear) (GLbitfield);
@@ -49,8 +49,8 @@ void (*my_glXDestroyContext) (Display *, GLXContext);
 Bool (*my_glXMakeCurrent) (Display *, GLXDrawable, GLXContext);
 void (*my_glXSwapBuffers) (Display *, GLXDrawable);
 
-#define HANDLE_EVENTS_GL_PREFIX my_
-#include "handle-events.c"
+#define COMMON_GL_PREFIX my_
+#include "common.c"
 
 static void
 resolve_symbols (void)
@@ -146,14 +146,24 @@ main (void)
 {
         Display *dpy;
         Window window;
-
-       util_init_display_window (&dpy, &window);
+       GLXContext ctx;
+       XVisualInfo *visual_info;
 
        resolve_symbols ();
 
-        handle_events (dpy, window);
+       dpy = util_x11_init_display ();
+
+       common_create_glx_context (dpy, &ctx, &visual_info);
+
+       window = util_x11_init_window (dpy, visual_info);
+
+       common_make_current (dpy, ctx, window);
+
+        common_handle_events (dpy, dpy, window);
+
+       util_x11_fini_window (dpy, window);
 
-       util_fini_display_window (dpy, window);
+       util_x11_fini_display (dpy);
 
         return 0;
 }