vcl/skia/SkiaHelper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 7dc558c29841b9934d1fcadc19fa155b38374feb Author: Julien Nabet <[email protected]> AuthorDate: Sat Nov 13 12:28:16 2021 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Sat Nov 13 13:40:09 2021 +0100 loplugin:conststringvar [CXX] vcl/source/window/keycod.cxx /home/julien/lo/libreoffice/vcl/skia/SkiaHelper.cxx:664:21: error: variable is only used as rvalue, should be const [loplugin:conststringvar] const char* diff = R"( ~~~~~~~~~~~~^~~~~~~~~~ 1 error generated. From https://cgit.freedesktop.org/libreoffice/core/commit/?id=110fa313628c55fef1d35830358aea7e27c1e3ee get rid of Skia's 'rasterhack' for Invert() It seems that manually writing a shader that does the same as SkBlendMode::kDifference works fine even though the blend mode crashes e.g. on Windows/AMD. So get rid of the memory<->GPU conversions and use the shader as a workaround. Change-Id: I721d88664f9cb03529ec6e9244424d8e3ed4d156 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125126 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index ed04e5f20ec0..57bde5abf919 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -661,7 +661,7 @@ void setBlendModeDifference(SkPaint* paint) // so do that. if (!differenceBlender) { - const char* diff = R"( + const char* const diff = R"( vec4 main( vec4 src, vec4 dst ) { return vec4(abs( src.r - dst.r ), abs( src.g - dst.g ), abs( src.b - dst.b ), dst.a );
