Fixed gpu profiling under multiple contexts.

[apitrace] / retrace / glretrace_main.cpp

diff --git a/retrace/glretrace_main.cpp b/retrace/glretrace_main.cpp
index 49be5054ee07b727c9262e5faf8bf21b861e64d8..ee19a69bb8ee3eeb6874492662a87182a62c4b5d 100644 (file)
--- a/retrace/glretrace_main.cpp
+++ b/retrace/glretrace_main.cpp
@@ -34,8 +34,20 @@
 
 namespace glretrace {
 
+bool insideList = false;
 bool insideGlBeginEnd = false;
 
+struct CallQuery
+{
+    GLuint ids[2];
+    unsigned call;
+    const trace::FunctionSig *sig;
+};
+
+static bool firstFrame = true;
+static std::list<CallQuery> callQueries;
+static const int maxActiveCallQueries = 100;
+
 
 void
 checkGlError(trace::Call &call) {
@@ -82,10 +94,93 @@ checkGlError(trace::Call &call) {
     os << "\n";
 }
 
+static GLuint64
+getTimestamp() {
+    GLuint query = 0;
+    GLuint64 timestamp = 0;
+
+    glGenQueries(1, &query);
+    glQueryCounter(query, GL_TIMESTAMP);
+    glGetQueryObjectui64vEXT(query, GL_QUERY_RESULT, &timestamp);
+    glDeleteQueries(1, &query);
+
+    return timestamp;
+}
+
+static void
+completeCallQuery(CallQuery& query) {
+    /* Get call start and duration */
+    GLuint64 timestamp = 0, duration = 0;
+    glGetQueryObjectui64vEXT(query.ids[0], GL_QUERY_RESULT, &timestamp);
+    glGetQueryObjectui64vEXT(query.ids[1], GL_QUERY_RESULT, &duration);
+    glDeleteQueries(2, query.ids);
+
+    /* Add call to profile */
+    retrace::profiler.addCall(query.call, query.sig->name, timestamp, duration);
+}
+
+void
+flushQueries() {
+    for (std::list<CallQuery>::iterator itr = callQueries.begin(); itr != callQueries.end(); ++itr) {
+        completeCallQuery(*itr);
+    }
+
+    callQueries.clear();
+}
+
+void
+beginProfileGPU(trace::Call &call) {
+    if (firstFrame) {
+        frame_start();
+    }
+
+    /* Ensure we don't have TOO many queries waiting for results */
+    if (callQueries.size() >= maxActiveCallQueries) {
+        completeCallQuery(callQueries.front());
+        callQueries.pop_front();
+    }
+
+    /* Create call query */
+    CallQuery query;
+    query.call = call.no;
+    query.sig = call.sig;
+
+    glGenQueries(2, query.ids);
+    glQueryCounter(query.ids[0], GL_TIMESTAMP);
+    glBeginQuery(GL_TIME_ELAPSED, query.ids[1]);
+
+    callQueries.push_back(query);
+}
+
+void
+endProfileGPU(trace::Call &call) {
+    glEndQuery(GL_TIME_ELAPSED);
+}
+
+void
+frame_start() {
+    firstFrame = false;
+
+    if (retrace::profileGPU) {
+        retrace::profiler.addFrameStart(retrace::frameNo, getTimestamp());
+    }
+}
+
+void
+frame_complete(trace::Call &call) {
+    if (retrace::profileGPU) {
+        /* Complete any remaining queries */
+        flushQueries();
+
+        /* Indicate end of current frame */
+        retrace::profiler.addFrameEnd(getTimestamp());
+    }
 
-void frame_complete(trace::Call &call) {
     retrace::frameComplete(call);
 
+    /* Indicate start of next frame */
+    frame_start();
+
     if (!currentDrawable) {
         return;
     }
@@ -95,7 +190,6 @@ void frame_complete(trace::Call &call) {
     }
 }
 
-
 } /* namespace glretrace */
 
 
@@ -142,6 +236,7 @@ retrace::dumpState(std::ostream &os)
 
 void
 retrace::flushRendering(void) {
+    glretrace::flushQueries();
     glFlush();
 }