X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Fglx-link-gpa.c;h=3b19b1ee95ab9d6da295525e1d1eb2259dcf9863;hb=0c8d32dabf4cec6957dfb4c071ecdb2fb4e4cd0e;hp=04e5eb96cfc83d239721ccd1c66baca7c969fcee;hpb=e90938cac9a539dc00c08b4439298cd05dada442;p=fips

diff --git a/test/glx-link-gpa.c b/test/glx-link-gpa.c
index 04e5eb9..3b19b1e 100644
--- a/test/glx-link-gpa.c
+++ b/test/glx-link-gpa.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
@@ -45,15 +45,6 @@ FIPS_GLCLEAR_FN my_glClear;
 typedef void (*FIPS_GLCLEARCOLOR_FN)(GLclampf, GLclampf, GLclampf, GLclampf);
 FIPS_GLCLEARCOLOR_FN my_glClearColor;
 
-typedef void (*FIPS_GLLOADIDENTITY_FN)(void);
-FIPS_GLLOADIDENTITY_FN my_glLoadIdentity;
-
-typedef void (*FIPS_GLMATRIXMODE_FN)(GLenum);
-FIPS_GLMATRIXMODE_FN my_glMatrixMode;
-
-typedef void (*FIPS_GLORTHO_FN)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
-FIPS_GLORTHO_FN my_glOrtho;
-
 typedef void (*FIPS_GLVIEWPORT_FN)(GLint, GLint, GLsizei, GLsizei);
 FIPS_GLVIEWPORT_FN my_glViewport;
 
@@ -72,8 +63,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)
@@ -90,24 +81,6 @@ resolve_symbols (void)
 		exit (1);
 	}
 
-	my_glLoadIdentity = (FIPS_GLLOADIDENTITY_FN) glXGetProcAddress ((GLubyte*) "glLoadIdentity");
-	if (my_glLoadIdentity == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddress glLoadIdentity\n");
-		exit (1);
-	}
-
-	my_glMatrixMode = (FIPS_GLMATRIXMODE_FN) glXGetProcAddress ((GLubyte*) "glMatrixMode");
-	if (my_glMatrixMode == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddress glMatrixMode\n");
-		exit (1);
-	}
-
-	my_glOrtho = (FIPS_GLORTHO_FN) glXGetProcAddress ((GLubyte*) "glOrtho");
-	if (my_glOrtho == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddress glOrtho\n");
-		exit (1);
-	}
-
 	my_glViewport = (FIPS_GLVIEWPORT_FN) glXGetProcAddress ((GLubyte*) "glViewport");
 	if (my_glViewport == NULL) {
 		fprintf (stderr, "Failed to glXGetProcAddress glViewport\n");
@@ -150,14 +123,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;
 }