diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-27 10:48:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-30 10:52:07 +0000 |
| commit | 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 (patch) | |
| tree | 927f6acdccb70e544dd94a129f656ca311e87006 /vcl/skia | |
| parent | e2c811e6f9c0b2de47153a70a783f4d808eab3ab (diff) | |
Update skia to m111
(*) Remove patches already upstream
(*) Remove the skia_sk_cpu_sse_level_0_by_default.patch.1 patch and rather set
that define via -D parameter, because that is how the skia BUILD.gn
seems to do it.
(*) I hand edited the PCH file, because running the update_pch script failed for me.
Change-Id: I1fd175b9f63f8d2792a1876e4ece03fe92fb5374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146251
Tested-by: Jenkins
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/skia')
| -rw-r--r-- | vcl/skia/SkiaHelper.cxx | 6 | ||||
| -rw-r--r-- | vcl/skia/gdiimpl.cxx | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index 02ded1c84d32..905baba98775 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -501,7 +501,7 @@ sk_sp<SkSurface> createSkSurface(int width, int height, SkColorType type, SkAlph { if (GrDirectContext* grDirectContext = getSharedGrDirectContext()) { - surface = SkSurface::MakeRenderTarget(grDirectContext, SkBudgeted::kNo, + surface = SkSurface::MakeRenderTarget(grDirectContext, skgpu::Budgeted::kNo, SkImageInfo::Make(width, height, type, alpha), 0, surfaceProps()); if (surface) @@ -548,7 +548,7 @@ sk_sp<SkImage> createSkImage(const SkBitmap& bitmap) if (GrDirectContext* grDirectContext = getSharedGrDirectContext()) { sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget( - grDirectContext, SkBudgeted::kNo, + grDirectContext, skgpu::Budgeted::kNo, bitmap.info().makeAlphaType(kPremul_SkAlphaType), 0, surfaceProps()); if (surface) { @@ -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.enforceES2Restrictions = false; + opts.maxVersionAllowed = SkSL::Version::k300; auto effect = SkRuntimeEffect::MakeForBlender(SkString(diff), opts); if (!effect.effect) { diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index d0eb2ceaf51e..0ffafb040a46 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -34,6 +34,7 @@ #include <SkGradientShader.h> #include <SkPath.h> #include <SkRegion.h> +#include <SkPathEffect.h> #include <SkDashPathEffect.h> #include <GrBackendSurface.h> #include <SkTextBlob.h> |