From 933c2851ab248358e3887f1afd7d228d34af625d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 23 Mar 2018 07:51:24 -0700 Subject: [PATCH] nir: Support deref instructions in lower_pos_center Reviewed-by: Caio Marcelo de Oliveira Filho Acked-by: Rob Clark Acked-by: Bas Nieuwenhuizen Acked-by: Dave Airlie Reviewed-by: Kenneth Graunke --- src/compiler/nir/nir_lower_wpos_center.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/compiler/nir/nir_lower_wpos_center.c b/src/compiler/nir/nir_lower_wpos_center.c index fa225992e3e..5b68caca358 100644 --- a/src/compiler/nir/nir_lower_wpos_center.c +++ b/src/compiler/nir/nir_lower_wpos_center.c @@ -81,7 +81,18 @@ lower_wpos_center_block(nir_builder *b, nir_block *block, nir_foreach_instr(instr, block) { if (instr->type == nir_instr_type_intrinsic) { nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); - if (intr->intrinsic == nir_intrinsic_load_var) { + if (intr->intrinsic == nir_intrinsic_load_deref) { + nir_deref_instr *deref = nir_src_as_deref(intr->src[0]); + nir_variable *var = nir_deref_instr_get_variable(deref); + + if (var->data.mode == nir_var_shader_in && + var->data.location == VARYING_SLOT_POS) { + /* gl_FragCoord should not have array/struct derefs: */ + assert(deref->deref_type == nir_deref_type_var); + update_fragcoord(b, intr, for_sample_shading); + progress = true; + } + } else if (intr->intrinsic == nir_intrinsic_load_var) { nir_deref_var *dvar = intr->variables[0]; nir_variable *var = dvar->var; @@ -107,8 +118,6 @@ nir_lower_wpos_center(nir_shader *shader, const bool for_sample_shading) assert(shader->info.stage == MESA_SHADER_FRAGMENT); - nir_assert_lowered_derefs(shader, nir_lower_load_store_derefs); - nir_foreach_function(function, shader) { if (function->impl) { nir_builder_init(&b, function->impl); -- 2.30.2