util-x11: Rework init_window interface to accept XVisualInfo

[fips] / glxwrap.c

diff --git a/glxwrap.c b/glxwrap.c
index 84bf48522565e489de274cd87e752d5a470ebd01..d7d4191ce528ae5b59c5f8a9317b8e99a179d679 100644 (file)
--- a/glxwrap.c
+++ b/glxwrap.c
@@ -21,6 +21,8 @@
 
 #include "fips.h"
 
+#include "fips-dispatch.h"
+
 #include <X11/Xlib.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
@@ -38,7 +40,7 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 }
 
 /* glXGetProcAddressARB is a function which accepts a string and
- * returns a generic function pointer (which nominall accepts void and
+ * returns a generic function pointer (which nominally accepts void and
  * has void return type). Of course, the user is expected to cast the
  * returned function pointer to a function pointer of the expected
  * type.
@@ -57,3 +59,26 @@ void (*glXGetProcAddressARB (const GLubyte *func))(void)
 
        return ret;
 }
+
+void (*glXGetProcAddress (const GLubyte *func))(void)
+{
+       /* This comment must not be removed. It ensures that the
+        * glXGetProcAddress function ends up in our exported symbol
+        * list even though there's not otherwise any code saying:
+        *
+        * GLWRAP_DEFER_WITH_RETURN (ret, glXGetProcAddress, func);
+        */
+       return glXGetProcAddressARB(func);
+}
+
+Bool
+glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx)
+{
+       Bool ret;
+
+       fips_dispatch_init (FIPS_API_GLX);
+
+       GLWRAP_DEFER_WITH_RETURN (ret, glXMakeCurrent, dpy, drawable, ctx);
+
+       return ret;
+}