X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=9a28d7d0f231cb395b818ceadee564e1a3767cca;hb=f8ff428db9bedbbee44177fb8c476e4bf8742958;hp=18ec3c107ccfad427ce4f694fb798c46bd441ae7;hpb=9f0b85a2b62ddcd43ef664be7156b8f5bb146367;p=fips

diff --git a/glxwrap.c b/glxwrap.c
index 18ec3c1..9a28d7d 100644
--- 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>
@@ -34,32 +36,79 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 {
 	GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
 
+	metrics_counter_stop ();
+
 	metrics_end_frame ();
-}
 
+	metrics_counter_start ();
+}
 
-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 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)
 {
-	__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;
-		}
-	}
+	static void *libfips_handle = NULL;
+	void *ret;
+
+	if (libfips_handle == NULL)
+		libfips_handle = dlwrap_dlopen_libfips ();
 
 	/* 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 (libfips_handle, (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);
+
+	metrics_info_init ();
+
+	metrics_set_current_op (METRICS_OP_SHADER + 0);
+	metrics_counter_start ();
+
+	return ret;
+}
+
+Bool
+glXMakeContextCurrent (Display *dpy, GLXDrawable drawable, GLXDrawable read, GLXContext ctx)
+{
+	Bool ret;
+
+	fips_dispatch_init (FIPS_API_GLX);
+
+	GLWRAP_DEFER_WITH_RETURN (ret, glXMakeContextCurrent, dpy, drawable, read, ctx);
+
+	metrics_info_init ();
+
+	metrics_set_current_op (METRICS_OP_SHADER + 0);
+	metrics_counter_start ();
+
+	return ret;
 }