From b4c28826e0f8716583e7663ca2ea7a25079f2583 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@collabora.com>
Date: Mon, 9 Dec 2019 15:47:22 +0100
Subject: force vclcanvas use with Skia, like it's with OpenGL (tdf#129076)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to tdf#93870.

Change-Id: Ie0cb64c05c0fde6a774ce8558d06943870e775fe
Reviewed-on: https://gerrit.libreoffice.org/84758
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
---
 cui/source/options/optgdlg.cxx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'cui')

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ae9cf9961ad8..7a53fb886760 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -625,14 +625,19 @@ CanvasSettings::CanvasSettings() :
 
 bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
+    if (SkiaHelper::isVCLSkiaEnabled() && Application::GetToolkitName() != "gtk3")
+    {
+        mbHWAccelAvailable = false;
+        return false;
+    }
 #if HAVE_FEATURE_OPENGL
-// TODO SKIA
     if (OpenGLWrapper::isVCLOpenGLEnabled() && Application::GetToolkitName() != "gtk3")
+    {
         mbHWAccelAvailable = false;
-
-    else
+        return false;
+    }
 #endif
-        if( !mbHWAccelChecked )
+    if( !mbHWAccelChecked )
     {
         mbHWAccelChecked = true;
 
-- 
cgit