summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-11-15 10:16:02 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-11-15 12:17:44 +0100
commita1754292bbb3d83fa0e23cf3a84b903911734387 (patch)
tree791686a76610c2212d5b6d20023ca2ac62cea8ca
parent0e55b14db52031d809d6537272902aa5fd94158d (diff)
ialso support the ARB debug version
Change-Id: I247d43805ce08db49b487079aecee2a7b50277f5
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 2c6de419f12d..0e760bc84457 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -857,10 +857,18 @@ bool OpenGLContext::InitGLEW()
// only enable debug output in dbgutil build
// somehow there are implementations where the feature is present and the function
// pointer is still NULL
- if( GLEW_ARB_debug_output && glDebugMessageCallback )
+ if( GLEW_ARB_debug_output)
{
- glEnable(GL_DEBUG_OUTPUT);
- glDebugMessageCallback(&debug_callback, NULL);
+ if (glDebugMessageCallbackARB)
+ {
+ glEnable(GL_DEBUG_OUTPUT);
+ glDebugMessageCallbackARB(&debug_callback, NULL);
+ }
+ else if ( glDebugMessageCallback )
+ {
+ glEnable(GL_DEBUG_OUTPUT);
+ glDebugMessageCallback(&debug_callback, NULL);
+ }
}
#endif