From 9c7430c3057e3c5f0d1dbeda3e55cec7febb79a7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 30 Apr 2019 13:31:47 +0100 Subject: [PATCH] Fix debug callbacks on GL demos --- util/test/demos/gl/gl_test.cpp | 7 +++++-- util/test/demos/gl/gl_test_linux.cpp | 2 +- util/test/demos/gl/gl_test_win32.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/util/test/demos/gl/gl_test.cpp b/util/test/demos/gl/gl_test.cpp index 2d1a5e7b6..308dcacd1 100644 --- a/util/test/demos/gl/gl_test.cpp +++ b/util/test/demos/gl/gl_test.cpp @@ -29,7 +29,8 @@ static void APIENTRY debugCallback(GLenum source, GLenum type, GLuint id, GLenum GLsizei length, const GLchar *message, const void *userParam) { // too much spam on these types - if(type != GL_DEBUG_TYPE_PERFORMANCE && type != GL_DEBUG_TYPE_OTHER) + if(type != GL_DEBUG_TYPE_PERFORMANCE && type != GL_DEBUG_TYPE_OTHER && + source != GL_DEBUG_SOURCE_APPLICATION) { TEST_ERROR("Debug message: %s", message); } @@ -37,7 +38,9 @@ static void APIENTRY debugCallback(GLenum source, GLenum type, GLuint id, GLenum void OpenGLGraphicsTest::PostInit() { - if(GLAD_GL_ARB_debug_output) + glEnable(GL_FRAMEBUFFER_SRGB); + + if(GLAD_GL_KHR_debug) { glDebugMessageCallback(&debugCallback, NULL); glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); diff --git a/util/test/demos/gl/gl_test_linux.cpp b/util/test/demos/gl/gl_test_linux.cpp index 3d5f305c3..f67194b5a 100644 --- a/util/test/demos/gl/gl_test_linux.cpp +++ b/util/test/demos/gl/gl_test_linux.cpp @@ -60,7 +60,7 @@ bool OpenGLGraphicsTest::Init(int argc, char **argv) return false; } - glEnable(GL_FRAMEBUFFER_SRGB); + PostInit(); return true; } diff --git a/util/test/demos/gl/gl_test_win32.cpp b/util/test/demos/gl/gl_test_win32.cpp index 0a259f354..b1a0123b5 100644 --- a/util/test/demos/gl/gl_test_win32.cpp +++ b/util/test/demos/gl/gl_test_win32.cpp @@ -105,7 +105,7 @@ bool OpenGLGraphicsTest::Init(int argc, char **argv) return false; } - glEnable(GL_FRAMEBUFFER_SRGB); + PostInit(); return true; }