Make timer query objects polled asynchronously, so that the CPU blocks less on the...

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 5e43474c457e8cc7dca3db7054fb8e6b6581e3d8..19d89f823c313b6faca3bcdd3c1aef505f762f8d 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -650,9 +650,8 @@ Phase *EffectChain::construct_phase(Node *output, map<Node *, Phase *> *complete
        // Actually make the shader for this phase.
        compile_glsl_program(phase);
 
        // Actually make the shader for this phase.
        compile_glsl_program(phase);
 

-       // Initialize timer objects.
+       // Initialize timers.

        if (movit_timer_queries_supported) {
        if (movit_timer_queries_supported) {

-               glGenQueries(1, &phase->timer_query_object);

                phase->time_elapsed_ns = 0;
                phase->num_measured_iterations = 0;
        }
                phase->time_elapsed_ns = 0;
                phase->num_measured_iterations = 0;
        }


@@ -1736,7 +1735,15 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
                Phase *phase = phases[phase_num];
 
                if (do_phase_timing) {
                Phase *phase = phases[phase_num];
 
                if (do_phase_timing) {

-                       glBeginQuery(GL_TIME_ELAPSED, phase->timer_query_object);
+                       GLuint timer_query_object;
+                       if (phase->timer_query_objects_free.empty()) {
+                               glGenQueries(1, &timer_query_object);
+                       } else {
+                               timer_query_object = phase->timer_query_objects_free.front();
+                               phase->timer_query_objects_free.pop_front();
+                       }
+                       glBeginQuery(GL_TIME_ELAPSED, timer_query_object);
+                       phase->timer_query_objects_running.push_back(timer_query_object);

                }
                if (phase_num == phases.size() - 1) {
                        // Last phase goes to the output the user specified.
                }
                if (phase_num == phases.size() - 1) {
                        // Last phase goes to the output the user specified.


@@ -1778,14 +1785,22 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
                // Get back the timer queries.
                for (unsigned phase_num = 0; phase_num < phases.size(); ++phase_num) {
                        Phase *phase = phases[phase_num];
                // Get back the timer queries.
                for (unsigned phase_num = 0; phase_num < phases.size(); ++phase_num) {
                        Phase *phase = phases[phase_num];

-                       GLint available = 0;
-                       while (!available) {
-                               glGetQueryObjectiv(phase->timer_query_object, GL_QUERY_RESULT_AVAILABLE, &available);
+                       for (std::list<GLuint>::iterator timer_it = phase->timer_query_objects_running.begin();
+                            timer_it != phase->timer_query_objects_running.end(); ) {
+                               GLint timer_query_object = *timer_it;
+                               GLint available;
+                               glGetQueryObjectiv(timer_query_object, GL_QUERY_RESULT_AVAILABLE, &available);
+                               if (available) {
+                                       GLuint64 time_elapsed;
+                                       glGetQueryObjectui64v(timer_query_object, GL_QUERY_RESULT, &time_elapsed);
+                                       phase->time_elapsed_ns += time_elapsed;
+                                       ++phase->num_measured_iterations;
+                                       phase->timer_query_objects_free.push_back(timer_query_object);
+                                       phase->timer_query_objects_running.erase(timer_it++);
+                               } else {
+                                       ++timer_it;
+                               }

                        }
                        }

-                       GLuint64 time_elapsed;
-                       glGetQueryObjectui64v(phase->timer_query_object, GL_QUERY_RESULT, &time_elapsed);
-                       phase->time_elapsed_ns += time_elapsed;
-                       ++phase->num_measured_iterations;

                }
        }
 }
                }
        }
 }

diff --git a/effect_chain.h b/effect_chain.h
index 70dc256f41f19616d4b2fce2875ec98d049e7847..22f0b96c6e4eabc807c8bf57a75b70516c3a8cda 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -23,6 +23,7 @@
 
 #include <epoxy/gl.h>
 #include <stdio.h>
 
 #include <epoxy/gl.h>
 #include <stdio.h>

+#include <list>

 #include <map>
 #include <set>
 #include <string>
 #include <map>
 #include <set>
 #include <string>


@@ -179,7 +180,8 @@ struct Phase {
        std::vector<Uniform<Eigen::Matrix3d> > uniforms_mat3;
 
        // For measurement of GPU time used.
        std::vector<Uniform<Eigen::Matrix3d> > uniforms_mat3;
 
        // For measurement of GPU time used.

-       GLuint timer_query_object;
+       std::list<GLuint> timer_query_objects_running;
+       std::list<GLuint> timer_query_objects_free;

        uint64_t time_elapsed_ns;
        uint64_t num_measured_iterations;
 };
        uint64_t time_elapsed_ns;
        uint64_t num_measured_iterations;
 };