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

nir/linker: set varying from uniform as flat

Browse Source 
Flat varying can save some rasterization compute cost
and register needed by shader.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15341>
This commit is contained in:
Qiang Yu
2022-03-11 18:14:57 +08:00
committed by Marge Bot
parent aaf951c47f
commit 9401990e6f
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/compiler/nir/nir_linking_helpers.c
View File

@@ -1373,26 +1373,37 @@ nir_link_opt_varyings(nir_shader *producer, nir_shader *consumer)
if (!can_replace_varying(out_var)) if (!can_replace_varying(out_var))
continue; continue;
nir_ssa_scalar uni_scalar;
nir_ssa_def *ssa = intr->src[1].ssa; nir_ssa_def *ssa = intr->src[1].ssa;
if (ssa->parent_instr->type == nir_instr_type_load_const) { if (ssa->parent_instr->type == nir_instr_type_load_const) {
progress |= replace_varying_input_by_constant_load(consumer, intr); progress |= replace_varying_input_by_constant_load(consumer, intr);
} else if (consumer->options->lower_varying_from_uniform && continue;
is_direct_uniform_load(ssa, &uni_scalar)) { }
progress |= replace_varying_input_by_uniform_load(consumer, intr,
&uni_scalar); nir_ssa_scalar uni_scalar;
} else { if (is_direct_uniform_load(ssa, &uni_scalar)) {
struct hash_entry *entry = if (consumer->options->lower_varying_from_uniform) {
_mesa_hash_table_search(varying_values, ssa); progress |= replace_varying_input_by_uniform_load(consumer, intr,
if (entry) { &uni_scalar);
progress |= replace_duplicate_input(consumer, continue;
(nir_variable *) entry->data,
intr);
} else { } else {
nir_variable *in_var = get_matching_input_var(consumer, out_var); nir_variable *in_var = get_matching_input_var(consumer, out_var);
if (in_var) { /* The varying is loaded from same uniform, so no need to do any
_mesa_hash_table_insert(varying_values, ssa, in_var); * interpolation. Mark it as flat explicitly.
} */
if (in_var && in_var->data.interpolation <= INTERP_MODE_NOPERSPECTIVE)
in_var->data.interpolation = INTERP_MODE_FLAT;
}
}
struct hash_entry *entry = _mesa_hash_table_search(varying_values, ssa);
if (entry) {
progress |= replace_duplicate_input(consumer,
(nir_variable *) entry->data,
intr);
} else {
nir_variable *in_var = get_matching_input_var(consumer, out_var);
if (in_var) {
_mesa_hash_table_insert(varying_values, ssa, in_var);
} }
} }
} }