From 5b77b14448c39d664460fd00d2a356d47858880f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Sat, 21 Nov 2020 16:05:22 +0100 Subject: [PATCH] nir: Use src_is_invocation_id in get_deref_info. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristof Reviewed-by: Marek Olšák Part-of: --- src/compiler/nir/nir_gather_info.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index 2f468f75d04..bf0f1e37a9b 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -53,11 +53,7 @@ get_deref_info(nir_shader *shader, nir_variable *var, nir_deref_instr *deref, /* Vertex index is the outermost array index. */ if (per_vertex) { assert((*p)->deref_type == nir_deref_type_array); - nir_instr *vertex_index_instr = (*p)->arr.index.ssa->parent_instr; - *cross_invocation = - vertex_index_instr->type != nir_instr_type_intrinsic || - nir_instr_as_intrinsic(vertex_index_instr)->intrinsic != - nir_intrinsic_load_invocation_id; + *cross_invocation = src_is_invocation_id(&(*p)->arr.index); p++; }