[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Tor Lillqvist]

 vcl/source/opengl/OpenGLContext.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 89f9c38dac55966cd51587176b3bb7e0e5867f3d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 5 16:17:54 2016 +0200

    Fix dbgutil build in case GL_DEBUG_SEVERITY_NOTIFICATION_ARB is undefined
    
    Change-Id: I14628e9dee8651e87b4782057c4681fded5e4643
    (cherry picked from commit 1fd7994a4ea7daf8bdbf394f4d5cd8f678d00758)

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index ede2e2b..82d987d 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1044,8 +1044,10 @@ void OpenGLContext::InitGLEWDebugging()
             glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
             glDebugMessageCallbackARB(&debug_callback, nullptr);
 
+#ifdef GL_DEBUG_SEVERITY_NOTIFICATION_ARB
             // Ignore i965’s shader compiler notification flood.
             glDebugMessageControlARB(GL_DEBUG_SOURCE_SHADER_COMPILER_ARB, GL_DEBUG_TYPE_OTHER_ARB, GL_DEBUG_SEVERITY_NOTIFICATION_ARB, 0, nullptr, true);
+#endif
         }
         else if ( glDebugMessageCallback )
         {