AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Support deref instructions in remove_unused_varyings

Browse Source 
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-03-20 22:10:58 -07:00
parent 933c2851ab
commit e786fcf777
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_linking_helpers.c
+25 -23
View File
@@ -62,29 +62,33 @@ static void
tcs_add_output_reads(nir_shader *shader, uint64_t *read, uint64_t *patches_read)
{
nir_foreach_function(function, shader) {
if (function->impl) {
nir_foreach_block(block, function->impl) {
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
if (!function->impl)
continue;
nir_intrinsic_instr *intrin_instr =
nir_instr_as_intrinsic(instr);
if (intrin_instr->intrinsic == nir_intrinsic_load_var &&
intrin_instr->variables[0]->var->data.mode ==
nir_var_shader_out) {
nir_foreach_block(block, function->impl) {
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_variable *var = intrin_instr->variables[0]->var;
if (var->data.patch) {
patches_read[var->data.location_frac] |=
get_variable_io_mask(intrin_instr->variables[0]->var,
shader->info.stage);
} else {
read[var->data.location_frac] |=
get_variable_io_mask(intrin_instr->variables[0]->var,
shader->info.stage);
}
}
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
nir_variable *var;
if (intrin->intrinsic == nir_intrinsic_load_var) {
var = intrin->variables[0]->var;
} else if (intrin->intrinsic == nir_intrinsic_load_deref) {
var = nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[0]));
} else {
continue;
}
if (var->data.mode != nir_var_shader_out)
continue;
if (var->data.patch) {
patches_read[var->data.location_frac] |=
get_variable_io_mask(var, shader->info.stage);
} else {
read[var->data.location_frac] |=
get_variable_io_mask(var, shader->info.stage);
}
}
}
@@ -133,8 +137,6 @@ nir_remove_unused_varyings(nir_shader *producer, nir_shader *consumer)
{
assert(producer->info.stage != MESA_SHADER_FRAGMENT);
assert(consumer->info.stage != MESA_SHADER_VERTEX);
nir_assert_lowered_derefs(producer, nir_lower_load_store_derefs);
nir_assert_lowered_derefs(consumer, nir_lower_load_store_derefs);
uint64_t read[4] = { 0 }, written[4] = { 0 };
uint64_t patches_read[4] = { 0 }, patches_written[4] = { 0 };