summaryrefslogtreecommitdiff
path: root/vcl/source/opengl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-09-24 23:50:13 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-09-24 23:51:31 +0200
commit1a4555f3b3572f398c33bffd1ed2a40705431733 (patch)
tree406b8e9c8083741a7ce67110fb07b7fcd7a78d38 /vcl/source/opengl
parenta05b67585249b895a70e7fae89dc177e3aeaf57a (diff)
fix the OpenGL selection logic
Now OpenGL is again not used on the build bots. Change-Id: I7369394c44ab1e16135e2b22f7f8effca0f25d3c
Diffstat (limited to 'vcl/source/opengl')
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index c302d060cd33..ac7f99e9f0a1 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -1006,12 +1006,13 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
bForceOpenGL = !!getenv("SAL_FORCEGL") || officecfg::Office::Common::VCL::ForceOpenGL::get();
bool bRet = false;
+ bool bSupportsVCLOpenGL = supportsVCLOpenGL();
// always call supportsVCLOpenGL to de-zombie the glxtest child process on X11
- if (supportsVCLOpenGL() || bForceOpenGL)
+ if (bForceOpenGL)
{
bRet = true;
}
- else
+ else if (bSupportsVCLOpenGL)
{
static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");