Collect any available results before switching contexts.

[fips] / glxwrap.c

diff --git a/glxwrap.c b/glxwrap.c
index a57c5579cba444fe40ba45091b072cb0fb2967b7..4545d6fbd79186218145cddb5aaa666edb8fb859 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"
@@ -84,11 +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_counter_start ();
+       context_enter (FIPS_API_GLX, ctx);
 
        return ret;
 }
@@ -98,11 +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_counter_start ();
+       context_enter (FIPS_API_GLX, ctx);
 
        return ret;
 }