Add initContext to glretrace.

[apitrace] / retrace / glretrace_main.cpp

diff --git a/retrace/glretrace_main.cpp b/retrace/glretrace_main.cpp
index ce064021bfa28ba74b99884f92ad5de49c52e28c..9d551af2890819b17d1789f65c2e70e577483632 100644 (file)
--- a/retrace/glretrace_main.cpp
+++ b/retrace/glretrace_main.cpp
@@ -48,10 +48,12 @@ struct CallQuery
     uint64_t duration;
 };
 
+static bool supportsElapsed = true;
+static bool supportsTimestamp = true;
+static bool supportsOcclusion = true;
+
 static bool firstFrame = true;
 static std::list<CallQuery> callQueries;
-static const int maxActiveCallQueries = 128;
-static std::map<glws::Context*, GLuint> activePrograms;
 
 
 void
@@ -104,7 +106,7 @@ getGpuTimestamp() {
     GLuint query = 0;
     GLuint64 timestamp = 0;
 
-    if (retrace::profilingGpuTimes) {
+    if (retrace::profilingGpuTimes && supportsTimestamp) {
         glGenQueries(1, &query);
         glQueryCounter(query, GL_TIMESTAMP);
         glGetQueryObjectui64vEXT(query, GL_QUERY_RESULT, &timestamp);
@@ -129,11 +131,16 @@ completeCallQuery(CallQuery& query) {
     GLuint64 timestamp = 0, duration = 0, samples = 0;
 
     if (retrace::profilingGpuTimes) {
-        glGetQueryObjectui64vEXT(query.ids[0], GL_QUERY_RESULT, &timestamp);
-        glGetQueryObjectui64vEXT(query.ids[1], GL_QUERY_RESULT, &duration);
+        if (supportsTimestamp) {
+            glGetQueryObjectui64vEXT(query.ids[0], GL_QUERY_RESULT, &timestamp);
+        }
+
+        if (supportsElapsed) {
+            glGetQueryObjectui64vEXT(query.ids[1], GL_QUERY_RESULT, &duration);
+        }
     }
 
-    if (retrace::profilingPixelsDrawn) {
+    if (retrace::profilingPixelsDrawn && supportsOcclusion) {
         glGetQueryObjectui64vEXT(query.ids[2], GL_QUERY_RESULT, &samples);
     }
 
@@ -152,56 +159,39 @@ flushQueries() {
     callQueries.clear();
 }
 
-void setActiveProgram(GLuint program)
-{
-    activePrograms[glretrace::currentContext] = program;
-}
-
-static GLuint
-getActiveProgram()
-{
-    std::map<glws::Context*, GLuint>::iterator it;
-    it = activePrograms.find(glretrace::currentContext);
-    if (it == activePrograms.end())
-        return 0;
-
-    return it->second;
-}
-
 void
 beginProfile(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;
-    query.program = getActiveProgram();
+    query.program = glretrace::currentContext ? glretrace::currentContext->activeProgram : 0;
 
     glGenQueries(3, query.ids);
 
     if (retrace::profilingGpuTimes) {
-        glQueryCounter(query.ids[0], GL_TIMESTAMP);
-        glBeginQuery(GL_TIME_ELAPSED, query.ids[1]);
+        if (supportsTimestamp) {
+            glQueryCounter(query.ids[0], GL_TIMESTAMP);
+        }
+
+        if (supportsElapsed) {
+            glBeginQuery(GL_TIME_ELAPSED, query.ids[1]);
+        }
     }
 
-    if (retrace::profilingPixelsDrawn) {
+    if (retrace::profilingPixelsDrawn && supportsOcclusion) {
         glBeginQuery(GL_SAMPLES_PASSED, query.ids[2]);
     }
 
-    callQueries.push_back(query);
-
     if (retrace::profilingCpuTimes) {
         query.start = os::getTime();
     }
+
+    callQueries.push_back(query);
 }
 
 void
@@ -211,15 +201,45 @@ endProfile(trace::Call &call) {
         query.duration = (os::getTime() - query.start) * (1.0E9 / os::timeFrequency);
     }
 
-    if (retrace::profilingGpuTimes) {
+    if (retrace::profilingGpuTimes && supportsElapsed) {
         glEndQuery(GL_TIME_ELAPSED);
     }
 
-    if (retrace::profilingPixelsDrawn) {
+    if (retrace::profilingPixelsDrawn && supportsOcclusion) {
         glEndQuery(GL_SAMPLES_PASSED);
     }
 }
 
+void
+initContext() {
+    /* Check for extension support */
+    const char* extensions = (const char*)glGetString(GL_EXTENSIONS);
+    GLint bits;
+
+    supportsTimestamp = glws::checkExtension("GL_ARB_timer_query", extensions);
+    supportsElapsed   = glws::checkExtension("GL_EXT_timer_query", extensions) || supportsTimestamp;
+    supportsOcclusion = glws::checkExtension("GL_ARB_occlusion_query", extensions);
+
+    if (retrace::profilingGpuTimes) {
+        if (!supportsTimestamp && !supportsElapsed) {
+            std::cout << "Error: Cannot run profile, GL_EXT_timer_query extension is not supported." << std::endl;
+            exit(-1);
+        }
+
+        glGetQueryiv(GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS, &bits);
+
+        if (!bits) {
+            std::cout << "Error: Cannot run profile, GL_QUERY_COUNTER_BITS == 0." << std::endl;
+            exit(-1);
+        }
+    }
+
+    if (retrace::profilingPixelsDrawn && !supportsOcclusion) {
+        std::cout << "Error: Cannot run profile, GL_ARB_occlusion_query extension is not supported." << std::endl;
+        exit(-1);
+    }
+}
+
 void
 frame_start() {
     firstFrame = false;