X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glwrap.c;h=a7d62c5c1ef2be57d650591302923197c0fbb05f;hb=99eeb7e0771887efc60f295db6a30a76c677c933;hp=beb1c97fd38cb05830e6ce1f37b9680c872804bc;hpb=c0c549440d852153d1777eca3fa962c1b70483b3;p=fips

diff --git a/glwrap.c b/glwrap.c
index beb1c97..a7d62c5 100644
--- a/glwrap.c
+++ b/glwrap.c
@@ -19,12 +19,6 @@
  * THE SOFTWARE.
  */
 
-#include "fips.h"
-
-#include "glwrap.h"
-
-#include "metrics.h"
-
 /* The prototypes for some OpenGL functions changed at one point from:
  *
  *	const void* *indices
@@ -45,8 +39,16 @@
 #define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
 
+#include "fips.h"
+
+#include "glwrap.h"
+
+#include "metrics.h"
+
 #include "dlwrap.h"
 
+static int inside_new_list = 0;
+
 void *
 glwrap_lookup (char *name)
 {
@@ -65,13 +67,17 @@ glwrap_lookup (char *name)
 	return dlwrap_real_dlsym (libgl_handle, name);
 }
 
-/* Execute a glBegineQuery/glEndQuery pair around an OpenGL call. */
-#define TIMED_DEFER(function,...) do {			\
-	unsigned counter;				\
-	counter = metrics_add_counter ();		\
-	glBeginQuery (GL_TIME_ELAPSED, counter);	\
-	GLWRAP_DEFER(function, __VA_ARGS__);		\
-	glEndQuery (GL_TIME_ELAPSED);			\
+/* 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_counter_new ();			\
+		metrics_counter_start (counter);			\
+	}								\
+	GLWRAP_DEFER(function, __VA_ARGS__);				\
+	if (! inside_new_list) {					\
+		metrics_counter_stop ();				\
+	}								\
 } while (0);
 
 /* Thanks to apitrace source code for the list of OpenGL draw calls. */
@@ -151,13 +157,12 @@ glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first,
 		     first, count, primcount, modestride);
 }
 
-/* FIXME?
 void
-glMultiDrawArraysIndirect (...)
+glMultiDrawArraysIndirect (GLenum mode, const void *indirect,
+			   GLsizei drawcount, GLsizei stride)
 {
-	TIMED_DEFER (glMultiDrawArraysIndirect, ...);
+	TIMED_DEFER (glMultiDrawArraysIndirect, mode, indirect, drawcount, stride);
 }
-*/
 
 void
 glMultiDrawArraysIndirectAMD (GLenum mode, const GLvoid *indirect,
@@ -297,13 +302,13 @@ glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count,
 		     type, indices, primcount, modestride);
 }
 
-/* FIXME?
 void
-glMultiDrawElementsIndirect (...)
+glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect,
+			     GLsizei drawcount, GLsizei stride)
 {
-	TIMED_DEFER (glMultiDrawElementsIndirect, ...);
+	TIMED_DEFER (glMultiDrawElementsIndirect, mode, type,
+		     indirect, drawcount, stride);
 }
-*/
 
 void
 glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type,
@@ -332,10 +337,47 @@ glClear (GLbitfield mask)
 	TIMED_DEFER (glClear, mask);
 }
 
+/* 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_counter_new ();
+		metrics_counter_start (counter);
+	}
+
+	GLWRAP_DEFER (glBegin, mode);
+}
+
 void
 glEnd (void)
 {
-	TIMED_DEFER (glEnd,);
+	GLWRAP_DEFER (glEnd);
+
+	if (! inside_new_list) {
+		metrics_counter_stop ();
+	}
+}
+
+/* And we need to track display lists to avoid inserting queries
+ * inside the list while it's being constructed. */
+void
+glNewList (GLuint list, GLenum mode)
+{
+	inside_new_list = 1;
+	GLWRAP_DEFER (glNewList, list, mode);
+}
+
+void
+glEndList (void)
+{
+	GLWRAP_DEFER (glEndList);
+	inside_new_list = 0;
 }
 
 void