[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/source

[Michael Meeks]

 vcl/source/opengl/OpenGLHelper.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 9cb55efb76e03ba821840ac86bba6f4f9fcb6586
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sun Nov 16 16:59:04 2014 +0100

    vcl: disable OpenGL usage during build.
    
    Change-Id: I3a534578df727f2aaab6e36839f0e62e6fc8f208

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 3dd5df8..fda89c3 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -382,7 +382,16 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
         return false;
 
     static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
-    bool bEnable = bEnableGLEnv || officecfg::Office::Common::VCL::UseOpenGL::get();
+
+    bool bEnable = bEnableGLEnv;
+
+    static bool bDuringBuild = getenv("VCL_HIDE_WINDOWS");
+    if (bDuringBuild && !bEnable /* env. enable overrides */)
+        bEnable = false;
+
+    else if (officecfg::Office::Common::VCL::UseOpenGL::get())
+        bEnable = true;
+
     return bEnable;
 }