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

nir/split_per_member_structs: Use nir_variable_with_modes_safe

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5966>
This commit is contained in:
Jason Ekstrand
2020-07-21 11:31:00 -05:00
committed by Marge Bot
parent 90cf4709d9
commit 4d7e064623
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/nir/nir_split_per_member_structs.c
View File

@@ -104,12 +104,12 @@ split_variable(struct nir_variable *var, nir_shader *shader,
} }
static bool static bool
split_variables_in_list(struct exec_list *var_list, nir_shader *shader, split_variables_in_list(nir_shader *shader, nir_variable_mode mode,
struct hash_table *var_to_member_map, void *dead_ctx) struct hash_table *var_to_member_map, void *dead_ctx)
{ {
bool progress = false; bool progress = false;
nir_foreach_variable_safe(var, var_list) { nir_foreach_variable_with_modes_safe(var, shader, mode) {
if (var->num_members == 0) if (var->num_members == 0)
continue; continue;
@@ -177,11 +177,11 @@ nir_split_per_member_structs(nir_shader *shader)
struct hash_table *var_to_member_map = struct hash_table *var_to_member_map =
_mesa_pointer_hash_table_create(dead_ctx); _mesa_pointer_hash_table_create(dead_ctx);
progress |= split_variables_in_list(&shader->inputs, shader, progress |= split_variables_in_list(shader, nir_var_shader_in,
var_to_member_map, dead_ctx); var_to_member_map, dead_ctx);
progress |= split_variables_in_list(&shader->outputs, shader, progress |= split_variables_in_list(shader, nir_var_shader_out,
var_to_member_map, dead_ctx); var_to_member_map, dead_ctx);
progress |= split_variables_in_list(&shader->system_values, shader, progress |= split_variables_in_list(shader, nir_var_system_value,
var_to_member_map, dead_ctx); var_to_member_map, dead_ctx);
if (!progress) { if (!progress) {
ralloc_free(dead_ctx); ralloc_free(dead_ctx);