Collect any available results before switching contexts.

[fips] / eglwrap.c

diff --git a/eglwrap.c b/eglwrap.c
index 43b07babcf049a113a6729a1e41086e41b33a431..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"
 
@@ -48,7 +50,12 @@
 } while (0);
 
 
-static void *
+/* Note: We only need to perform a lookup in libEGL.so.1, (not
+ * libGLESv2.so.2). This is because the functions we wrap, (currently
+ * eglSwapBufers, eglGetProcAddress, and eglMakeCurrent), exist only
+ * in libEGL.so.1.
+ */
+void *
 eglwrap_lookup (char *name)
 {
        const char *libegl_filename = "libEGL.so.1";
@@ -72,8 +79,13 @@ eglSwapBuffers (EGLDisplay dpy, EGLSurface surface)
        EGLBoolean ret;
 
        EGLWRAP_DEFER_WITH_RETURN (ret, eglSwapBuffers, dpy, surface);
+
+       metrics_counter_stop ();
+
        metrics_end_frame ();
 
+       metrics_counter_start ();
+
        return ret;
 }
 
@@ -98,9 +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);
 
+       context_enter (FIPS_API_EGL, context);
+
        return ret;
 }