Collect any available results before switching contexts.

[fips] / eglwrap.c

diff --git a/eglwrap.c b/eglwrap.c
index 9e583895f888cc3c53939ea4f4855b48073b17cd..fe7f736243195c0c51eaaedfa007dac30ed07e08 100644 (file)
--- a/eglwrap.c
+++ b/eglwrap.c
@@ -25,6 +25,8 @@
 
 #include <EGL/egl.h>
 
+#include "context.h"
+#include "eglwrap.h"
 #include "dlwrap.h"
 #include "metrics.h"
 
@@ -53,7 +55,7 @@
  * eglSwapBufers, eglGetProcAddress, and eglMakeCurrent), exist only
  * in libEGL.so.1.
  */
-static void *
+void *
 eglwrap_lookup (char *name)
 {
        const char *libegl_filename = "libEGL.so.1";
@@ -108,12 +110,11 @@ eglMakeCurrent (EGLDisplay display, EGLSurface draw, EGLSurface read,
 {
        EGLBoolean ret;
 
-       fips_dispatch_init (FIPS_API_EGL);
+       context_leave ();
 
        EGLWRAP_DEFER_WITH_RETURN (ret, eglMakeCurrent, display, draw, read, context);
 
-       metrics_set_current_op (METRICS_OP_SHADER + 0);
-       metrics_counter_start ();
+       context_enter (FIPS_API_EGL, context);
 
        return ret;
 }