ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

skia: upgrade to m149

Browse Source 
Change-Id: I6082106dcef551be2b2a73a81e269d8453c6f034
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209357
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-08-20 00:33:05 +02:00
parent 8cd22a5b7b
commit 0d6ee40682
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -622,8 +622,8 @@ RHINO_TARBALL := rhino-1.7.15.1.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
SKIA_SHA256SUM := e35469b375140ff4e43c03a0effac36f14203a9b3162e09f93f25e71060973b9
SKIA_TARBALL := skia-m148-3a90f6662a2c30a7d270c7738cc70e5980974b02.tar.xz
SKIA_SHA256SUM := 08458913d3076a7c1c0a1550f472b3aa5df811b2f08c7d24e65fb4d2ca3f14f4
SKIA_TARBALL := skia-m149-9bb16a741cdbcbde46a0d4caf8ac73f4d07a89e2.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/skia/0004-loong64-Fix-the-remaining-implicit-vector-casts.patch
Vendored
+12 -12
View File
@@ -362,16 +362,7 @@ index 42e9cd8aa229..97dfe7213d42 100644
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);
__m256i tmp1 = __lasx_xvsat_wu(_13, 15);
- return __lasx_xvpickev_h(tmp1, tmp0);
+ return (U16)__lasx_xvpickev_h(tmp1, tmp0);
};
#elif defined(SKRP_CPU_LSX)
__m128i _01, _23, rg, ba;
@@ -5952,10 +5950,10 @@ SI void from_8888(U32 rgba, U16* r, U16* g, U16* b, U16* a) {
@@ -6133,10 +6133,10 @@
__m128i mask_00ff = __lsx_vreplgr2vr_h(0xff);
@@ -384,8 +375,17 @@ index 42e9cd8aa229..97dfe7213d42 100644
+ *b = (U16)__lsx_vand_v(ba, mask_00ff);
+ *a = (U16)__lsx_vsrli_h(ba, 8);
#else
auto cast_U16 = [](U32 v) -> U16 {
return cast<U16>(v);
#if defined(SKRP_CPU_AVX2)
// Swap the middle 128-bit lanes to make _mm256_packus_epi32() in cast_U16() work out nicely.
@@ -6163,7 +6163,7 @@
split(v, &_02, &_13);
__m256i tmp0 = __lasx_xvsat_wu(_02, 15);
__m256i tmp1 = __lasx_xvsat_wu(_13, 15);
- return __lasx_xvpickev_h(tmp1, tmp0);
+ return (U16)__lasx_xvpickev_h(tmp1, tmp0);
};
#else
auto cast_U16 = [](U32 v) -> U16 {
@@ -5983,26 +5981,26 @@ SI void load_8888_(const uint32_t* ptr, U16* r, U16* g, U16* b, U16* a) {
SI void store_8888_(uint32_t* ptr, U16 r, U16 g, U16 b, U16 a) {
#if defined(SKRP_CPU_LSX)