X-Git-Url: https://git.cworth.org/git?p=fips;a=blobdiff_plain;f=eglwrap.c;h=913532ef023df21c7b6765a82f25649a7f0de237;hp=aaa8cb7815cf3d6bb3ecfb50d144d3e45e4c5754;hb=HEAD;hpb=b1570730174c0efe6431e8b032c5d408c7367a21

diff --git a/eglwrap.c b/eglwrap.c
index aaa8cb7..913532e 100644
--- a/eglwrap.c
+++ b/eglwrap.c
@@ -21,12 +21,41 @@
 
 #include "fips.h"
 
+#include "fips-dispatch.h"
+
 #include <EGL/egl.h>
 
+#include "context.h"
+#include "eglwrap.h"
 #include "dlwrap.h"
 #include "metrics.h"
 
-static void *
+/* 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);
+
+
+/* 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";
@@ -48,14 +77,44 @@ 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);
+
+	context_counter_stop ();
+
+	context_end_frame ();
+
+	context_counter_start ();
+
+	return ret;
+}
+
+void (*eglGetProcAddress (char const *func))(void)
+{
+	void *ret;
+
+	/* If our library has this symbol, that's what we want to give. */
+	ret = dlwrap_real_dlsym (NULL, (const char *) func);
+	if (ret)
+		return ret;
+
+	/* Otherwise, just defer to the real eglGetProcAddress */
+	EGLWRAP_DEFER_WITH_RETURN (ret, eglGetProcAddress, func);
+
+	return ret;
+}
+
+EGLBoolean
+eglMakeCurrent (EGLDisplay display, EGLSurface draw, EGLSurface read,
+		EGLContext context)
+{
+	EGLBoolean ret;
+
+	context_leave ();
 
-	ret = real_eglSwapBuffers (dpy, surface);
+	EGLWRAP_DEFER_WITH_RETURN (ret, eglMakeCurrent, display, draw, read, context);
 
-	metrics_end_frame ();
+	context_enter (FIPS_API_EGL, context);
 
 	return ret;
 }