X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=4b87642e08846612d8d3f2ce1739e39db7373cb8;hb=dfb96c9b64def8674a38dda2bc2276d4e2cdd58e;hp=14b79b7b3b1e09dc79e65e0acaf72db212d5d133;hpb=6dcb864fcfa77c4bf4eb7e1c04f00e53f9fee446;p=fips

diff --git a/glxwrap.c b/glxwrap.c
index 14b79b7..4b87642 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,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,16 +85,11 @@ glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx)
 {
 	Bool ret;
 
-	metrics_info_fini ();
-
-	fips_dispatch_init (FIPS_API_GLX);
+	context_leave ();
 
 	GLWRAP_DEFER_WITH_RETURN (ret, glXMakeCurrent, dpy, drawable, ctx);
 
-	metrics_info_init ();
-
-	metrics_set_current_op (METRICS_OP_SHADER + 0);
-	metrics_counter_start ();
+	context_enter (FIPS_API_GLX, ctx);
 
 	return ret;
 }
@@ -103,16 +99,11 @@ glXMakeContextCurrent (Display *dpy, GLXDrawable drawable, GLXDrawable read, GLX
 {
 	Bool ret;
 
-	metrics_info_fini ();
-
-	fips_dispatch_init (FIPS_API_GLX);
+	context_leave ();
 
 	GLWRAP_DEFER_WITH_RETURN (ret, glXMakeContextCurrent, dpy, drawable, read, ctx);
 
-	metrics_info_init ();
-
-	metrics_set_current_op (METRICS_OP_SHADER + 0);
-	metrics_counter_start ();
+	context_enter (FIPS_API_GLX, ctx);
 
 	return ret;
 }