From afdfc9bb5d56fde866882e7d87869ecafed1e3d0 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 30 Nov 2021 14:13:53 +0100 Subject: handle Skia not drawing GPU-backend shader to a bitmap (tdf#145797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https: //bugs.chromium.org/p/skia/issues/detail?id=12685 Change-Id: I4de51b154e270df470102c357c25bdfa430a4488 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126118 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- vcl/skia/osx/bitmap.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'vcl') diff --git a/vcl/skia/osx/bitmap.cxx b/vcl/skia/osx/bitmap.cxx index 77e34697aa50..16d32191a627 100644 --- a/vcl/skia/osx/bitmap.cxx +++ b/vcl/skia/osx/bitmap.cxx @@ -66,9 +66,18 @@ CGImageRef createCGImage(const Image& rImage) assert(dynamic_cast(alphaBitmap.ImplGetSalBitmap().get()) != nullptr); SkiaSalBitmap* skiaAlpha = static_cast(alphaBitmap.ImplGetSalBitmap().get()); +#if 0 + // Drawing to a bitmap using a shader from a GPU-backed image fails silently. + // https://bugs.chromium.org/p/skia/issues/detail?id=12685 paint.setShader(SkShaders::Blend(SkBlendMode::kDstOut, skiaBitmap->GetSkShader(SkSamplingOptions()), skiaAlpha->GetAlphaSkShader(SkSamplingOptions()))); +#else + sk_sp imB = skiaBitmap->GetSkImage()->makeNonTextureImage(); + sk_sp imA = skiaAlpha->GetAlphaSkImage()->makeNonTextureImage(); + paint.setShader(SkShaders::Blend(SkBlendMode::kDstOut, imB->makeShader(SkSamplingOptions()), + imA->makeShader(SkSamplingOptions()))); +#endif SkCanvas canvas(targetBitmap); canvas.concat(matrix); canvas.drawPaint(paint); -- cgit