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

nir/lower_vec_to_movs: fixup for new foreach_block()

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott
2016-04-08 16:37:04 -04:00
committed by Jason Ekstrand
parent b1eada04b2
commit 1557344c81
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/nir/nir_lower_vec_to_movs.c
View File

@@ -32,11 +32,6 @@
* moves with partial writes. * moves with partial writes.
*/ */
struct vec_to_movs_state {
nir_function_impl *impl;
bool progress;
};
static bool static bool
src_matches_dest_reg(nir_dest *dest, nir_src *src) src_matches_dest_reg(nir_dest *dest, nir_src *src)
{ {
@@ -215,10 +210,9 @@ try_coalesce(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
} }
static bool static bool
lower_vec_to_movs_block(nir_block *block, void *void_state) lower_vec_to_movs_block(nir_block *block, nir_function_impl *impl)
{ {
struct vec_to_movs_state *state = void_state; bool progress = false;
nir_function_impl *impl = state->impl;
nir_shader *shader = impl->function->shader; nir_shader *shader = impl->function->shader;
nir_foreach_instr_safe(block, instr) { nir_foreach_instr_safe(block, instr) {
@@ -278,25 +272,27 @@ lower_vec_to_movs_block(nir_block *block, void *void_state)
nir_instr_remove(&vec->instr); nir_instr_remove(&vec->instr);
ralloc_free(vec); ralloc_free(vec);
state->progress = true; progress = true;
} }
return true; return progress;
} }
static bool static bool
nir_lower_vec_to_movs_impl(nir_function_impl *impl) nir_lower_vec_to_movs_impl(nir_function_impl *impl)
{ {
struct vec_to_movs_state state = { impl, false }; bool progress = false;
nir_foreach_block_call(impl, lower_vec_to_movs_block, &state); nir_foreach_block(block, impl) {
progress |= lower_vec_to_movs_block(block, impl);
}
if (state.progress) { if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance); nir_metadata_dominance);
} }
return state.progress; return progress;
} }
bool bool