Merge remote-tracking branch 'github/master' into profile-gui

Conflicts:
	gui/mainwindow.cpp

diff --combined retrace/glretrace.py
index 8864296868ef9c924a2caef09af94b751263cad8,879f3e4b786118ca5d46dde56b4670739e025bc2..987798fe6a0c5cab01eb015a93ef62f708a50aea
--- 1/retrace/glretrace.py
--- 2/retrace/glretrace.py
+++ b/retrace/glretrace.py
@@@ -299,7 -299,9 +299,9 @@@ class GlRetracer(Retracer)
          )
  
          if function.name in ('glUseProgram', 'glUseProgramObjectARB'):
-             print r'    glretrace::setActiveProgram((call.arg(0)).toUInt());'
+             print r'    if (glretrace::currentContext) {'
+             print r'        glretrace::currentContext->activeProgram = call.arg(0).toUInt();'
+             print r'    }'
  
          # Only profile if not inside a list as the queries get inserted into list
          if function.name == 'glNewList':
@@@ -344,16 -346,15 +346,16 @@@
          else:
              Retracer.invokeFunction(self, function)
  
 +        if function.name == "glBegin":
 +            print '    glretrace::insideGlBeginEnd = true;'
 +
          if profileDraw or function.name == 'glEnd':
              print r'    if (!glretrace::insideList && !glretrace::insideGlBeginEnd && retrace::profiling) {'
              print r'        glretrace::endProfile(call);'
              print r'    }'
  
          # Error checking
 -        if function.name == "glBegin":
 -            print '    glretrace::insideGlBeginEnd = true;'
 -        elif function.name.startswith('gl'):
 +        if function.name.startswith('gl'):
              # glGetError is not allowed inside glBegin/glEnd
              print '    if (retrace::debug && !glretrace::insideGlBeginEnd) {'
              print '        glretrace::checkGlError(call);'

diff --combined retrace/glretrace_main.cpp
index 9972f3bce6f3a5af3f81a74bc6ec583a46acb6ee,d561b55069c395d59a7fba23d7cb649c2c8e154e..63912ec9f76a4272980639a57c1d37f6574522d7
mode 100755,100644..100755
--- 1/retrace/glretrace_main.cpp
--- 2/retrace/glretrace_main.cpp
+++ b/retrace/glretrace_main.cpp
@@@ -32,6 -32,11 +32,11 @@@
  #include "glretrace.hpp"
  #include "os_time.hpp"
  
+ /* Synchronous debug output may reduce performance however,
+  * without it the callNo in the callback may be inaccurate
+  * as the callback may be called at any time.
+  */
+ #define DEBUG_OUTPUT_SYNCHRONOUS 0
  
  namespace glretrace {
  
@@@ -54,8 -59,9 +59,9 @@@ static bool supportsOcclusion = true
  
  static bool firstFrame = true;
  static std::list<CallQuery> callQueries;
- static std::map<glws::Context*, GLuint> activePrograms;
  
+ static void APIENTRY
+ debugOutputCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
  
  void
  checkGlError(trace::Call &call) {
@@@ -120,7 -126,7 +126,7 @@@ getGpuTimestamp() 
  static GLuint64
  getCpuTimestamp() {
      if (retrace::profilingCpuTimes) {
 -        return os::getTime() * (1.0E9 / os::timeFrequency);
 +        return os::getTime();
      } else {
          return 0;
      }
@@@ -160,52 -166,9 +166,9 @@@ 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) {
-         /* 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);
-         }
- 
          frame_start();
      }
  
@@@ -213,7 -176,7 +176,7 @@@
      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);
  
@@@ -242,7 -205,7 +205,7 @@@ voi
  endProfile(trace::Call &call) {
      if (retrace::profilingCpuTimes) {
          CallQuery& query = callQueries.back();
 -        query.duration = (os::getTime() - query.start) * (1.0E9 / os::timeFrequency);
 +        query.duration = os::getTime() - query.start;
      }
  
      if (retrace::profilingGpuTimes && supportsElapsed) {
@@@ -254,6 -217,48 +217,48 @@@
      }
  }
  
+ 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);
+     }
+ 
+     if (retrace::debug) {
+         bool supportsDebugOutput = glws::checkExtension("GL_ARB_debug_output", extensions);
+ 
+         if (supportsDebugOutput) {
+             glDebugMessageCallbackARB(&debugOutputCallback, currentContext);
+ 
+             if (DEBUG_OUTPUT_SYNCHRONOUS) {
+                 glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
+             }
+         }
+     }
+ }
+ 
  void
  frame_start() {
      firstFrame = false;
@@@ -287,6 -292,69 +292,69 @@@ frame_complete(trace::Call &call) 
      }
  }
  
+ static const char*
+ getDebugOutputSource(GLenum source) {
+     switch(source) {
+     case GL_DEBUG_SOURCE_API_ARB:
+         return "API";
+     case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:
+         return "Window System";
+     case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB:
+         return "Shader Compiler";
+     case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:
+         return "Third Party";
+     case GL_DEBUG_SOURCE_APPLICATION_ARB:
+         return "Application";
+     case GL_DEBUG_SOURCE_OTHER_ARB:
+     default:
+         return "";
+     }
+ }
+ 
+ static const char*
+ getDebugOutputType(GLenum type) {
+     switch(type) {
+     case GL_DEBUG_TYPE_ERROR_ARB:
+         return "error";
+     case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
+         return "deprecated behaviour";
+     case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
+         return "undefined behaviour";
+     case GL_DEBUG_TYPE_PORTABILITY_ARB:
+         return "portability issue";
+     case GL_DEBUG_TYPE_PERFORMANCE_ARB:
+         return "performance issue";
+     case GL_DEBUG_TYPE_OTHER_ARB:
+     default:
+         return "unknown issue";
+     }
+ }
+ 
+ static const char*
+ getDebugOutputSeverity(GLenum severity) {
+     switch(severity) {
+     case GL_DEBUG_SEVERITY_HIGH_ARB:
+         return "High";
+     case GL_DEBUG_SEVERITY_MEDIUM_ARB:
+         return "Medium";
+     case GL_DEBUG_SEVERITY_LOW_ARB:
+         return "Low";
+     default:
+         return "usnknown";
+     }
+ }
+ 
+ static void APIENTRY
+ debugOutputCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam) {
+     std::cerr << retrace::callNo << ": ";
+     std::cerr << "glDebugOutputCallback: ";
+     std::cerr << getDebugOutputSeverity(severity) << " severity ";
+     std::cerr << getDebugOutputSource(source) << " " << getDebugOutputType(type);
+     std::cerr << " " << id;
+     std::cerr << ", " << message;
+     std::cerr << std::endl;
+ }
+ 
  } /* namespace glretrace */