X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=eglwrap.c;h=198b4f0b57072dc43e4de2a07901691c77da4c3d;hb=5169acf1de805f8ad277554f6ec064e8f36111c3;hp=aaa8cb7815cf3d6bb3ecfb50d144d3e45e4c5754;hpb=b1570730174c0efe6431e8b032c5d408c7367a21;p=fips

diff --git a/eglwrap.c b/eglwrap.c
index aaa8cb7..198b4f0 100644
--- a/eglwrap.c
+++ b/eglwrap.c
@@ -21,11 +21,38 @@
 
 #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);
+
+
+/* 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.
+ */
 static void *
 eglwrap_lookup (char *name)
 {
@@ -48,14 +75,37 @@ 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 ();
 
-	ret = real_eglSwapBuffers (dpy, surface);
+	return ret;
+}
 
-	metrics_end_frame ();
+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;
+
+	fips_dispatch_init (FIPS_API_EGL);
+
+	EGLWRAP_DEFER_WITH_RETURN (ret, eglMakeCurrent, display, draw, read, context);
 
 	return ret;
 }