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>

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");