[Mesa-dev] [PATCH 138/133] nir: Rename nir_block_following_if to nir_block_get_following_if

[Jason Ekstrand]

The new name is a little longer but less confusing.
---
 src/glsl/nir/nir.c                | 2 +-
 src/glsl/nir/nir.h                | 2 +-
 src/glsl/nir/nir_from_ssa.c       | 2 +-
 src/glsl/nir/nir_live_variables.c | 2 +-
 src/glsl/nir/nir_opt_dce.c        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c
index 0e5a5e1..d0cab5a 100644
--- a/src/glsl/nir/nir.c
+++ b/src/glsl/nir/nir.c
@@ -1949,7 +1949,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;
diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index ba04c29..dbfa461 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -1336,7 +1336,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);
diff --git a/src/glsl/nir/nir_from_ssa.c b/src/glsl/nir/nir_from_ssa.c
index ae3666b..b903cd2 100644
--- a/src/glsl/nir/nir_from_ssa.c
+++ b/src/glsl/nir/nir_from_ssa.c
@@ -562,7 +562,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);
diff --git a/src/glsl/nir/nir_live_variables.c b/src/glsl/nir/nir_live_variables.c
index 13306b3..129e5ef 100644
--- a/src/glsl/nir/nir_live_variables.c
+++ b/src/glsl/nir/nir_live_variables.c
@@ -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);
 
diff --git a/src/glsl/nir/nir_opt_dce.c b/src/glsl/nir/nir_opt_dce.c
index 9778e9e..3f7d94d 100644
--- a/src/glsl/nir/nir_opt_dce.c
+++ b/src/glsl/nir/nir_opt_dce.c
@@ -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)
-- 
2.2.0