Push final collection of CFLAGS/LDFLAGS from Makefile.config to Makefile.local

[fips] / glxwrap.c

diff --git a/glxwrap.c b/glxwrap.c
index 18ec3c107ccfad427ce4f694fb798c46bd441ae7..799a0190f794de1a63346c372f17b2148835879d 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>
@@ -37,29 +39,35 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
        metrics_end_frame ();
 }
 
-
-typedef __GLXextFuncPtr (* fips_glXGetProcAddressARB_t)(const GLubyte *func);
-__GLXextFuncPtr
-glXGetProcAddressARB (const GLubyte *func)
+/* glXGetProcAddressARB is a function which accepts a string and
+ * returns a generic function pointer (which nominall 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.
+ */
+void (*glXGetProcAddressARB (const GLubyte *func))(void)
 {
-       __GLXextFuncPtr ptr;
-       static fips_glXGetProcAddressARB_t glxwrap_real_glXGetProcAddressARB = NULL;
-       char *name = "glXGetProcAddressARB";
-
-       if (! glxwrap_real_glXGetProcAddressARB) {
-               glxwrap_real_glXGetProcAddressARB = glwrap_lookup (name);
-               if (! glxwrap_real_glXGetProcAddressARB) {
-                       fprintf (stderr, "Error: Failed to find function %s.\n",
-                                name);
-                       return NULL;
-               }
-       }
+       void *ret;
 
        /* If our library has this symbol, that's what we want to give. */
-       ptr = dlwrap_real_dlsym (NULL, (const char *) func);
-       if (ptr)
-               return ptr;
+       ret = dlwrap_real_dlsym (NULL, (const char *) func);
+       if (ret)
+               return ret;
 
        /* Otherwise, just defer to the real glXGetProcAddressARB. */
-       return glxwrap_real_glXGetProcAddressARB (func);
+       GLWRAP_DEFER_WITH_RETURN (ret, glXGetProcAddressARB, func);
+
+       return ret;
+}
+
+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;
 }