Merge commit '8b0fb1c152fe191768953aa8c77b89034a377f83' into vulkan

[mesa.git] / src / compiler / nir / spirv / vtn_variables.c

diff --git a/src/compiler/nir/spirv/vtn_variables.c b/src/compiler/nir/spirv/vtn_variables.c
index 3ad98aa5310342ae955b3359ba7045df887aadb5..5ca24201498f825ab3ca76d485e87c93fcb63202 100644 (file)
--- a/src/compiler/nir/spirv/vtn_variables.c
+++ b/src/compiler/nir/spirv/vtn_variables.c
@@ -319,8 +319,8 @@ get_vulkan_resource_index(struct vtn_builder *b, struct vtn_access_chain *chain,
       nir_intrinsic_instr_create(b->nb.shader,
                                  nir_intrinsic_vulkan_resource_index);
    instr->src[0] = nir_src_for_ssa(array_index);
-   instr->const_index[0] = chain->var->descriptor_set;
-   instr->const_index[1] = chain->var->binding;
+   nir_intrinsic_set_desc_set(instr, chain->var->descriptor_set);
+   nir_intrinsic_set_binding(instr, chain->var->binding);
 
    nir_ssa_dest_init(&instr->instr, &instr->dest, 1, NULL);
    nir_builder_instr_insert(&b->nb, &instr->instr);