From de73d1e17318b9e7ed9d1f84bef56f6cc09bdf82 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 17 Dec 2014 14:49:24 -0800 Subject: [PATCH] nir: Rename nir_block_following_if to nir_block_get_following_if The new name is a little longer but less confusing. Reviewed-by: Connor Abbott --- 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 10e6d0408b9..4b02ec0dd86 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -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; diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index 367862c9a8a..5ae572335f6 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -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); diff --git a/src/glsl/nir/nir_from_ssa.c b/src/glsl/nir/nir_from_ssa.c index b644eb506a9..ca3314f55de 100644 --- a/src/glsl/nir/nir_from_ssa.c +++ b/src/glsl/nir/nir_from_ssa.c @@ -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); diff --git a/src/glsl/nir/nir_live_variables.c b/src/glsl/nir/nir_live_variables.c index dc3057c41fd..305c26476e9 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 9778e9ed6a6..3f7d94d8295 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.30.2