Push glBeginQuery/glEndQuery down into metrics.c

[fips] / glwrap.c

diff --git a/glwrap.c b/glwrap.c
index bcb8111a03e990baa9298c3c939f2f77494a11ad..a7d62c5c1ef2be57d650591302923197c0fbb05f 100644 (file)
--- a/glwrap.c
+++ b/glwrap.c
@@ -67,16 +67,16 @@ glwrap_lookup (char *name)
        return dlwrap_real_dlsym (libgl_handle, name);
 }
 
-/* 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);
 
@@ -337,17 +337,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);
@@ -359,7 +360,7 @@ glEnd (void)
        GLWRAP_DEFER (glEnd);
 
        if (! inside_new_list) {
-               glEndQuery (GL_TIME_ELAPSED);
+               metrics_counter_stop ();
        }
 }