Mesa (master): nir/opt_load_store_vectorize: ignore load_vulkan_descriptor

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 447820d003798b177700407128c7eaa9b9e6cc48
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=447820d003798b177700407128c7eaa9b9e6cc48

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Wed Oct 21 16:26:02 2020 +0100

nir/opt_load_store_vectorize: ignore load_vulkan_descriptor

These mess with alignment calculation.

No fossil-db changes.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10384>

---

 src/compiler/nir/nir_opt_load_store_vectorize.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/compiler/nir/nir_opt_load_store_vectorize.c b/src/compiler/nir/nir_opt_load_store_vectorize.c
index 05afe42d10f..0cede6bd3fe 100644
--- a/src/compiler/nir/nir_opt_load_store_vectorize.c
+++ b/src/compiler/nir/nir_opt_load_store_vectorize.c
@@ -325,6 +325,12 @@ parse_offset(nir_ssa_scalar *base, uint64_t *base_mul, uint64_t *offset)
       }
    } while (progress);
 
+   if (base->def->parent_instr->type == nir_instr_type_intrinsic) {
+      nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(base->def->parent_instr);
+      if (intrin->intrinsic == nir_intrinsic_load_vulkan_descriptor)
+         base->def = NULL;
+   }
+
    *base_mul = mul;
    *offset = add;
 }