X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Fglx-dlopen-gpa.c;h=902802368d02878f6a60cac24d755b24ed7959ed;hb=HEAD;hp=3c2c325e874919069b67773d834b262315943cc4;hpb=8fa551a77e6586167ee9ad4d331411aecc36af84;p=fips

diff --git a/test/glx-dlopen-gpa.c b/test/glx-dlopen-gpa.c
index 3c2c325..9028023 100644
--- a/test/glx-dlopen-gpa.c
+++ b/test/glx-dlopen-gpa.c
@@ -34,14 +34,11 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "util.h"
+#include "util-x11.h"
 
 void* (*my_glXGetProcAddress) (char *);
 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);
@@ -49,8 +46,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)
@@ -86,24 +83,6 @@ resolve_symbols (void)
 		exit (1);
 	}
 
-	my_glLoadIdentity = my_glXGetProcAddress ("glLoadIdentity");
-	if (my_glLoadIdentity == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddress glLoadIdentity\n");
-		exit (1);
-	}
-
-	my_glMatrixMode = my_glXGetProcAddress ("glMatrixMode");
-	if (my_glMatrixMode == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddress glMatrixMode\n");
-		exit (1);
-	}
-
-	my_glOrtho = my_glXGetProcAddress ("glOrtho");
-	if (my_glOrtho == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddress glOrtho\n");
-		exit (1);
-	}
-
 	my_glViewport = my_glXGetProcAddress ("glViewport");
 	if (my_glViewport == NULL) {
 		fprintf (stderr, "Failed to glXGetProcAddress glViewport\n");
@@ -146,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;
 }