Add explicit link to libpthread, to work around debugging issues

[fips] / glxwrap.c

diff --git a/glxwrap.c b/glxwrap.c
index eda358313dc26b09570547c40987c56526c9306a..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,11 +37,11 @@ glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 {
        GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
 
-       metrics_counter_stop ();
+       context_counter_stop ();
 
-       metrics_end_frame ();
+       context_end_frame ();
 
-       metrics_counter_start ();
+       context_counter_start ();
 }
 
 /* glXGetProcAddressARB is a function which accepts a string and
@@ -84,12 +85,11 @@ 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);
 
-       metrics_set_current_op (METRICS_OP_SHADER + 0);
-       metrics_counter_start ();
+       context_enter (FIPS_API_GLX, ctx);
 
        return ret;
 }
@@ -99,12 +99,11 @@ glXMakeContextCurrent (Display *dpy, GLXDrawable drawable, GLXDrawable read, GLX
 {
        Bool ret;
 
-       fips_dispatch_init (FIPS_API_GLX);
+       context_leave ();
 
        GLWRAP_DEFER_WITH_RETURN (ret, glXMakeContextCurrent, dpy, drawable, read, ctx);
 
-       metrics_set_current_op (METRICS_OP_SHADER + 0);
-       metrics_counter_start ();
+       context_enter (FIPS_API_GLX, ctx);
 
        return ret;
 }