diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-16 13:11:59 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-09-16 14:03:18 +0000 |
| commit | 0183c1746cd39393dc90b6f3370868bfe272bf5c (patch) | |
| tree | 40b14f4a0ddc4cbe6adba5eccbbf7105b42c573c /vcl | |
| parent | 7993663cc559e2a2c72804f7b4fa553f8c7441c3 (diff) | |
Add debugging helpers to binary shader loading.
Change-Id: I32b8d8ce0fbf824120c8afd288b728314cd74142
Reviewed-on: https://gerrit.libreoffice.org/18620
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
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); |