Fix CPU load reported on initial frame.

[fips] / eglwrap.c

diff --git a/eglwrap.c b/eglwrap.c
index 8317334c8595bca959f5e55101fb5dc844458fd4..4c51c89d3fdbcf8186014f2030a5af7118d006eb 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"
 
@@ -50,14 +52,10 @@
 
 /* Note: We only need to perform a lookup in libEGL.so.1, (not
  * libGLESv2.so.2). This is because the functions we wrap, (currently
- * wglSwapBufers, eglGetProcAddress, and eglMakeCurrent), exist only
+ * eglSwapBufers, eglGetProcAddress, and eglMakeCurrent), exist only
  * in libEGL.so.1.
- *
- * If we *do* later add wrappers for functions that lib in
- * libGLESv2.so.2 then those might more naturally live in a file named
- * gleswrap.c or so.
  */
-static void *
+void *
 eglwrap_lookup (char *name)
 {
        const char *libegl_filename = "libEGL.so.1";
@@ -80,8 +78,11 @@ eglSwapBuffers (EGLDisplay dpy, EGLSurface surface)
 {
        EGLBoolean ret;
 
+       context_end_frame_pre_swap ();
+
        EGLWRAP_DEFER_WITH_RETURN (ret, eglSwapBuffers, dpy, surface);
-       metrics_end_frame ();
+
+       context_end_frame_post_swap ();
 
        return ret;
 }
@@ -107,9 +108,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;
 }