From 9fb36011d11a1bc3e3156bfba94684c10049878d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 2 Apr 2018 17:46:36 -0700 Subject: [PATCH 1/1] anv/pipeline: Convert lower_multiview to deref instructions Reviewed-by: Caio Marcelo de Oliveira Filho Acked-by: Rob Clark Acked-by: Bas Nieuwenhuizen Acked-by: Dave Airlie Reviewed-by: Kenneth Graunke --- src/intel/vulkan/anv_nir_lower_multiview.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/intel/vulkan/anv_nir_lower_multiview.c b/src/intel/vulkan/anv_nir_lower_multiview.c index 6822595728c..bde7aade50f 100644 --- a/src/intel/vulkan/anv_nir_lower_multiview.c +++ b/src/intel/vulkan/anv_nir_lower_multiview.c @@ -134,18 +134,11 @@ build_view_index(struct lower_multiview_state *state) if (b->shader->info.stage == MESA_SHADER_FRAGMENT) idx_var->data.interpolation = INTERP_MODE_FLAT; - if (glsl_type_is_array(type)) { - nir_deref_var *deref = nir_deref_var_create(b->shader, idx_var); - nir_deref_array *arr = nir_deref_array_create(b->shader); - arr->deref.type = glsl_int_type(); - arr->deref_array_type = nir_deref_array_type_direct; - arr->base_offset = 0; - deref->deref.child = &arr->deref; - - state->view_index = nir_load_deref_var(b, deref); - } else { - state->view_index = nir_load_var(b, idx_var); - } + nir_deref_instr *deref = nir_build_deref_var(b, idx_var); + if (glsl_type_is_array(type)) + deref = nir_build_deref_array(b, deref, nir_imm_int(b, 0)); + + state->view_index = nir_load_deref(b, deref); } } -- 2.30.2