Hi again,
Am 04.07.23 um 20:19 schrieb Rene Engelhard:
/home/rene/LibreOffice/git/libreoffice-7-6/workdir/UnpackedTarball/skia/src/core/SkBlitRow_D32.cpp:65:50: error: always_inline function '_mm_loadu_si128' requires target feature 'sse2', but would be inlined into function 'blit_row_s32_blend' that is compiled without support for 'sse2'
Hmm.
commit 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150
Author: Noel Grandin <noel.grandin@xxxxxxxxxxxxxxx>
Date: Fri Jan 27 10:48:45 2023 +0200
Update skia to m111
(*) Remove patches already upstream
(*) Remove the skia_sk_cpu_sse_level_0_by_default.patch.1 patch and
rather set
that define via -D parameter, because that is how the skia BUILD.gn
seems to do it
(*) I hand edited the PCH file, because running the update_pch
script failed for me.
Change-Id: I1fd175b9f63f8d2792a1876e4ece03fe92fb5374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146251
Tested-by: Jenkins
Tested-by: Noel Grandin <noel.grandin@xxxxxxxxxxxxxxx>
Reviewed-by: Noel Grandin <noel.grandin@xxxxxxxxxxxxxxx>
was the commit.
Apparently the second part doesn't work?
Oh, no, that patch contains
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 3bb9cc3eed40..4b7d9ee56407 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -20,6 +20,7 @@ $(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) \
))
# SK_DEBUG controls runtime checks and is controlled by config_skia.h
and depends on DBG_UTIL.
ARGH, no....
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 4b7d9ee56407..7dd5375f1eb9 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -20,7 +20,7 @@ $(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 X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=0) \
))
# SK_DEBUG controls runtime checks and is controlled by config_skia.h
and depends on DBG_UTIL.
is what I am trying right now.
Regards,
Rene
