test: Add support for EGL-based test, (and one EGL-based test)

[fips] / test / glx-dlopen-gpa.c

diff --git a/test/glx-dlopen-gpa.c b/test/glx-dlopen-gpa.c
index 24238b24adee1425cf7112d489e14027d714ae5a..514f6714909607abf7a794b509755c9869044103 100644 (file)
--- a/test/glx-dlopen-gpa.c
+++ b/test/glx-dlopen-gpa.c
@@ -49,8 +49,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)
@@ -146,14 +146,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);