diff --git a/0001-intel-compiler-move-gen5-final-pass-to-actually-be-f.patch b/0001-intel-compiler-move-gen5-final-pass-to-actually-be-f.patch new file mode 100644 index 0000000..5be89d7 --- /dev/null +++ b/0001-intel-compiler-move-gen5-final-pass-to-actually-be-f.patch @@ -0,0 +1,52 @@ +From e1b03c0d3dfb337c7f462ea7e146e727dbe35040 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 18 Dec 2023 16:47:56 +1000 +Subject: [PATCH] intel/compiler: move gen5 final pass to actually be final + pass + +This got broken by the register conversion, this pass needs to be +after all the others. + +Fixes: ce75c3c3fea9 ("intel: Switch to intrinsic-based registers") +--- + src/intel/compiler/brw_nir.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c +index 8da98b0fbfd..c36269fd015 100644 +--- a/src/intel/compiler/brw_nir.c ++++ b/src/intel/compiler/brw_nir.c +@@ -1753,14 +1753,6 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler, + if (OPT(nir_opt_rematerialize_compares)) + OPT(nir_opt_dce); + +- /* This is the last pass we run before we start emitting stuff. It +- * determines when we need to insert boolean resolves on Gen <= 5. We +- * run it last because it stashes data in instr->pass_flags and we don't +- * want that to be squashed by other NIR passes. +- */ +- if (devinfo->ver <= 5) +- brw_nir_analyze_boolean_resolves(nir); +- + OPT(nir_opt_dce); + + /* The mesh stages require this pass to be called at the last minute, +@@ -1773,6 +1765,15 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler, + brw_nir_adjust_payload(nir, compiler); + + nir_trivialize_registers(nir); ++ ++ /* This is the last pass we run before we start emitting stuff. It ++ * determines when we need to insert boolean resolves on Gen <= 5. We ++ * run it last because it stashes data in instr->pass_flags and we don't ++ * want that to be squashed by other NIR passes. ++ */ ++ if (devinfo->ver <= 5) ++ brw_nir_analyze_boolean_resolves(nir); ++ + nir_sweep(nir); + + if (unlikely(debug_enabled)) { +-- +2.43.0 + diff --git a/mesa.spec b/mesa.spec index 179db86..f59328b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -74,6 +74,7 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz Source1: Mesa-MLAA-License-Clarification-Email.txt Patch10: gnome-shell-glthread-disable.patch +Patch11: 0001-intel-compiler-move-gen5-final-pass-to-actually-be-f.patch BuildRequires: meson >= 1.2.0 BuildRequires: gcc