X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Fglx-dlopen-dlsym.c;h=76749155d5755d4d3663bd56f57138dd9c07461a;hb=ddd77c29412866e8567aeff1951e6e010b3676bf;hp=a2a6f5dcfd5eb2ac030646e0d42238faf8b2b4f8;hpb=8fa551a77e6586167ee9ad4d331411aecc36af84;p=fips

diff --git a/test/glx-dlopen-dlsym.c b/test/glx-dlopen-dlsym.c
index a2a6f5d..7674915 100644
--- a/test/glx-dlopen-dlsym.c
+++ b/test/glx-dlopen-dlsym.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 void (*my_glClear) (GLbitfield);
 void (*my_glClearColor) (GLclampf, GLclampf, GLclampf, GLclampf);
@@ -48,8 +48,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)
@@ -149,14 +149,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 ();
+
+	common_create_context (dpy, &ctx, &visual_info);
+
+	window = util_x11_init_window (dpy, visual_info);
+
+        common_handle_events (dpy, ctx, window);
+
+	util_x11_fini_window (dpy, window);
 
-	util_fini_display_window (dpy, window);
+	util_x11_fini_display (dpy);
 
         return 0;
 }