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

radeonsi: remove in/out/uniform variables from NIR after lowering IO

Browse Source 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6445>
This commit is contained in:
Marek Olšák
2020-08-14 19:11:37 -04:00
parent 81d106d6ec
commit f4d0565f52
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gallium/drivers/radeonsi/si_shader_nir.c
View File

@@ -752,6 +752,23 @@ static void si_lower_io(struct nir_shader *nir)
NIR_PASS_V(nir, nir_opt_constant_folding); NIR_PASS_V(nir, nir_opt_constant_folding);
NIR_PASS_V(nir, nir_io_add_const_offset_to_base, nir_var_shader_in); NIR_PASS_V(nir, nir_io_add_const_offset_to_base, nir_var_shader_in);
NIR_PASS_V(nir, nir_io_add_const_offset_to_base, nir_var_shader_out); NIR_PASS_V(nir, nir_io_add_const_offset_to_base, nir_var_shader_out);
/* Remove dead derefs, so that nir_validate doesn't fail. */
NIR_PASS_V(nir, nir_opt_dce);
/* Remove input and output nir_variables, because we don't need them
* anymore. Also remove uniforms, because those should have been lowered
* to UBOs already.
*/
unsigned modes = nir_var_shader_in | nir_var_shader_out | nir_var_uniform;
nir_foreach_variable_with_modes_safe(var, nir, modes) {
if (var->data.mode == nir_var_uniform &&
(glsl_type_get_image_count(var->type) ||
glsl_type_get_sampler_count(var->type)))
continue;
exec_node_remove(&var->node);
}
} }
/** /**