diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-25 13:14:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-25 17:25:32 +0000 |
| commit | 9fd65d8f9485f44e8f18b4e68d0e70ba154ae636 (patch) | |
| tree | 345c0c52188de84bcab75c9cb0b61618954e8f04 /vcl/skia | |
| parent | 9844064f252e8ec383d3c5bf24830acd868bb764 (diff) | |
Revert "Update skia to m110"
This reverts commit aef70869b0fae3001648ec2a2651ffc9c507678f plus follow-up
4172fcb7514ff8a9e9740ff0939e9a2f611edbce "Fix no-pch Windows build: missing
include". It caused my Windows build `instdir/program/soffice` to immediatley
fail with
> skia\include/core/SkRefCnt.h(62): fatal error: "assert(this->getRefCnt() > 0)"
> warn:skia:10572:7804:external/skia/source/SkMemory_malloc.cxx:32: sk_abort_no_print
on start.
Change-Id: I751f83eda28d9a5a8f9dd4b2429389906ffce983
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146132
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/skia')
| -rw-r--r-- | vcl/skia/SkiaHelper.cxx | 2 | ||||
| -rw-r--r-- | vcl/skia/gdiimpl.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index d307ad7d089e..02ded1c84d32 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -748,7 +748,7 @@ void setBlenderXor(SkPaint* paint) // Skia does not allow binary operators in the default ES2Strict mode, but that's only // because of OpenGL support. We don't use OpenGL, and it's safe for all modes that we do use. // https://groups.google.com/g/skia-discuss/c/EPLuQbg64Kc/m/2uDXFIGhAwAJ - opts.maxVersionAllowed = SkSL::Version::k300; + opts.enforceES2Restrictions = false; auto effect = SkRuntimeEffect::MakeForBlender(SkString(diff), opts); if (!effect.effect) { diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index 6fb496c086b0..15d901d93ff2 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -34,7 +34,6 @@ #include <SkGradientShader.h> #include <SkPath.h> #include <SkRegion.h> -#include <SkPathEffect.h> #include <SkDashPathEffect.h> #include <GrBackendSurface.h> #include <SkTextBlob.h> |