Mesa (main): nir/lower_dynamic_bo_access: Use copy_inst_indices for our cloned instrs.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a98103c55d628e8a4c433be488d5025f1e177ff2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a98103c55d628e8a4c433be488d5025f1e177ff2

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Dec 23 15:28:06 2021 -0800

nir/lower_dynamic_bo_access: Use copy_inst_indices for our cloned instrs.

The ad-hoc index duplication was missing setup of things like the ACCESS
or RANGE_BASE fields.

Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14309>

---

 src/gallium/drivers/zink/nir_lower_dynamic_bo_access.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gallium/drivers/zink/nir_lower_dynamic_bo_access.c b/src/gallium/drivers/zink/nir_lower_dynamic_bo_access.c
index cc38565b155..f0bc8f9d110 100644
--- a/src/gallium/drivers/zink/nir_lower_dynamic_bo_access.c
+++ b/src/gallium/drivers/zink/nir_lower_dynamic_bo_access.c
@@ -51,11 +51,7 @@ recursive_generate_bo_ssa_def(nir_builder *b, nir_intrinsic_instr *instr, nir_ss
          if (i)
             nir_src_copy(&new_instr->src[i], &instr->src[i]);
       }
-      if (instr->intrinsic != nir_intrinsic_load_ubo_vec4) {
-         nir_intrinsic_set_align(new_instr, nir_intrinsic_align_mul(instr), nir_intrinsic_align_offset(instr));
-         if (instr->intrinsic != nir_intrinsic_load_ssbo)
-            nir_intrinsic_set_range(new_instr, nir_intrinsic_range(instr));
-      }
+      nir_intrinsic_copy_const_indices(new_instr, instr);
       new_instr->num_components = instr->num_components;
       nir_ssa_dest_init(&new_instr->instr, &new_instr->dest,
                         nir_dest_num_components(instr->dest),