diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-02-07 15:55:21 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-02-10 10:10:17 +0100 |
commit | 67770fc41f409e9d7e179b34eb84434ed237a6ce (patch) | |
tree | e8288614c61024fd3f096e6f86da8aad42858273 | |
parent | 90b02dd4a465f312a6b9c27ff572b5a304e857de (diff) |
if OpenGL is forced, do not enable Skia in order to allow GL
Change-Id: I013db819b66252a25e0a6fddd8e777c3d8d36372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88210
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
-rw-r--r-- | vcl/skia/SkiaHelper.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index cdbb2c0b7977..39588aedcf53 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -122,6 +122,12 @@ bool isVCLSkiaEnabled() { bRet = true; } + else if (getenv("SAL_FORCEGL")) + { + // Skia usage is checked before GL usage, so if GL is forced (and Skia is not), do not + // enable Skia in order to allow GL. + bRet = false; + } else if (bSupportsVCLSkia) { static bool bEnableSkiaEnv = !!getenv("SAL_ENABLESKIA"); |