X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Fglx-link-gpaa.c;h=91e5e872579482b31a2dc1fada47271ee09cc0af;hb=bc8909973744d68743a8401ec52afbbc3b0a12a4;hp=2bf73be7c4a16d157e312197b31bad53424938fd;hpb=e90938cac9a539dc00c08b4439298cd05dada442;p=fips

diff --git a/test/glx-link-gpaa.c b/test/glx-link-gpaa.c
index 2bf73be..91e5e87 100644
--- a/test/glx-link-gpaa.c
+++ b/test/glx-link-gpaa.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 /* The OpenGL header files give typedefs for the types of all
  * functions provided by etensisons. Here, though, we're using
@@ -72,8 +72,8 @@ FIPS_GLXMAKECURRENT_FN my_glXMakeCurrent;
 typedef void (*FIPS_GLXSWAPBUFFERS_FN)(Display *, GLXDrawable);
 FIPS_GLXSWAPBUFFERS_FN my_glXSwapBuffers;
 
-#define HANDLE_EVENTS_GL_PREFIX my_
-#include "handle-events.c"
+#define COMMON_GL_PREFIX my_
+#include "common.c"
 
 static void
 resolve_symbols (void)
@@ -150,14 +150,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;
 }