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

nir: Rename nir_block_following_if to nir_block_get_following_if

Browse Source 
The new name is a little longer but less confusing.

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand
2014-12-17 14:49:24 -08:00
parent cb53aacaa1
commit de73d1e173
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/nir/nir.c
View File

@@ -1947,7 +1947,7 @@ nir_foreach_block_reverse(nir_function_impl *impl, nir_foreach_block_cb cb,
} }
nir_if * nir_if *
nir_block_following_if(nir_block *block) nir_block_get_following_if(nir_block *block)
{ {
if (exec_node_is_tail_sentinel(&block->cf_node.node)) if (exec_node_is_tail_sentinel(&block->cf_node.node))
return NULL; return NULL;

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

@@ -1335,7 +1335,7 @@ bool nir_foreach_block_reverse(nir_function_impl *impl, nir_foreach_block_cb cb,
/* If the following CF node is an if, this function returns that if. /* If the following CF node is an if, this function returns that if.
* Otherwise, it returns NULL. * Otherwise, it returns NULL.
*/ */
nir_if *nir_block_following_if(nir_block *block); nir_if *nir_block_get_following_if(nir_block *block);
void nir_index_local_regs(nir_function_impl *impl); void nir_index_local_regs(nir_function_impl *impl);
void nir_index_global_regs(nir_shader *shader); void nir_index_global_regs(nir_shader *shader);

2
src/glsl/nir/nir_from_ssa.c
View File

@@ -557,7 +557,7 @@ resolve_registers_block(nir_block *block, void *void_state)
} }
state->instr = NULL; state->instr = NULL;
nir_if *following_if = nir_block_following_if(block); nir_if *following_if = nir_block_get_following_if(block);
if (following_if && following_if->condition.is_ssa) { if (following_if && following_if->condition.is_ssa) {
nir_register *reg = get_register_for_ssa_def(following_if->condition.ssa, nir_register *reg = get_register_for_ssa_def(following_if->condition.ssa,
state); state);

2
src/glsl/nir/nir_live_variables.c
View File

@@ -165,7 +165,7 @@ walk_instructions_block(nir_block *block, void *void_state)
memcpy(block->live_in, block->live_out, memcpy(block->live_in, block->live_out,
state->bitset_words * sizeof(BITSET_WORD)); state->bitset_words * sizeof(BITSET_WORD));
nir_if *following_if = nir_block_following_if(block); nir_if *following_if = nir_block_get_following_if(block);
if (following_if) if (following_if)
set_src_live(&following_if->condition, block->live_in); set_src_live(&following_if->condition, block->live_in);

2
src/glsl/nir/nir_opt_dce.c
View File

@@ -116,7 +116,7 @@ init_block_cb(nir_block *block, void *_state)
nir_foreach_instr(block, instr) nir_foreach_instr(block, instr)
init_instr(instr, worklist); init_instr(instr, worklist);
nir_if *following_if = nir_block_following_if(block); nir_if *following_if = nir_block_get_following_if(block);
if (following_if) { if (following_if) {
if (following_if->condition.is_ssa && if (following_if->condition.is_ssa &&
!following_if->condition.ssa->parent_instr->live) !following_if->condition.ssa->parent_instr->live)