OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Remove deref chain support from lower_system_values

Browse Source 
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-03-27 09:08:31 -07:00
parent e5db1b951c
commit 8a62db7712
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/compiler/nir/nir_lower_system_values.c
View File

@@ -37,21 +37,17 @@ convert_block(nir_block *block, nir_builder *b)
if (instr->type != nir_instr_type_intrinsic) if (instr->type != nir_instr_type_intrinsic)
continue; continue;
nir_intrinsic_instr *load_var = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *load_deref = nir_instr_as_intrinsic(instr);
if (load_deref->intrinsic != nir_intrinsic_load_deref)
continue;
nir_variable *var; nir_variable *var =
if (load_var->intrinsic == nir_intrinsic_load_var) { nir_deref_instr_get_variable(nir_src_as_deref(load_deref->src[0]));
var = load_var->variables[0]->var;
} else if (load_var->intrinsic == nir_intrinsic_load_deref) {
var = nir_deref_instr_get_variable(nir_src_as_deref(load_var->src[0]));
} else {
continue; /* Not a load instruction */
}
if (var->data.mode != nir_var_system_value) if (var->data.mode != nir_var_system_value)
continue; continue;
b->cursor = nir_after_instr(&load_var->instr); b->cursor = nir_after_instr(&load_deref->instr);
nir_ssa_def *sysval = NULL; nir_ssa_def *sysval = NULL;
switch (var->data.location) { switch (var->data.location) {
@@ -178,8 +174,8 @@ convert_block(nir_block *block, nir_builder *b)
sysval = nir_load_system_value(b, sysval_op, 0); sysval = nir_load_system_value(b, sysval_op, 0);
} }
nir_ssa_def_rewrite_uses(&load_var->dest.ssa, nir_src_for_ssa(sysval)); nir_ssa_def_rewrite_uses(&load_deref->dest.ssa, nir_src_for_ssa(sysval));
nir_instr_remove(&load_var->instr); nir_instr_remove(&load_deref->instr);
progress = true; progress = true;
} }
@@ -208,6 +204,8 @@ nir_lower_system_values(nir_shader *shader)
{ {
bool progress = false; bool progress = false;
nir_assert_unlowered_derefs(shader, nir_lower_load_store_derefs);
nir_foreach_function(function, shader) { nir_foreach_function(function, shader) {
if (function->impl) if (function->impl)
progress = convert_impl(function->impl) || progress; progress = convert_impl(function->impl) || progress;