From 07df2cc37c42ccd8c0a9a5083fa6123ff1753bea Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 13 Jan 2017 15:54:03 +0000 Subject: [PATCH] Check for KHR_debug when calling glDebugMessageCallback --- renderdoc/driver/gl/gl_driver.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index fc70d20ba..a7e1c59a7 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -759,7 +759,7 @@ WrappedOpenGL::WrappedOpenGL(const char *logfile, const GLHookSet &funcs) : m_Re } // once GL driver is more tested, this can be disabled - if(m_Real.glDebugMessageCallback) + if(ExtensionSupported[GLExt_KHR_debug] && m_Real.glDebugMessageCallback) { m_Real.glDebugMessageCallback(&DebugSnoopStatic, this); #if ENABLED(RDOC_DEVEL) @@ -1347,7 +1347,8 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) const GLHookSet &gl = m_Real; - if(gl.glDebugMessageCallback && RenderDoc::Inst().GetCaptureOptions().APIValidation) + if(ExtensionSupported[GLExt_KHR_debug] && gl.glDebugMessageCallback && + RenderDoc::Inst().GetCaptureOptions().APIValidation) { gl.glDebugMessageCallback(&DebugSnoopStatic, this); gl.glEnable(eGL_DEBUG_OUTPUT_SYNCHRONOUS);