[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/README.vars vcl/source

[Michael Meeks]

 vcl/README.vars                    |    1 +
 vcl/source/opengl/OpenGLHelper.cxx |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a4cd1c4f5aff66ecdfffc083dcf4dac947b055e5
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Sep 2 16:08:11 2015 +0100

    Add SAL_DISABLE_GL_WATCHDOG env. var for obvious reasons.
    
    Change-Id: Iec7cb6504a389972d8187954d5ed7aff94f2e01c
    Reviewed-on: https://gerrit.libreoffice.org/18272
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/README.vars b/vcl/README.vars
index 5cd049f..0bbb736 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -21,3 +21,4 @@ OpenGL
 SAL_FORCEGL - force enable OpenGL
 SAL_WITHOUT_WIDGET_CACHE - disable LRU caching of native widget texutres
 SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures
+SAL_DISABLE_GL_WATCHDOG - don't start the thread that watches for broken GL drivers
\ No newline at end of file
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 526e124..ad90e1a 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -672,7 +672,8 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
     }
     if (bRet)
     {
-        OpenGLWatchdogThread::start();
+        if (!getenv("SAL_DISABLE_GL_WATCHDOG"))
+            OpenGLWatchdogThread::start();
         ImplGetSVData()->maWinData.mbNoSaveBackground = true;
     }