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

diff --git a/test/glx-dlopen-dlsym.c b/test/glx-dlopen-dlsym.c
index a2a6f5d..dd61523 100644
--- a/test/glx-dlopen-dlsym.c
+++ b/test/glx-dlopen-dlsym.c
@@ -34,13 +34,10 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 void (*my_glClear) (GLbitfield);
 void (*my_glClearColor) (GLclampf, GLclampf, GLclampf, GLclampf);
-void (*my_glLoadIdentity) (void);
-void (*my_glMatrixMode) (GLenum);
-void (*my_glOrtho) (GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
 void (*my_glViewport) (GLint, GLint, GLsizei, GLsizei);
 XVisualInfo * (*my_glXChooseVisual) (Display *, int, int *);
 GLXContext (*my_glXCreateContext) (Display *, XVisualInfo *, GLXContext, Bool);
@@ -48,8 +45,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)
@@ -80,27 +77,6 @@ resolve_symbols (void)
 		exit (1);
 	}
 
-	my_glLoadIdentity = dlsym (gl_handle, "glLoadIdentity");
-	error = dlerror ();
-	if (error) {
-		fprintf (stderr, "Failed to dlsym glLoadIdentity: %s\n", error);
-		exit (1);
-	}
-
-	my_glMatrixMode = dlsym (gl_handle, "glMatrixMode");
-	error = dlerror ();
-	if (error) {
-		fprintf (stderr, "Failed to dlsym glMatrixMode: %s\n", error);
-		exit (1);
-	}
-
-	my_glOrtho = dlsym (gl_handle, "glOrtho");
-	error = dlerror ();
-	if (error) {
-		fprintf (stderr, "Failed to dlsym glOrtho: %s\n", error);
-		exit (1);
-	}
-
 	my_glViewport = dlsym (gl_handle, "glViewport");
 	error = dlerror ();
 	if (error) {
@@ -149,14 +125,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;
 }