From 55b5058e69859ba28c2f32de6edf5f0df3c6c28c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 14 Jan 2015 12:41:15 -0800 Subject: [PATCH] nir: Rename lower_variables to lower_vars_to_ssa The original name wasn't particularly descriptive. This one indicates that it actually gives you SSA values as opposed to the old pass which lowered variables to registers. Reviewed-by: Connor Abbott --- src/glsl/Makefile.sources | 2 +- src/glsl/nir/nir.h | 2 +- .../nir/{nir_lower_variables.c => nir_lower_vars_to_ssa.c} | 6 +++--- src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/glsl/nir/{nir_lower_variables.c => nir_lower_vars_to_ssa.c} (99%) diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index a61f234bd4a..4c9aa77ceb6 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -31,7 +31,7 @@ NIR_FILES = \ $(GLSL_SRCDIR)/nir/nir_lower_samplers.cpp \ $(GLSL_SRCDIR)/nir/nir_lower_system_values.c \ $(GLSL_SRCDIR)/nir/nir_lower_to_source_mods.c \ - $(GLSL_SRCDIR)/nir/nir_lower_variables.c \ + $(GLSL_SRCDIR)/nir/nir_lower_vars_to_ssa.c \ $(GLSL_SRCDIR)/nir/nir_lower_vec_to_movs.c \ $(GLSL_SRCDIR)/nir/nir_metadata.c \ $(GLSL_SRCDIR)/nir/nir_opcodes.c \ diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index e797ce24978..12cac728cff 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -1467,7 +1467,7 @@ void nir_lower_locals_to_regs(nir_shader *shader); void nir_lower_io(nir_shader *shader); -void nir_lower_variables(nir_shader *shader); +void nir_lower_vars_to_ssa(nir_shader *shader); void nir_remove_dead_variables(nir_shader *shader); diff --git a/src/glsl/nir/nir_lower_variables.c b/src/glsl/nir/nir_lower_vars_to_ssa.c similarity index 99% rename from src/glsl/nir/nir_lower_variables.c rename to src/glsl/nir/nir_lower_vars_to_ssa.c index 4844b7c6ed0..2b40ededc7d 100644 --- a/src/glsl/nir/nir_lower_variables.c +++ b/src/glsl/nir/nir_lower_vars_to_ssa.c @@ -1131,7 +1131,7 @@ insert_phi_nodes(struct lower_variables_state *state) * with SSA definitions and SSA uses. */ static bool -nir_lower_variables_impl(nir_function_impl *impl) +nir_lower_vars_to_ssa_impl(nir_function_impl *impl) { struct lower_variables_state state; @@ -1206,10 +1206,10 @@ nir_lower_variables_impl(nir_function_impl *impl) } void -nir_lower_variables(nir_shader *shader) +nir_lower_vars_to_ssa(nir_shader *shader) { nir_foreach_overload(shader, overload) { if (overload->impl) - nir_lower_variables_impl(overload->impl); + nir_lower_vars_to_ssa_impl(overload->impl); } } diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index 4c91a6edc44..218cd5ce172 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -43,7 +43,7 @@ fs_visitor::emit_nir_code() bool progress; do { progress = false; - nir_lower_variables(nir); + nir_lower_vars_to_ssa(nir); nir_validate_shader(nir); progress |= nir_copy_prop(nir); nir_validate_shader(nir); -- 2.30.2