Add explicit link to libpthread, to work around debugging issues

[fips] / glxwrap.c

diff --git a/glxwrap.c b/glxwrap.c
index d7d4191ce528ae5b59c5f8a9317b8e99a179d679..4b87642e08846612d8d3f2ce1739e39db7373cb8 100644 (file)
--- a/glxwrap.c
+++ b/glxwrap.c
@@ -27,6 +27,7 @@
 #include <GL/gl.h>
 #include <GL/glx.h>
 
+#include "context.h"
 #include "dlwrap.h"
 #include "glwrap.h"
 #include "metrics.h"
@@ -36,7 +37,11 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 {
        GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
 
-       metrics_end_frame ();
+       context_counter_stop ();
+
+       context_end_frame ();
+
+       context_counter_start ();
 }
 
 /* glXGetProcAddressARB is a function which accepts a string and
@@ -47,10 +52,14 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
  */
 void (*glXGetProcAddressARB (const GLubyte *func))(void)
 {
+       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. */
-       ret = dlwrap_real_dlsym (NULL, (const char *) func);
+       ret = dlwrap_real_dlsym (libfips_handle, (const char *) func);
        if (ret)
                return ret;
 
@@ -76,9 +85,25 @@ glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx)
 {
        Bool ret;
 
-       fips_dispatch_init (FIPS_API_GLX);
+       context_leave ();
 
        GLWRAP_DEFER_WITH_RETURN (ret, glXMakeCurrent, dpy, drawable, ctx);
 
+       context_enter (FIPS_API_GLX, ctx);
+
+       return ret;
+}
+
+Bool
+glXMakeContextCurrent (Display *dpy, GLXDrawable drawable, GLXDrawable read, GLXContext ctx)
+{
+       Bool ret;
+
+       context_leave ();
+
+       GLWRAP_DEFER_WITH_RETURN (ret, glXMakeContextCurrent, dpy, drawable, read, ctx);
+
+       context_enter (FIPS_API_GLX, ctx);
+
        return ret;
 }