util-x11: Rework init_window interface to accept XVisualInfo

[fips] / test / glx-link-call.c

diff --git a/test/glx-link-call.c b/test/glx-link-call.c
index c5f8eb46d25fba4d106b88172b885994f0d8283c..46cb563ce47ad681d40eb2d26da0e34186ad0d84 100644 (file)
--- a/test/glx-link-call.c
+++ b/test/glx-link-call.c
@@ -30,7 +30,7 @@
 #include <GL/gl.h>
 #include <GL/glx.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 #define HANDLE_EVENTS_GL_PREFIX
 #include "handle-events.c"
@@ -40,12 +40,20 @@ main (void)
 {
         Display *dpy;
         Window window;
+       GLXContext ctx;
+       XVisualInfo *visual_info;
 
-       util_init_display_window (&dpy, &window);
+       dpy = util_x11_init_display ();
 
-        handle_events (dpy, window);
+       create_context (dpy, &ctx, &visual_info);
 
-       util_fini_display_window (dpy, window);
+       window = util_x11_init_window (dpy, visual_info);
+
+        handle_events (dpy, ctx, window);
+
+       util_x11_fini_window (dpy, window);
+
+       util_x11_fini_display (dpy);
 
         return 0;
 }