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 /canvas | |
| 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 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/directx/dx_canvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 3 | ||||
| -rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index b53f8bcb0bed..3f6dcaf3d2f9 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -26,6 +26,7 @@ #include <tools/diagnose_ex.h> #include <vcl/sysdata.hxx> #include <vcl/opengl/OpenGLWrapper.hxx> +#include <vcl/skia/SkiaHelper.hxx> #include "cairo_canvas.hxx" @@ -48,6 +49,7 @@ namespace cairocanvas // tdf#93870 - force VCL canvas in OpenGL mode for now. assert( !OpenGLWrapper::isVCLOpenGLEnabled() ); + assert( !SkiaHelper::isVCLSkiaEnabled() ); /* maArguments: 0: ptr to creating instance (Window or VirtualDevice) diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index 28c73ed50e3c..39a319f31cff 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -37,6 +37,7 @@ #include <tools/diagnose_ex.h> #include <vcl/sysdata.hxx> #include <vcl/opengl/OpenGLWrapper.hxx> +#include <vcl/skia/SkiaHelper.hxx> #include <canvas/canvastools.hxx> @@ -85,6 +86,7 @@ namespace dxcanvas // tdf#93870 - force VCL canvas in OpenGL mode for now. assert( !OpenGLWrapper::isVCLOpenGLEnabled() ); + assert( !SkiaHelper::isVCLSkiaEnabled() ); SAL_INFO("canvas.directx", "Canvas::initialize called" ); diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 0bdacec7b4f7..86dbc2f12aeb 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -40,6 +40,7 @@ #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> #endif +#include <vcl/skia/SkiaHelper.hxx> #include <unotools/configmgr.hxx> using namespace ::com::sun::star; @@ -303,6 +304,8 @@ Reference<XInterface> CanvasFactory::lookupAndUse( if( OpenGLWrapper::isVCLOpenGLEnabled() ) bForceLastEntry = true; #endif + if( SkiaHelper::isVCLSkiaEnabled() ) + bForceLastEntry = true; // use anti-aliasing canvas, if config flag set (or not existing) bool bUseAAEntry(true); diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 0c721b95a484..29ec50b63ccf 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -33,6 +33,7 @@ #include <vcl/outdev.hxx> #include <vcl/BitmapMonochromeFilter.hxx> #include <vcl/opengl/OpenGLHelper.hxx> +#include <vcl/skia/SkiaHelper.hxx> #include <canvas/canvastools.hxx> #include <config_features.h> @@ -187,6 +188,7 @@ namespace vclcanvas #if HAVE_FEATURE_UI || OpenGLHelper::isVCLOpenGLEnabled() #endif + || SkiaHelper::isVCLSkiaEnabled() ) { // "complex" transformation, employ affine |