diff options
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa_22.3.5.bb (renamed from meta/recipes-graphics/mesa/mesa_22.3.3.bb) | 0 |
4 files changed, 1 insertions, 38 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch b/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch deleted file mode 100644 index 1cf23492fe..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00 2001 -From: t0b3 <thomas.bettler@gmail.com> -Date: Sat, 10 Dec 2022 14:32:53 +0100 -Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error - -Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> -Reviewed-by: Adam Jackson <ajax@redhat.com> -Closes: #6825 -Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ") -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439> - -Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911] ---- - src/compiler/nir/nir_opt_move.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c -index 81bcde5c436..9aeb9f4cf86 100644 ---- a/src/compiler/nir/nir_opt_move.c -+++ b/src/compiler/nir/nir_opt_move.c -@@ -51,13 +51,13 @@ - * lower register pressure. - */ - --static ALWAYS_INLINE bool -+static inline bool - src_is_ssa(nir_src *src, void *state) - { - return src->is_ssa; - } - --static ALWAYS_INLINE bool -+static inline bool - instr_reads_register(nir_instr *instr) - { - return !nir_foreach_src(instr, src_is_ssa, NULL); diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index cc4aa5eeab..0a3dc1dd62 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -19,10 +19,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ - file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \ " -SRC_URI[sha256sum] = "bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922" +SRC_URI[sha256sum] = "3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_22.3.3.bb b/meta/recipes-graphics/mesa/mesa_22.3.5.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_22.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa_22.3.5.bb |