diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index a400c51c143..64eca17e4eb 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -1965,16 +1965,16 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, nir_constant **elems = ralloc_array(b, nir_constant *, elem_count); for (unsigned i = 0; i < elem_count; i++) { - struct vtn_value *val = vtn_untyped_value(b, w[i + 3]); + struct vtn_value *elem_val = vtn_untyped_value(b, w[i + 3]); - if (val->value_type == vtn_value_type_constant) { - elems[i] = val->constant; + if (elem_val->value_type == vtn_value_type_constant) { + elems[i] = elem_val->constant; } else { - vtn_fail_if(val->value_type != vtn_value_type_undef, + vtn_fail_if(elem_val->value_type != vtn_value_type_undef, "only constants or undefs allowed for " "SpvOpConstantComposite"); /* to make it easier, just insert a NULL constant for now */ - elems[i] = vtn_null_constant(b, val->type); + elems[i] = vtn_null_constant(b, elem_val->type); } }