X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glfps.c;h=3b5c2fab2e78659fa0b69ab29d6ffd617a22f1b8;hb=HEAD;hp=e6739e4fad279588459ba6723dffb8119a58ef02;hpb=b61062a780ddc9eea7217cb4f110cb65e5148b23;p=glfps

diff --git a/glfps.c b/glfps.c
index e6739e4..3b5c2fa 100644
--- a/glfps.c
+++ b/glfps.c
@@ -1,7 +1,29 @@
+/* Copyright © 2013, Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #define _GNU_SOURCE /* For RTLD_NEXT */
 #include <dlfcn.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <X11/Xlib.h>
 #include <GL/gl.h>
@@ -10,6 +32,8 @@
 #include <sys/time.h>
 #include <string.h>
 
+#include <glaze.h>
+
 /* How many frames between reports. */
 #define REPORT_FREQ 60
 
@@ -38,26 +62,7 @@ on_each_frame (void)
 void
 glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 {
-	static typeof(&glXSwapBuffers) real_glXSwapBuffers = NULL;
-
-	if (real_glXSwapBuffers == NULL)
-		real_glXSwapBuffers = dlsym (RTLD_NEXT, "glXSwapBuffers");
-
 	on_each_frame ();
 
-	real_glXSwapBuffers (dpy, drawable);
-}
-
-void
-(*glXGetProcAddressARB (const GLubyte *func))(void)
-{
-	static typeof(&glXGetProcAddressARB) real_glXGetProcAddressARB = NULL;
-
-	if (strcmp((char *) func, "glXSwapBuffers") == 0)
-		return (void*) glXSwapBuffers;
-
-	if (real_glXGetProcAddressARB == NULL)
-		real_glXGetProcAddressARB = dlsym (RTLD_NEXT, "glXGetProcAddressARB");
-
-	return real_glXGetProcAddressARB (func);
+	GLAZE_DEFER (glXSwapBuffers, dpy, drawable);
 }