X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=4545d6fbd79186218145cddb5aaa666edb8fb859;hb=158a5862aeea9224fcd60c28b0bb19cb6b9f9381;hp=cccc05f99e1295b0c51165cf226e61164cec956d;hpb=e678528e0593be3ffb9b42dd5d523cc0bdee1484;p=fips

diff --git a/glxwrap.c b/glxwrap.c
index cccc05f..4545d6f 100644
--- 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_counter_stop ();
+
 	metrics_end_frame ();
+
+	metrics_counter_start ();
 }
 
 /* glXGetProcAddressARB is a function which accepts a string and
@@ -80,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;
 }