vcl/source/opengl/OpenGLContext.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 3ddae832bbb71306a574c4e1087de0a0da318966 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon May 12 17:49:00 2014 +0200 fix crash when glDebugMessageCallback is 0 despite feature being there Change-Id: I1e6986e1e56f78f10f4677f471d2bdea2231f787 Reviewed-on: https://gerrit.libreoffice.org/9331 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Tested-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 58202fb..1700488 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -525,7 +525,9 @@ bool OpenGLContext::ImplInit() #ifdef DBG_UTIL // only enable debug output in dbgutil build - if( GLEW_ARB_debug_output ) + // somehow there are implementations where the feature is present and the function + // pointer is still NULL + if( GLEW_ARB_debug_output && glDebugMessageCallback ) { glEnable(GL_DEBUG_OUTPUT); glDebugMessageCallback(&debug_callback, NULL); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits