X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=eglwrap.c;h=913532ef023df21c7b6765a82f25649a7f0de237;hb=dfb96c9b64def8674a38dda2bc2276d4e2cdd58e;hp=73b7a8d39699001dab539a2c54a0875d6120fad0;hpb=6dcb864fcfa77c4bf4eb7e1c04f00e53f9fee446;p=fips

diff --git a/eglwrap.c b/eglwrap.c
index 73b7a8d..913532e 100644
--- 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";
@@ -78,11 +80,11 @@ eglSwapBuffers (EGLDisplay dpy, EGLSurface surface)
 
 	EGLWRAP_DEFER_WITH_RETURN (ret, eglSwapBuffers, dpy, surface);
 
-	metrics_counter_stop ();
+	context_counter_stop ();
 
-	metrics_end_frame ();
+	context_end_frame ();
 
-	metrics_counter_start ();
+	context_counter_start ();
 
 	return ret;
 }
@@ -108,16 +110,11 @@ eglMakeCurrent (EGLDisplay display, EGLSurface draw, EGLSurface read,
 {
 	EGLBoolean ret;
 
-	metrics_info_fini ();
-
-	fips_dispatch_init (FIPS_API_EGL);
+	context_leave ();
 
 	EGLWRAP_DEFER_WITH_RETURN (ret, eglMakeCurrent, display, draw, read, context);
 
-	metrics_info_init ();
-
-	metrics_set_current_op (METRICS_OP_SHADER + 0);
-	metrics_counter_start ();
+	context_enter (FIPS_API_EGL, context);
 
 	return ret;
 }