X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Fglx-link-gpaa.c;h=266c564cbecbaabccc2185eee2930e2035d35b5b;hb=6dcb864fcfa77c4bf4eb7e1c04f00e53f9fee446;hp=d25d295800443653ddf440ad36d884a362e553a8;hpb=ddd77c29412866e8567aeff1951e6e010b3676bf;p=fips

diff --git a/test/glx-link-gpaa.c b/test/glx-link-gpaa.c
index d25d295..266c564 100644
--- a/test/glx-link-gpaa.c
+++ b/test/glx-link-gpaa.c
@@ -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;
 
@@ -90,24 +81,6 @@ resolve_symbols (void)
 		exit (1);
 	}
 
-	my_glLoadIdentity = (FIPS_GLLOADIDENTITY_FN) glXGetProcAddressARB ((GLubyte*) "glLoadIdentity");
-	if (my_glLoadIdentity == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddressARB glLoadIdentity\n");
-		exit (1);
-	}
-
-	my_glMatrixMode = (FIPS_GLMATRIXMODE_FN) glXGetProcAddressARB ((GLubyte*) "glMatrixMode");
-	if (my_glMatrixMode == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddressARB glMatrixMode\n");
-		exit (1);
-	}
-
-	my_glOrtho = (FIPS_GLORTHO_FN) glXGetProcAddressARB ((GLubyte*) "glOrtho");
-	if (my_glOrtho == NULL) {
-		fprintf (stderr, "Failed to glXGetProcAddressARB glOrtho\n");
-		exit (1);
-	}
-
 	my_glViewport = (FIPS_GLVIEWPORT_FN) glXGetProcAddressARB ((GLubyte*) "glViewport");
 	if (my_glViewport == NULL) {
 		fprintf (stderr, "Failed to glXGetProcAddressARB glViewport\n");
@@ -157,11 +130,13 @@ main (void)
 
 	dpy = util_x11_init_display ();
 
-	common_create_context (dpy, &ctx, &visual_info);
+	common_create_glx_context (dpy, &ctx, &visual_info);
 
 	window = util_x11_init_window (dpy, visual_info);
 
-        common_handle_events (dpy, ctx, window);
+	common_make_current (dpy, ctx, window);
+
+        common_handle_events (dpy, dpy, window);
 
 	util_x11_fini_window (dpy, window);