vcl/README.vars | 1 + vcl/source/opengl/OpenGLHelper.cxx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 998c64eaad98639654535229faf0e499336852d9 Author: Michael Meeks <michael.me...@collabora.com> Date: Wed Sep 2 16:08:11 2015 +0100 Add SAL_DISABLE_GL_WATCHDOG env. var for obvious reasons. Change-Id: Iec7cb6504a389972d8187954d5ed7aff94f2e01c diff --git a/vcl/README.vars b/vcl/README.vars index 0cc8576..9285f87 100644 --- a/vcl/README.vars +++ b/vcl/README.vars @@ -22,3 +22,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 6288849..4065ce0 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -668,7 +668,8 @@ bool OpenGLHelper::isVCLOpenGLEnabled() } if (bRet) { - OpenGLWatchdogThread::start(); + if (!getenv("SAL_DISABLE_GL_WATCHDOG")) + OpenGLWatchdogThread::start(); ImplGetSVData()->maWinData.mbNoSaveBackground = true; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits