util-x11: Rework init_window interface to accept XVisualInfo

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

diff --git a/test/glx-dlopen-gpa.c b/test/glx-dlopen-gpa.c
index 3c2c325e874919069b67773d834b262315943cc4..49717944c8553d23606482c95900b899640d1a8a 100644 (file)
--- a/test/glx-dlopen-gpa.c
+++ b/test/glx-dlopen-gpa.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 void* (*my_glXGetProcAddress) (char *);
 void (*my_glClear) (GLbitfield);
@@ -146,14 +146,22 @@ 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 ();
+
+       create_context (dpy, &ctx, &visual_info);
+
+       window = util_x11_init_window (dpy, visual_info);
+
+        handle_events (dpy, ctx, window);
+
+       util_x11_fini_window (dpy, window);
 
-       util_fini_display_window (dpy, window);
+       util_x11_fini_display (dpy);
 
         return 0;
 }