ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

skia: upgrade to m148

Browse Source 
Change-Id: I4e17f3a36bd384e1ec8f15b6b9c80bb345f7fe32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207005
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-06-19 16:57:04 +02:00
parent ae87e35826
commit 7afbaf17a3
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -662,8 +662,8 @@ RHINO_TARBALL := rhino-1.7.15.1.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
SKIA_SHA256SUM := 92f613b60126f9068af02c5eb29abef6931e343888f027d87da100ddf2a003a1
SKIA_TARBALL := skia-m147-ad8ecedbfdef9f4ae4b1e73347b6dd56e6637d38.tar.xz
SKIA_SHA256SUM := e35469b375140ff4e43c03a0effac36f14203a9b3162e09f93f25e71060973b9
SKIA_TARBALL := skia-m148-3a90f6662a2c30a7d270c7738cc70e5980974b02.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/skia/0002-loong64-Honor-existing-LASX-LSX-settings.patch
Vendored
+3 -3
View File
@@ -34,10 +34,10 @@ diff --git a/src/opts/SkRasterPipeline_opts.h b/src/opts/SkRasterPipeline_opts.h
index d12968d876b5..27a00474e07b 100644
--- a/src/opts/SkRasterPipeline_opts.h
+++ b/src/opts/SkRasterPipeline_opts.h
@@ -69,7 +69,7 @@ using NoCtx = const void*;
@@ -75,7 +75,7 @@
#if defined(SKRP_CPU_SCALAR) || defined(SKRP_CPU_NEON) || defined(SKRP_CPU_HSW) || \
defined(SKRP_CPU_SKX) || defined(SKRP_CPU_AVX) || defined(SKRP_CPU_SSE41) || \
#if defined(SKRP_CPU_SCALAR) || defined(SKRP_CPU_NEON) || defined(SKRP_CPU_AVX2) || \
defined(SKRP_CPU_ML4) || defined(SKRP_CPU_AVX) || defined(SKRP_CPU_SSE41) || \
- defined(SKRP_CPU_SSE2)
+ defined(SKRP_CPU_SSE2) || defined(SKRP_CPU_LASX) || defined(SKRP_CPU_LSX)
// Honor the existing setting
external/skia/Library_skia.mk
Vendored
+8 -5
View File
@@ -21,8 +21,8 @@ $(eval $(call gb_Library_add_defs,skia,\
-DSKIA_IMPLEMENTATION=1 \
-DSKIA_DLL \
-DSK_USER_CONFIG_HEADER="<config_skia.h>" \
$(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2,-DSK_CPU_SSE_LEVEL=0)) \
$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \
$(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_X64_LEVEL=SK_CPU_X64_LEVEL_SSE2,-DSK_CPU_X64_LEVEL=0)) \
$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_X64_LEVEL=SK_CPU_X64_LEVEL_SSE2) \
-DSK_ENABLE_SKSL_IN_RASTER_PIPELINE \
))
@@ -500,6 +500,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkPathUtils \
UnpackedTarball/skia/src/core/SkPath_serial \
UnpackedTarball/skia/src/core/SkPixelRef \
UnpackedTarball/skia/src/core/SkPixelStorage \
UnpackedTarball/skia/src/core/SkPixmap \
UnpackedTarball/skia/src/core/SkPixmapDraw \
UnpackedTarball/skia/src/core/SkPoint \
@@ -1069,6 +1070,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ganesh/gradients/GrGradientBitmapCache \
UnpackedTarball/skia/src/gpu/ganesh/gradients/GrGradientShader \
UnpackedTarball/skia/src/gpu/ganesh/image/GrImageUtils \
UnpackedTarball/skia/src/gpu/ganesh/image/GrMippedBitmap \
UnpackedTarball/skia/src/gpu/ganesh/image/GrTextureGenerator \
UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_Ganesh \
UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_GaneshBase \
@@ -1077,6 +1079,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_LazyTexture \
UnpackedTarball/skia/src/gpu/ganesh/image/SkImage_RasterPinnable \
UnpackedTarball/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh \
UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockBackendSurface \
UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockCaps \
UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockGpu \
UnpackedTarball/skia/src/gpu/ganesh/mock/GrMockTypes \
@@ -1319,9 +1322,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
$(LO_SKIA_AVOID_INLINE_COPIES) \
))
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/opts/SkOpts_hsw \
UnpackedTarball/skia/src/core/SkSwizzler_opts_hsw \
UnpackedTarball/skia/src/core/SkBlitRow_opts_hsw \
UnpackedTarball/skia/src/opts/SkOpts_ml3 \
UnpackedTarball/skia/src/core/SkSwizzler_opts_ml3 \
UnpackedTarball/skia/src/core/SkBlitRow_opts_ml3 \
UnpackedTarball/skia/modules/skcms/src/skcms_TransformHsw, \
$(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA) \
$(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) $(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \
external/skia/source/skia_opts.cxx
Vendored
+3 -3
View File
@@ -40,7 +40,7 @@ void SkConvertRGBAToR(uint8_t* dest, const uint32_t* src, int count)
// The rest is mostly based on Skia's SkOpts.cpp, reduced to only SSSE3 so far.
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
#if SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSSE3
#define SK_OPTS_NS ssse3
#else
#define SK_OPTS_NS portable
@@ -64,8 +64,8 @@ namespace SkLoOpts {
static void init() {
#if !defined(SK_BUILD_NO_OPTS)
#if defined(SK_CPU_X86)
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_ssse3(); }
#if SK_CPU_X64_LEVEL < SK_CPU_X64_LEVEL_SSSE3
if (SkCpu::Supports(SkX64::SSSE3)) { Init_ssse3(); }
#endif
#endif
#endif
external/skia/source/skia_opts_internal.hxx
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@
#pragma once
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
#if SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSSE3
#include <immintrin.h>
#endif
@@ -25,7 +25,7 @@ static void RGB1_to_R_portable(uint8_t dst[], const uint32_t* src, int count) {
}
}
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
#if SK_CPU_X64_LEVEL >= SK_CPU_X64_LEVEL_SSSE3
inline void RGB1_to_RGB(uint8_t dst[], const uint32_t* src, int count) {
const uint8_t X = 0xFF; // Used a placeholder. The value of X is irrelevant.
__m128i pack = _mm_setr_epi8(0,1,2, 4,5,6, 8,9,10, 12,13,14, X,X,X,X);