mirror of
https://github.com/LibreOffice/core.git
synced 2025-07-22 01:09:00 +00:00
ec5cd2a82d
This changeset backports/cherry-picks the following changes from Skia: - I5751928376acbe298d923b465cc9303bd5bac2bb - I1e6183b987002ed09621b111a6012a0f186233f1 - I45e43a7a7e6d50b4c32c5e69a6d1d7de341eccf1 - I3b4e9479cb6f9628b4cf796a0ac25098bc1836a2 This should address compiler errors when building LibreOffice for LoongArch64 targets with LSX enabled and LASX disabled. Tested-by: Bingwu Zhang <xtex@aosc.io> Link: https://skia-review.googlesource.com/c/skia/+/908136 Link: https://skia-review.googlesource.com/c/skia/+/908137 Link: https://skia-review.googlesource.com/c/skia/+/909436 Link: https://skia-review.googlesource.com/c/skia/+/948976 Change-Id: I87fa242c44296b222a8c70b19169b06d62f566b3 Signed-off-by: Bingwu Zhang <xtex@aosc.io> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181251 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
From d1168502a9872eb1a8de76a0414292e95c54eed9 Mon Sep 17 00:00:00 2001
|
|
From: Bingwu Zhang <xtex@aosc.io>
|
|
Date: Sat, 8 Feb 2025 12:05:04 +0800
|
|
Subject: [PATCH 2/4] [loong64] Honor existing LASX/LSX settings
|
|
X-Developer-Signature: v=1; a=openpgp-sha256; l=1333; i=xtex@aosc.io;
|
|
h=from:subject; bh=XsKjt2E4mmiE+K/HXjlVXAX8KruaZxFK1HhexJExG7M=;
|
|
b=owGbwMvMwCW2U4Ij7wZL9ETG02pJDOmr/iY0Tfy5rfxqeegfo8PK9U0bPFs45jMd/f4u99juw
|
|
keHY3786ihlYRDjYpAVU2QpMmzwZtVJ5xddVi4LM4eVCWQIAxenAEzk5A2Gf7rTeX/clQ99KPDu
|
|
xPsYVtY+icRvz2/9/Jr9ZaXaLrPl6nEMf/gFmgxyEkodXlYIBzTEzpvpu23Zj6zpG8xW2X0NO6L
|
|
WwAAA
|
|
X-Developer-Key: i=xtex@aosc.io; a=openpgp;
|
|
fpr=7231804B052C670F15A6771DB918086ED8045B91
|
|
|
|
Change-Id: I1e6183b987002ed09621b111a6012a0f186233f1
|
|
Signed-off-by: Bingwu Zhang <xtex@aosc.io>
|
|
---
|
|
AUTHORS | 1 +
|
|
src/opts/SkRasterPipeline_opts.h | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/AUTHORS b/AUTHORS
|
|
index f533d9a8e5bf..03d0ac82a412 100755
|
|
--- a/AUTHORS
|
|
+++ b/AUTHORS
|
|
@@ -24,6 +24,7 @@ Amazon, Inc <*@amazon.com>
|
|
Anthony Catel <paraboul@gmail.com>
|
|
Andrew Kurushin <ajax16384@gmail.com>
|
|
Bharat Ahuja <ahujabharat93@gmail.com>
|
|
+Bingwu Zhang <xtex@aosc.io>
|
|
Biswapriyo Nath <nathbappai@gmail.com>
|
|
Brian Salomon <briansalomon@gmail.com>
|
|
Callum Moffat <smartercallum@gmail.com>
|
|
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*;
|
|
|
|
#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) || \
|
|
- defined(SKRP_CPU_SSE2)
|
|
+ defined(SKRP_CPU_SSE2) || defined(SKRP_CPU_LASX) || defined(SKRP_CPU_LSX)
|
|
// Honor the existing setting
|
|
#elif !defined(__clang__) && !defined(__GNUC__)
|
|
#define SKRP_CPU_SCALAR
|
|
--
|
|
2.48.1
|
|
|