From 0183c1746cd39393dc90b6f3370868bfe272bf5c Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 16 Sep 2015 13:11:59 +0100 Subject: Add debugging helpers to binary shader loading. Change-Id: I32b8d8ce0fbf824120c8afd288b728314cd74142 Reviewed-on: https://gerrit.libreoffice.org/18620 Tested-by: Jenkins Reviewed-by: Michael Meeks --- vcl/source/opengl/OpenGLHelper.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'vcl') diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 114251ce24f4..92bfe7db5b77 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); -- cgit