fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 00:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/dead_variables: Add a a mode parameter

Browse source 
This allows dead_variables to be used on any type of variable.
This commit is contained in:
Jason Ekstrand 2016-01-11 10:27:47 -08:00
parent a9c0e8f00f
commit 83bf1f752d
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/glsl/nir/nir.h
View file

@ -2092,7 +2092,7 @@ nir_src *nir_get_io_vertex_index_src(nir_intrinsic_instr *instr);
void nir_lower_vars_to_ssa(nir_shader *shader);
bool nir_remove_dead_variables(nir_shader *shader);
bool nir_remove_dead_variables(nir_shader *shader, nir_variable_mode mode);
void nir_move_vec_src_uses_to_dest(nir_shader *shader);
bool nir_lower_vec_to_movs(nir_shader *shader);

33
src/glsl/nir/nir_remove_dead_variables.c
View file

@ -115,7 +115,7 @@ remove_dead_vars(struct exec_list *var_list, struct set *live)
}
bool
nir_remove_dead_variables(nir_shader *shader)
nir_remove_dead_variables(nir_shader *shader, nir_variable_mode mode)
{
bool progress = false;
struct set *live =
@ -123,15 +123,30 @@ nir_remove_dead_variables(nir_shader *shader)
add_var_use_shader(shader, live);
progress = remove_dead_vars(&shader->globals, live) || progress;
if (mode == nir_var_uniform || mode == nir_var_all)
progress = remove_dead_vars(&shader->uniforms, live) || progress;
nir_foreach_function(shader, function) {
if (function->impl) {
if (remove_dead_vars(&function->impl->locals, live)) {
nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance |
nir_metadata_live_ssa_defs);
progress = true;
if (mode == nir_var_shader_in || mode == nir_var_all)
progress = remove_dead_vars(&shader->inputs, live) || progress;
if (mode == nir_var_shader_out || mode == nir_var_all)
progress = remove_dead_vars(&shader->outputs, live) || progress;
if (mode == nir_var_global || mode == nir_var_all)
progress = remove_dead_vars(&shader->globals, live) || progress;
if (mode == nir_var_system_value || mode == nir_var_all)
progress = remove_dead_vars(&shader->system_values, live) || progress;
if (mode == nir_var_local || mode == nir_var_all) {
nir_foreach_function(shader, function) {
if (function->impl) {
if (remove_dead_vars(&function->impl->locals, live)) {
nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance |
nir_metadata_live_ssa_defs);
progress = true;
}
}
}
}

2
src/mesa/drivers/dri/i965/brw_nir.c
View file

@ -484,7 +484,7 @@ brw_preprocess_nir(nir_shader *nir, bool is_scalar)
/* Get rid of split copies */
nir = nir_optimize(nir, is_scalar);
OPT(nir_remove_dead_variables);
OPT(nir_remove_dead_variables, nir_var_local);
return nir;
}