[Libreoffice-commits] core.git: vcl/source

[Michael Meeks]

 vcl/source/opengl/OpenGLHelper.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 0183c1746cd39393dc90b6f3370868bfe272bf5c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Sep 16 13:11:59 2015 +0100

    Add debugging helpers to binary shader loading.
    
    Change-Id: I32b8d8ce0fbf824120c8afd288b728314cd74142
    Reviewed-on: https://gerrit.libreoffice.org/18620
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 114251c..92bfe7d 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -377,20 +377,19 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,
     OString aVertexShaderSource = loadShader(rVertexShaderName);
     OString aFragmentShaderSource = loadShader(rFragmentShaderName);
 
-
-    GLint BinaryResult = GL_FALSE;
+    GLint bBinaryResult = GL_FALSE;
     if( GLEW_ARB_get_program_binary && !rDigest.isEmpty() )
     {
         OString aFileName =
                 createFileName(rVertexShaderName, rFragmentShaderName, rDigest);
-        BinaryResult = loadProgramBinary(ProgramID, aFileName);
+        bBinaryResult = loadProgramBinary(ProgramID, aFileName);
+        VCL_GL_INFO("vcl.opengl", "Load binary shader from '" << aFileName << "'" << bBinaryResult);
         CHECK_GL_ERROR();
     }
 
-    if( BinaryResult != GL_FALSE )
+    if( bBinaryResult != GL_FALSE )
         return ProgramID;
 
-
     VCL_GL_INFO("vcl.opengl", "Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName);
     // Create the shaders
     GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);