From 11c40ba6cdee50b14f062dd73860c3ae53c75cad Mon Sep 17 00:00:00 2001 From: Zachary Lund Date: Thu, 6 Feb 2014 01:57:14 -0600 Subject: [PATCH] Minor adjustment to code. ARB version of debug_output doesn't use GL_DEBUG_OUTPUT --- libobs-opengl/gl-subsystem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libobs-opengl/gl-subsystem.c b/libobs-opengl/gl-subsystem.c index ebe42dc12..f75897149 100644 --- a/libobs-opengl/gl-subsystem.c +++ b/libobs-opengl/gl-subsystem.c @@ -71,17 +71,15 @@ static void APIENTRY gl_debug_proc( static void gl_enable_debug() { /* Perhaps we should create GLEW contexts? */ - if (ogl_IsVersionGEQ(4, 3)) + if (ogl_IsVersionGEQ(4, 3)) { glDebugMessageCallback(gl_debug_proc, NULL); - else if (ogl_ext_ARB_debug_output) + gl_enable(GL_DEBUG_OUTPUT); + } else if (ogl_ext_ARB_debug_output) { glDebugMessageCallbackARB(gl_debug_proc, NULL); - else { + } else { blog(LOG_DEBUG, "Failed to set GL debug callback as it is " "not supported."); - return; } - - gl_enable(GL_DEBUG_OUTPUT); } #else static void gl_enable_debug() {}