summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch b/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch
deleted file mode 100644
index d22ff3c8a8..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From f17e836ef9b1bbc6056790596420b699e48128c2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Dec 2021 19:57:42 -0800
4Subject: [PATCH] util/format: Check for NEON before using it
5
6This fixes build on rpi0-w and any other machine which does not have
7neon unit and is not used as FPU unit
8
9Fixes errors e.g.
10
11In file included from ../mesa-21.3.0/src/util/format/u_format_unpack_neon.c:35:
12/mnt/b/yoe/master/build/tmp/work/arm1176jzfshf-vfp-yoe-linux-gnueabi/mesa/2_21.3.0-r0/recipe-sysroot-native/usr/lib/clang/13.0.1/include/arm_neon.h:32:2: error: "NEON support not enabled"
13
14Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16
17---
18 src/util/format/u_format.c | 2 +-
19 src/util/format/u_format_unpack_neon.c | 2 +-
20 2 files changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c
23index c071250..0880984 100644
24--- a/src/util/format/u_format.c
25+++ b/src/util/format/u_format.c
26@@ -1184,7 +1184,7 @@ static void
27 util_format_unpack_table_init(void)
28 {
29 for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) {
30-#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
31+#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM)
32 const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format);
33 if (unpack) {
34 util_format_unpack_table[format] = unpack;
35diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c
36index a4a5cb1..1e4f794 100644
37--- a/src/util/format/u_format_unpack_neon.c
38+++ b/src/util/format/u_format_unpack_neon.c
39@@ -23,7 +23,7 @@
40
41 #include <u_format.h>
42
43-#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
44+#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM)
45
46 /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics
47 * unless you tell it "no really".