tdf#100159: On Windows, compile GL shaders in advance, disable GL on failure

This is a combination of multiple commits in master, adapted for this
branch as necessary:

Don't claim to be reading a file before trying to open it

Avoid redundancy: The same information was logged in readProgramBinary()

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'.

Move exithelper.h to include. We will want to use EXITHELPER_NORMAL_RESTART
in vcl, too.

If the shader compilation or loading of an already compiled shader
fails, disable OpenGL in the registry and exit with the
EXITHELPER_NORMAL_RESTART status. The wrapper process will thus
run soffice.bin once more, and this time OpenGL will not be used.

Change-Id: I54d92f150975d3fa72d93f3f679b16c90ee38f02
Reviewed-on: https://gerrit.libreoffice.org/25708
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 8418706c3784..5892a625300e 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -66,7 +66,6 @@ OString loadShader(const OUString& rFilename)
 {
     OUString aFileURL = getShaderFolder() + rFilename +".glsl";
     osl::File aFile(aFileURL);
-    SAL_INFO("vcl.opengl", "Reading " << aFileURL);
     if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
     {
         sal_uInt64 nSize = 0;
@@ -76,11 +75,12 @@ OString loadShader(const OUString& rFilename)
         aFile.read(content.get(), nSize, nBytesRead);
         assert(nSize == nBytesRead);
         content.get()[nBytesRead] = 0;
+        SAL_INFO("vcl.opengl", "Read " << nBytesRead << " bytes from " << aFileURL);
         return OString(content.get());
     }
     else
     {
-        SAL_WARN("vcl.opengl", "could not load the file: " << aFileURL);
+        SAL_WARN("vcl.opengl", "Could not open " << aFileURL);
     }
 
     return OString();
@@ -289,12 +289,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;
@@ -405,7 +405,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();
     }