diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-12-09 15:47:22 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-12-10 11:04:57 +0100 |
| commit | b4c28826e0f8716583e7663ca2ea7a25079f2583 (patch) | |
| tree | d39c93c007ccda0d3dd272009873a369e004bef9 /cui/source | |
| parent | 55204db25234e22ea00d9bef2fc1a062e942e84d (diff) | |
force vclcanvas use with Skia, like it's with OpenGL (tdf#129076)
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>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
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; |