CRenderSystemGLES: allow using OpenGL debugging callbacks

xbmc · Nov 3, 2018 · d2e95ca · d2e95ca
1 parent 439637b
commit d2e95ca
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/xbmc/rendering/gles/RenderSystemGLES.cpp b/xbmc/rendering/gles/RenderSystemGLES.cpp
@@ -9,9 +9,11 @@
 #include "guilib/DirtyRegion.h"
 #include "windowing/GraphicContext.h"
 #include "settings/AdvancedSettings.h"
+#include "settings/SettingsComponent.h"
 #include "RenderSystemGLES.h"
 #include "rendering/MatrixGL.h"
 #include "utils/log.h"
+#include "utils/EGLUtils.h"
 #include "utils/GLUtils.h"
 #include "utils/TimeUtils.h"
 #include "utils/SystemInfo.h"
@@ -31,6 +33,11 @@ CRenderSystemGLES::~CRenderSystemGLES()
 
 bool CRenderSystemGLES::InitRenderSystem()
 {
+  if(CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_openGlDebugging)
+  {
+    EnableDebugging();
+  }
+
   GLint maxTextureSize;
 
   glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
@@ -628,3 +635,17 @@ GLint CRenderSystemGLES::GUIShaderGetModel()
 
   return -1;
 }
+
+void CRenderSystemGLES::EnableDebugging()
+{
+  PFNGLDEBUGMESSAGECALLBACKKHRPROC glDebugMessageCallback = CEGLUtils::GetRequiredProcAddress<PFNGLDEBUGMESSAGECALLBACKKHRPROC>("glDebugMessageCallbackKHR");
+  PFNGLDEBUGMESSAGECONTROLKHRPROC glDebugMessageControl = CEGLUtils::GetRequiredProcAddress<PFNGLDEBUGMESSAGECONTROLKHRPROC>("glDebugMessageControlKHR");
+
+  glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR);
+  glDebugMessageCallback(reinterpret_cast<GLDEBUGPROCKHR>(GlErrorCallback), nullptr);
+
+  // ignore shader compilation information
+  glDebugMessageControl(GL_DEBUG_SOURCE_SHADER_COMPILER_KHR, GL_DEBUG_TYPE_OTHER_KHR, GL_DONT_CARE, 0, nullptr, GL_FALSE);
+
+  CLog::Log(LOGDEBUG, "OpenGL(ES): debugging enabled");
+}
diff --git a/xbmc/rendering/gles/RenderSystemGLES.h b/xbmc/rendering/gles/RenderSystemGLES.h
@@ -103,5 +103,8 @@ class CRenderSystemGLES : public CRenderSystemBase
   ESHADERMETHOD m_method = SM_DEFAULT;
 
   GLint      m_viewPort[4];
+
+private:
+  void EnableDebugging();
 };
 
diff --git a/xbmc/utils/EGLUtils.cpp b/xbmc/utils/EGLUtils.cpp
@@ -313,6 +313,8 @@ bool CEGLContextUtils::CreateContext(CEGLAttributesVec contextAttribs)
   if (CEGLUtils::HasExtension(m_eglDisplay, "EGL_IMG_context_priority"))
     contextAttribs.Add({{EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG}});
 
+  contextAttribs.Add({{EGL_CONTEXT_FLAGS_KHR, EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR}});
+
   m_eglContext = eglCreateContext(m_eglDisplay, eglConfig,
                                   EGL_NO_CONTEXT, contextAttribs.Get());