vcl/source/opengl/OpenGLHelper.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit dfa1f2c83ff57e2e225c0c79ced1d13a48f2317a Author: Tor Lillqvist <[email protected]> Date: Wed May 25 15:33:17 2016 +0300 Use VCL_GL_INFO here Failing to open a cached shader binary is a no reason for a SAL_WARN. It is normal that they don't exist when first trying, that is the very nature of a 'cache'. Change-Id: Iaa40af11f0679b859f1fa8b246665c61640df379 diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 2451594..5dff689 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -290,12 +290,12 @@ namespace sal_uInt64 nBytesRead = 0; aFile.read( rBinary.data(), nSize, nBytesRead ); assert( nSize == nBytesRead ); - SAL_INFO("vcl.opengl", "Loading file: '" << rBinaryFileName << "': success" ); + VCL_GL_INFO("Loading file: '" << rBinaryFileName << "': success" ); return true; } else { - SAL_WARN("vcl.opengl", "Loading file: '" << rBinaryFileName << "': FAIL"); + VCL_GL_INFO("Loading file: '" << rBinaryFileName << "': FAIL"); } return false; commit 2864c50d0ad8a00eb5b518728d70af81120da4ab Author: Tor Lillqvist <[email protected]> Date: Wed May 25 15:29:21 2016 +0300 Avoid redundancy: The same information was logged in readProgramBinary() Change-Id: Id5619c9c102ba72826265c1b5f46ddb58596b8b1 diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 70f4b09..2451594 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -406,7 +406,6 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, OString aFileName = createFileName(rVertexShaderName, rFragmentShaderName, rGeometryShaderName, rDigest); bBinaryResult = loadProgramBinary(ProgramID, aFileName); - VCL_GL_INFO("Load binary shader from '" << aFileName << "'" << bBinaryResult); CHECK_GL_ERROR(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
