* THE SOFTWARE.
*/
-#include <stdio.h>
-#include <stdlib.h>
+#include "fips.h"
-#include <string.h>
-
-#include <dlfcn.h>
+#include "fips-dispatch.h"
#include <X11/Xlib.h>
#include <GL/gl.h>
#include <GL/glx.h>
-#include <GL/glext.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;
+ GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
- if (! initialized) {
- frames = 0;
- gettimeofday (&tv_start, NULL);
- initialized = 1;
- }
+ metrics_end_frame ();
+}
- call_glXSwapBuffers (dpy, drawable);
+/* 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)
+{
+ void *ret;
- frames++;
- if (frames % 60 == 0) {
- double fps;
- gettimeofday (&tv_now, NULL);
+ /* If our library has this symbol, that's what we want to give. */
+ ret = dlwrap_real_dlsym (NULL, (const char *) func);
+ if (ret)
+ return ret;
- fps = (double) frames / (tv_now.tv_sec - tv_start.tv_sec +
- (tv_now.tv_usec - tv_start.tv_usec) / 1.0e6);
+ /* Otherwise, just defer to the real glXGetProcAddressARB. */
+ GLWRAP_DEFER_WITH_RETURN (ret, glXGetProcAddressARB, func);
- printf("FPS: %.3f\n", fps);
- }
+ 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);
+}
-typedef __GLXextFuncPtr (* fips_glXGetProcAddressARB_t)(const GLubyte *func);
-__GLXextFuncPtr
-glXGetProcAddressARB (const GLubyte *func)
+Bool
+glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx)
{
- static fips_glXGetProcAddressARB_t real_glXGetProcAddressARB = NULL;
- const char *name = "glXGetProcAddressARB";
+ Bool ret;
+
+ fips_dispatch_init (FIPS_API_GLX);
- 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;
- }
- }
+ GLWRAP_DEFER_WITH_RETURN (ret, glXMakeCurrent, dpy, drawable, ctx);
- if (strcmp ((const char *)func, "glXSwapBuffers") == 0)
- return (__GLXextFuncPtr) glXSwapBuffers;
- else
- return real_glXGetProcAddressARB (func);
+ return ret;
}