Commit de73d1e1 authored by Jason Ekstrand's avatar Jason Ekstrand
Browse files

nir: Rename nir_block_following_if to nir_block_get_following_if



The new name is a little longer but less confusing.
Reviewed-by: default avatarConnor Abbott <cwabbott0@gmail.com>
parent cb53aaca
......@@ -1947,7 +1947,7 @@ nir_foreach_block_reverse(nir_function_impl *impl, nir_foreach_block_cb cb,
}
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))
return NULL;
......
......@@ -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.
* 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_global_regs(nir_shader *shader);
......
......@@ -557,7 +557,7 @@ resolve_registers_block(nir_block *block, void *void_state)
}
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) {
nir_register *reg = get_register_for_ssa_def(following_if->condition.ssa,
state);
......
......@@ -165,7 +165,7 @@ walk_instructions_block(nir_block *block, void *void_state)
memcpy(block->live_in, block->live_out,
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)
set_src_live(&following_if->condition, block->live_in);
......
......@@ -116,7 +116,7 @@ init_block_cb(nir_block *block, void *_state)
nir_foreach_instr(block, instr)
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->condition.is_ssa &&
!following_if->condition.ssa->parent_instr->live)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment