download.lst | 4 external/skia/0004-loong64-Fix-the-remaining-implicit-vector-casts.patch | 70 +++++----- external/skia/UnpackedTarball_skia.mk | 1 external/skia/always_inline_and_multiversioning_conflict.patch.1 | 12 - external/skia/inc/pch/precompiled_skia.hxx | 1 5 files changed, 37 insertions(+), 51 deletions(-)
New commits: commit a6fc773a5e4ef41f7f944c6a0fdcb598aad2a7d8 Author: Noel Grandin <[email protected]> AuthorDate: Mon Apr 7 10:39:56 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Apr 7 17:30:53 2025 +0200 update to skia m136 drop a patch that is now upstream Change-Id: I2dc624ad2f2705c116a4dfe2e6e1ceac811f97d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183775 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/download.lst b/download.lst index f1ebf9333433..6e88ef7c574d 100644 --- a/download.lst +++ b/download.lst @@ -631,8 +631,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 4ba927b41e79ceb9d426474988290e08788854a9158b474ab96e7d024c717291 -SKIA_TARBALL := skia-m135-6c2dc3e74ea0bd464ba1c6679ded0b643101e682.tar.xz +SKIA_SHA256SUM := 2384f5f44a0b714d8dc78923fdf17453ab5a1808ca638154e3e27b361531db25 +SKIA_TARBALL := skia-m136-28685d899b0a35894743e2cedad4c9f525e90e1e.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/0004-loong64-Fix-the-remaining-implicit-vector-casts.patch b/external/skia/0004-loong64-Fix-the-remaining-implicit-vector-casts.patch index 065709552a07..85d227bad2db 100644 --- a/external/skia/0004-loong64-Fix-the-remaining-implicit-vector-casts.patch +++ b/external/skia/0004-loong64-Fix-the-remaining-implicit-vector-casts.patch @@ -310,42 +310,42 @@ index 42e9cd8aa229..97dfe7213d42 100644 } else #elif defined(SKRP_CPU_LASX) if (c->stopCount <= 8) { -- fr = (__m256)__lasx_xvperm_w(__lasx_xvld(c->fs[0], 0), idx); -- br = (__m256)__lasx_xvperm_w(__lasx_xvld(c->bs[0], 0), idx); -- fg = (__m256)__lasx_xvperm_w(__lasx_xvld(c->fs[1], 0), idx); -- bg = (__m256)__lasx_xvperm_w(__lasx_xvld(c->bs[1], 0), idx); -- fb = (__m256)__lasx_xvperm_w(__lasx_xvld(c->fs[2], 0), idx); -- bb = (__m256)__lasx_xvperm_w(__lasx_xvld(c->bs[2], 0), idx); -- fa = (__m256)__lasx_xvperm_w(__lasx_xvld(c->fs[3], 0), idx); -- ba = (__m256)__lasx_xvperm_w(__lasx_xvld(c->bs[3], 0), idx); -+ fr = (F)__lasx_xvperm_w(__lasx_xvld(c->fs[0], 0), (__m256i)idx); -+ br = (F)__lasx_xvperm_w(__lasx_xvld(c->bs[0], 0), (__m256i)idx); -+ fg = (F)__lasx_xvperm_w(__lasx_xvld(c->fs[1], 0), (__m256i)idx); -+ bg = (F)__lasx_xvperm_w(__lasx_xvld(c->bs[1], 0), (__m256i)idx); -+ fb = (F)__lasx_xvperm_w(__lasx_xvld(c->fs[2], 0), (__m256i)idx); -+ bb = (F)__lasx_xvperm_w(__lasx_xvld(c->bs[2], 0), (__m256i)idx); -+ fa = (F)__lasx_xvperm_w(__lasx_xvld(c->fs[3], 0), (__m256i)idx); -+ ba = (F)__lasx_xvperm_w(__lasx_xvld(c->bs[3], 0), (__m256i)idx); +- fr = (__m256)__lasx_xvperm_w(__lasx_xvld(c->factors[0], 0), idx); +- br = (__m256)__lasx_xvperm_w(__lasx_xvld(c->biases[0], 0), idx); +- fg = (__m256)__lasx_xvperm_w(__lasx_xvld(c->factors[1], 0), idx); +- bg = (__m256)__lasx_xvperm_w(__lasx_xvld(c->biases[1], 0), idx); +- fb = (__m256)__lasx_xvperm_w(__lasx_xvld(c->factors[2], 0), idx); +- bb = (__m256)__lasx_xvperm_w(__lasx_xvld(c->biases[2], 0), idx); +- fa = (__m256)__lasx_xvperm_w(__lasx_xvld(c->factors[3], 0), idx); +- ba = (__m256)__lasx_xvperm_w(__lasx_xvld(c->biases[3], 0), idx); ++ fr = (F)__lasx_xvperm_w(__lasx_xvld(c->factors[0], 0), (__m256i)idx); ++ br = (F)__lasx_xvperm_w(__lasx_xvld(c->biases[0], 0), (__m256i)idx); ++ fg = (F)__lasx_xvperm_w(__lasx_xvld(c->factors[1], 0), (__m256i)idx); ++ bg = (F)__lasx_xvperm_w(__lasx_xvld(c->biases[1], 0), (__m256i)idx); ++ fb = (F)__lasx_xvperm_w(__lasx_xvld(c->factors[2], 0), (__m256i)idx); ++ bb = (F)__lasx_xvperm_w(__lasx_xvld(c->biases[2], 0), (__m256i)idx); ++ fa = (F)__lasx_xvperm_w(__lasx_xvld(c->factors[3], 0), (__m256i)idx); ++ ba = (F)__lasx_xvperm_w(__lasx_xvld(c->biases[3], 0), (__m256i)idx); } else #elif defined(SKRP_CPU_LSX) if (c->stopCount <= 4) { __m128i zero = __lsx_vldi(0); -- fr = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->fs[0], 0)); -- br = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->bs[0], 0)); -- fg = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->fs[1], 0)); -- bg = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->bs[1], 0)); -- fb = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->fs[2], 0)); -- bb = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->bs[2], 0)); -- fa = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->fs[3], 0)); -- ba = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->bs[3], 0)); -+ fr = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->fs[0], 0)); -+ br = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->bs[0], 0)); -+ fg = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->fs[1], 0)); -+ bg = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->bs[1], 0)); -+ fb = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->fs[2], 0)); -+ bb = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->bs[2], 0)); -+ fa = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->fs[3], 0)); -+ ba = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->bs[3], 0)); +- fr = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->factors[0], 0)); +- br = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->biases[0], 0)); +- fg = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->factors[1], 0)); +- bg = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->biases[1], 0)); +- fb = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->factors[2], 0)); +- bb = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->biases[2], 0)); +- fa = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->factors[3], 0)); +- ba = (__m128)__lsx_vshuf_w(idx, zero, __lsx_vld(c->biases[3], 0)); ++ fr = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->factors[0], 0)); ++ br = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->biases[0], 0)); ++ fg = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->factors[1], 0)); ++ bg = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->biases[1], 0)); ++ fb = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->factors[2], 0)); ++ bb = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->biases[2], 0)); ++ fa = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->factors[3], 0)); ++ ba = (F)__lsx_vshuf_w((__m128i)idx, zero, __lsx_vld(c->biases[3], 0)); } else #endif { @@ -359,9 +359,9 @@ index 42e9cd8aa229..97dfe7213d42 100644 + int i1 = __lsx_vpickve2gr_w((__m128i)idx, 1); + int i2 = __lsx_vpickve2gr_w((__m128i)idx, 2); + int i3 = __lsx_vpickve2gr_w((__m128i)idx, 3); - fr = gather((int *)c->fs[0], i0, i1, i2, i3); - br = gather((int *)c->bs[0], i0, i1, i2, i3); - fg = gather((int *)c->fs[1], i0, i1, i2, i3); + fr = gather((int *)c->factors[0], i0, i1, i2, i3); + br = gather((int *)c->biases[0], i0, i1, i2, i3); + fg = gather((int *)c->factors[1], i0, i1, i2, i3); @@ -5942,7 +5940,7 @@ SI void from_8888(U32 rgba, U16* r, U16* g, U16* b, U16* a) { split(v, &_02,&_13); __m256i tmp0 = __lasx_xvsat_wu(_02, 15); diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 88a634e95da0..4483a9d15be1 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -39,7 +39,6 @@ skia_patches := \ fix-SkDebugf-link-error.patch.1 \ ubsan-missing-typeinfo.patch.1 \ help-msvc-analyzer.patch \ - always_inline_and_multiversioning_conflict.patch.1 \ windows-define-conflict.patch.1 \ 0002-loong64-Honor-existing-LASX-LSX-settings.patch \ 0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch \ diff --git a/external/skia/always_inline_and_multiversioning_conflict.patch.1 b/external/skia/always_inline_and_multiversioning_conflict.patch.1 deleted file mode 100644 index b1c648b41f66..000000000000 --- a/external/skia/always_inline_and_multiversioning_conflict.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur skia.org/src/opts/SkOpts_SetTarget.h skia/src/opts/SkOpts_SetTarget.h ---- skia.org/src/opts/SkOpts_SetTarget.h 2024-10-07 14:32:40.495792300 +0200 -+++ skia/src/opts/SkOpts_SetTarget.h 2024-10-07 14:45:58.375485000 +0200 -@@ -58,6 +58,8 @@ - // Each of the specific intrinsic headers also checks to ensure that immintrin.h has been - // included, so do that here, first. - #if defined(__clang__) && defined(_MSC_VER) -+ // workaround for https://github.com/llvm/llvm-project/issues/95133 -+ #define __RTMINTRIN_H - #include <immintrin.h> - #endif - diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx index a37318ba079d..6a64b00d8de1 100644 --- a/external/skia/inc/pch/precompiled_skia.hxx +++ b/external/skia/inc/pch/precompiled_skia.hxx @@ -100,7 +100,6 @@ #include <include/core/SkClipOp.h> #include <include/core/SkColor.h> #include <include/core/SkColorFilter.h> -#include <include/core/SkColorPriv.h> #include <include/core/SkColorSpace.h> #include <include/core/SkColorTable.h> #include <include/core/SkColorType.h>
