X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glwrap.c;h=0ae295a87082212b59d764f8b89250c2ab5c68b8;hb=d6ac766abe401b681282cdcf273e7fb67fff99bd;hp=e92889a7688da5efb636f1fc4503c251e3f91b79;hpb=5569357a9fc7189c2bae43773f44ba576583ec2b;p=fips

diff --git a/glwrap.c b/glwrap.c
index e92889a..0ae295a 100644
--- a/glwrap.c
+++ b/glwrap.c
@@ -19,6 +19,8 @@
  * THE SOFTWARE.
  */
 
+#include "dlwrap.h"
+
 /* The prototypes for some OpenGL functions changed at one point from:
  *
  *	const void* *indices
@@ -36,45 +38,69 @@
  */
 #define const
 
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+
 #include "fips.h"
-#include "fips-dispatch.h"
 
 #include "glwrap.h"
 
 #include "metrics.h"
 
-#include "dlwrap.h"
-
 static int inside_new_list = 0;
 
+static void *gl_handle;
+
+void
+glwrap_set_gl_handle (void *handle)
+{
+	if (gl_handle == NULL)
+		gl_handle = handle;
+}
+
 void *
 glwrap_lookup (char *name)
 {
-	const char *libgl_filename = "libGL.so.1";
-	static void *libgl_handle = NULL;
-
-	if (! libgl_handle) {
-		libgl_handle = dlwrap_real_dlopen (libgl_filename, RTLD_NOW | RTLD_DEEPBIND);
-		if (! libgl_handle) {
-			fprintf (stderr, "Error: Failed to dlopen %s\n",
-				 libgl_filename);
-			exit (1);
-		}
+	void *ret;
+
+	/* We don't call dlopen here to find the library in which to
+	 * perform a dlsym lookup. That's because the application may
+	 * be loading libGL.so or libGLESv2.so for its OpenGL symbols.
+	 *
+	 * So we instead watch for one of those filenames to go by in
+	 * our dlopen wrapper, which will then call
+	 * glwrap_set_gl_handle to give us the handle to use here.
+	 *
+
+	 * If the application hasn't called dlopen on a "libGL"
+	 * library, then presumably the application is linked directly
+	 * to an OpenGL implementation. In this case, we can use
+	 * RTLD_NEXT to find the symbol.
+	 */
+	if (gl_handle == NULL)
+		gl_handle = RTLD_NEXT;
+
+	ret = dlwrap_real_dlsym (gl_handle, name);
+
+	if (ret == NULL) {
+		fprintf (stderr, "Error: glwrap_lookup failed to dlsym %s\n",
+			 name);
+		exit (1);
 	}
 
-	return dlwrap_real_dlsym (libgl_handle, name);
+	return ret;
 }
 
-/* Execute a glBeginQuery/glEndQuery pair around an OpenGL call. */
+/* Execute an OpenGL call and time it with a GPU metrics counter. */
 #define TIMED_DEFER(function,...) do {					\
 	if (! inside_new_list) {					\
 		unsigned counter;					\
-		counter = metrics_add_counter ();			\
-		glBeginQuery (GL_TIME_ELAPSED, counter);		\
+		counter = metrics_counter_new ();			\
+		metrics_counter_start (counter);			\
 	}								\
 	GLWRAP_DEFER(function, __VA_ARGS__);				\
 	if (! inside_new_list) {					\
-		glEndQuery (GL_TIME_ELAPSED);				\
+		metrics_counter_stop ();				\
 	}								\
 } while (0);
 
@@ -335,17 +361,18 @@ glClear (GLbitfield mask)
 	TIMED_DEFER (glClear, mask);
 }
 
-/* We can't just use TIMED_DEFER for glBegin/glEnd since the
- * glBeginQuery/glEndQuery calls must both be outside
- * glBegin/glEnd. */
+/* We can't just use TIMED_DEFER for glBegin/glEnd since the metrics
+ * counter must be started before glBegin and stopped after glEnd,
+ * (that is, everything from glBegin to glEnd is counted as a single
+ * operation). */
 void
 glBegin (GLenum mode)
 {
 	if (! inside_new_list)
 	{
 		unsigned counter;
-		counter = metrics_add_counter ();
-		glBeginQuery (GL_TIME_ELAPSED, counter);
+		counter = metrics_counter_new ();
+		metrics_counter_start (counter);
 	}
 
 	GLWRAP_DEFER (glBegin, mode);
@@ -357,7 +384,7 @@ glEnd (void)
 	GLWRAP_DEFER (glEnd);
 
 	if (! inside_new_list) {
-		glEndQuery (GL_TIME_ELAPSED);
+		metrics_counter_stop ();
 	}
 }