nir/lower_system_values: Assert/assume direct var derefs

System values are never arrays or structs so we can assume a direct var
deref.  This simplifies things a bit and prevents us from accidentally
throwing away an array index.

Suggested-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2018-04-06 22:34:57 -07:00
parent a331d7d1cd
commit aef4213fca
1 changed files with 13 additions and 4 deletions

View File

@ -41,12 +41,21 @@ convert_block(nir_block *block, nir_builder *b)
if (load_deref->intrinsic != nir_intrinsic_load_deref)
continue;
nir_variable *var =
nir_deref_instr_get_variable(nir_src_as_deref(load_deref->src[0]));
if (var->data.mode != nir_var_system_value)
nir_deref_instr *deref = nir_src_as_deref(load_deref->src[0]);
if (deref->mode != nir_var_system_value)
continue;
if (deref->deref_type != nir_deref_type_var) {
/* The only one system value that is an array and that is
* gl_SampleMask which is always an array of one element.
*/
assert(deref->deref_type == nir_deref_type_array);
deref = nir_deref_instr_parent(deref);
assert(deref->deref_type == nir_deref_type_var);
assert(deref->var->data.location == SYSTEM_VALUE_SAMPLE_MASK_IN);
}
nir_variable *var = deref->var;
b->cursor = nir_after_instr(&load_deref->instr);
nir_ssa_def *sysval = NULL;