X-Git-Url: https://git.cworth.org/git?p=fips;a=blobdiff_plain;f=eglwrap.c;h=913532ef023df21c7b6765a82f25649a7f0de237;hp=9e583895f888cc3c53939ea4f4855b48073b17cd;hb=79edc7574c353a7ae8d2455ecc3a94aa956b3c8e;hpb=61b4545d541527ca2bd76811195b964595db7ed1

diff --git a/eglwrap.c b/eglwrap.c
index 9e58389..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,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;
 }