X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxwrap.c;h=4545d6fbd79186218145cddb5aaa666edb8fb859;hb=c60ce62ccb73402852eb4537dc435b6334a1538b;hp=9a28d7d0f231cb395b818ceadee564e1a3767cca;hpb=2760598732e9c373f3331d7d125b580a224bbbe3;p=fips diff --git a/glxwrap.c b/glxwrap.c index 9a28d7d..4545d6f 100644 --- a/glxwrap.c +++ b/glxwrap.c @@ -27,6 +27,7 @@ #include #include +#include "context.h" #include "dlwrap.h" #include "glwrap.h" #include "metrics.h" @@ -84,14 +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_info_init (); - - metrics_set_current_op (METRICS_OP_SHADER + 0); - metrics_counter_start (); + context_enter (FIPS_API_GLX, ctx); return ret; } @@ -101,14 +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_info_init (); - - metrics_set_current_op (METRICS_OP_SHADER + 0); - metrics_counter_start (); + context_enter (FIPS_API_GLX, ctx); return ret; }