X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=7b90ceb4008d2d98976ce3645a352d901c3eeb8d;hb=refs%2Fheads%2Fframe-timings;hp=eda358313dc26b09570547c40987c56526c9306a;hpb=61b4545d541527ca2bd76811195b964595db7ed1;p=fips

diff --git a/glxwrap.c b/glxwrap.c
index eda3583..7b90ceb 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"
@@ -34,13 +35,11 @@
 void
 glXSwapBuffers (Display *dpy, GLXDrawable drawable)
 {
-	GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
-
-	metrics_counter_stop ();
+	context_end_frame_pre_swap ();
 
-	metrics_end_frame ();
+	GLWRAP_DEFER (glXSwapBuffers, dpy, drawable);
 
-	metrics_counter_start ();
+	context_end_frame_post_swap ();
 }
 
 /* glXGetProcAddressARB is a function which accepts a string and
@@ -84,12 +83,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 +97,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;
 }