summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmma Anholt <emma@anholt.net>2021-12-23 15:28:06 -0800
committerMarge Bot <emma+marge@anholt.net>2022-01-19 22:28:34 +0000
commita98103c55d628e8a4c433be488d5025f1e177ff2 (patch)
treeff1b4bfff69e626a3df8be47b9519739c3ccfb46
parentf83f72be8ebe07d5f13a29e5a404865543a31e1a (diff)
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@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14309>
-rw-r--r--src/gallium/drivers/zink/nir_lower_dynamic_bo_access.c6
1 files changed, 1 insertions, 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),