external/skia/Library_skia.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit afed68d15d1e62e43ced81787e54f11782ec8af2 Author: Rene Engelhard <r...@debian.org> AuthorDate: Tue Jul 4 20:36:46 2023 +0200 Commit: René Engelhard <r...@debian.org> CommitDate: Wed Jul 5 17:53:28 2023 +0200 don't use SSE in skia on "INTEL" (except on Windows...) as i386/i686 in Debian is non-MMX, non-SSE, cf. https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 Regression from 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 which claims to have set the define instead of skia_sk_cpu_sse_level_0_by_default.patch.1 but actually sets it to SSE2... Change-Id: I4157a580470732fd7bbc5cf1b2384b76182340cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153984 Tested-by: René Engelhard <r...@debian.org> Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> (cherry picked from commit 451f15888a7f3e747a34d24a047d4ec73a40c6c5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154035 Reviewed-by: René Engelhard <r...@debian.org> diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 4b7d9ee56407..7a7f59eccdb3 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -20,7 +20,8 @@ $(eval $(call gb_Library_add_defs,skia,\ -DSKIA_IMPLEMENTATION=1 \ -DSKIA_DLL \ -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ - $(if $(filter INTEL X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ + $(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \ + $(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ )) # SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL.