#include "fips.h"
+#include "fips-dispatch.h"
+
#include <X11/Xlib.h>
#include <GL/gl.h>
#include <GL/glx.h>
}
/* 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.
*/
void (*glXGetProcAddressARB (const GLubyte *func))(void)
{
- void *ptr;
- static typeof(&glXGetProcAddressARB) 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;
+}
+
+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;
}