Re-enable termination message at exit.

[fips] / test / glx-link-gpaa.c

diff --git a/test/glx-link-gpaa.c b/test/glx-link-gpaa.c
index 7def0d821bd27f8643a93654b2f18254b18c2071..266c564cbecbaabccc2185eee2930e2035d35b5b 100644 (file)
--- 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;
 
@@ -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) 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");
@@ -150,14 +123,20 @@ main (void)
 {
         Display *dpy;
         Window window;
+       GLXContext ctx;
+       XVisualInfo *visual_info;
 
-       util_x11_init_display (&dpy);
+       resolve_symbols ();
 
-       util_x11_init_window (dpy, &window);
+       dpy = util_x11_init_display ();
 
-       resolve_symbols ();
+       common_create_glx_context (dpy, &ctx, &visual_info);
+
+       window = util_x11_init_window (dpy, visual_info);
+
+       common_make_current (dpy, ctx, window);
 
-        handle_events (dpy, window);
+        common_handle_events (dpy, dpy, window);
 
        util_x11_fini_window (dpy, window);