X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=eglwrap.c;h=913fd488d74a23dc0d7a9277dfe37525e3db776f;hb=5569357a9fc7189c2bae43773f44ba576583ec2b;hp=aaa8cb7815cf3d6bb3ecfb50d144d3e45e4c5754;hpb=b1570730174c0efe6431e8b032c5d408c7367a21;p=fips

diff --git a/eglwrap.c b/eglwrap.c
index aaa8cb7..913fd48 100644
--- a/eglwrap.c
+++ b/eglwrap.c
@@ -21,11 +21,33 @@
 
 #include "fips.h"
 
+#include "fips-dispatch.h"
+
 #include <EGL/egl.h>
 
 #include "dlwrap.h"
 #include "metrics.h"
 
+/* Defer to the real 'function' (from libEGL.so.1) to do the real work.
+ * The symbol is looked up once and cached in a static variable for
+ * future uses.
+ */
+#define EGLWRAP_DEFER(function,...) do {			\
+	static typeof(&function) real_ ## function;		\
+	if (! real_ ## function)				\
+		real_ ## function = eglwrap_lookup (#function);	\
+	real_ ## function(__VA_ARGS__); 			\
+} while (0);
+
+/* As EGLWRAP_DEFER, but also set 'ret' to the return value */
+#define EGLWRAP_DEFER_WITH_RETURN(ret, function,...) do {	\
+	static typeof(&function) real_ ## function;		\
+	if (! real_ ## function)				\
+		real_ ## function = eglwrap_lookup (#function);	\
+	(ret) = real_ ## function(__VA_ARGS__); 		\
+} while (0);
+
+
 static void *
 eglwrap_lookup (char *name)
 {
@@ -48,14 +70,22 @@ EGLBoolean
 eglSwapBuffers (EGLDisplay dpy, EGLSurface surface)
 {
 	EGLBoolean ret;
-	static typeof(&eglSwapBuffers) real_eglSwapBuffers;
 
-	if (! real_eglSwapBuffers)
-		real_eglSwapBuffers = eglwrap_lookup ("eglSwapBuffers");
+	EGLWRAP_DEFER_WITH_RETURN (ret, eglSwapBuffers, dpy, surface);
+	metrics_end_frame ();
+
+	return ret;
+}
 
-	ret = real_eglSwapBuffers (dpy, surface);
+EGLBoolean
+eglMakeCurrent (EGLDisplay display, EGLSurface draw, EGLSurface read,
+		EGLContext context)
+{
+	EGLBoolean ret;
 
-	metrics_end_frame ();
+	fips_dispatch_init (FIPS_API_EGL);
+
+	EGLWRAP_DEFER_WITH_RETURN (ret, eglMakeCurrent, display, draw, read, context);
 
 	return ret;
 }