X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=84bf48522565e489de274cd87e752d5a470ebd01;hb=d307a28f436ae7f2d80ce40589328fc64f540947;hp=4d16e4d6a1b86c093bbad6f4d8b1f35ff337e0f8;hpb=7f48ed429b393b28cb6362af5dcddd9bb27c3901;p=fips

diff --git a/glxwrap.c b/glxwrap.c
index 4d16e4d..84bf485 100644
--- a/glxwrap.c
+++ b/glxwrap.c
@@ -25,97 +25,35 @@
 #include <GL/gl.h>
 #include <GL/glx.h>
 
-#include <sys/time.h>
-
 #include "dlwrap.h"
-
-typedef void (* fips_glXSwapBuffers_t)(Display *dpy, GLXDrawable drawable);
-
-static void *
-lookup (const char *name)
-{
-	const char *libgl_filename = "libGL.so.1";
-	static void *libgl_handle = NULL;
-
-	if (! libgl_handle) {
-		libgl_handle = dlwrap_real_dlopen (libgl_filename, RTLD_NOW | RTLD_DEEPBIND);
-		if (! libgl_handle) {
-			fprintf (stderr, "Error: Failed to dlopen %s\n",
-				 libgl_filename);
-			exit (1);
-		}
-	}
-
-	return dlwrap_real_dlsym (libgl_handle, name);
-}
-
-static void
-call_glXSwapBuffers (Display *dpy, GLXDrawable drawable)
-{
-	static fips_glXSwapBuffers_t real_glXSwapBuffers = NULL;
-	const char *name = "glXSwapBuffers";
-
-	if (! real_glXSwapBuffers) {
-		real_glXSwapBuffers = (fips_glXSwapBuffers_t) lookup (name);
-		if (! real_glXSwapBuffers) {
-			fprintf (stderr, "Error: Failed to find function %s.\n",
-				 name);
-			return;
-		}
-	}
-	real_glXSwapBuffers (dpy, drawable);
-}	
+#include "glwrap.h"
+#include "metrics.h"
 
 void
 glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 {
-	static int initialized = 0;
-	static int frames;
-	static struct timeval tv_start, tv_now;
-
-	if (! initialized) {
-		frames = 0;
-		gettimeofday (&tv_start, NULL);
-		initialized = 1;
-	}
-
-	call_glXSwapBuffers (dpy, drawable);
-
-	frames++;
-	if (frames % 60 == 0) {
-		double fps;
-		gettimeofday (&tv_now, NULL);
-
-		fps = (double) frames / (tv_now.tv_sec - tv_start.tv_sec +
-					 (tv_now.tv_usec - tv_start.tv_usec) / 1.0e6);
+	GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
 
-		printf("FPS: %.3f\n", fps);
-	}
+	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 real_glXGetProcAddressARB = NULL;
-	const char *name = "glXGetProcAddressARB";
-
-	if (! real_glXGetProcAddressARB) {
-		real_glXGetProcAddressARB = (fips_glXGetProcAddressARB_t) lookup (name);
-		if (! 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 real_glXGetProcAddressARB (func);
+	GLWRAP_DEFER_WITH_RETURN (ret, glXGetProcAddressARB, func);
+
+	return ret;
 }