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

nir: rename lower_outputs_to_temporaries -> lower_io_to_temporaries

Browse Source 
Since it will gain support to lower inputs, give it a more generic name.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Rob Clark
2016-03-25 13:52:26 -04:00
parent 47fcef9a20
commit b085016f94
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/Makefile.sources
View File

@@ -199,8 +199,8 @@ NIR_FILES = \
nir/nir_lower_idiv.c \ nir/nir_lower_idiv.c \
nir/nir_lower_indirect_derefs.c \ nir/nir_lower_indirect_derefs.c \
nir/nir_lower_io.c \ nir/nir_lower_io.c \
nir/nir_lower_io_to_temporaries.c \
nir/nir_lower_io_types.c \ nir/nir_lower_io_types.c \
nir/nir_lower_outputs_to_temporaries.c \
nir/nir_lower_passthrough_edgeflags.c \ nir/nir_lower_passthrough_edgeflags.c \
nir/nir_lower_phis_to_scalar.c \ nir/nir_lower_phis_to_scalar.c \
nir/nir_lower_returns.c \ nir/nir_lower_returns.c \

4
src/compiler/nir/nir.h
View File

@@ -2279,8 +2279,8 @@ bool nir_lower_indirect_derefs(nir_shader *shader, nir_variable_mode modes);
bool nir_lower_locals_to_regs(nir_shader *shader); bool nir_lower_locals_to_regs(nir_shader *shader);
void nir_lower_outputs_to_temporaries(nir_shader *shader, void nir_lower_io_to_temporaries(nir_shader *shader, nir_function *entrypoint);
nir_function *entrypoint);
void nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint); void nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint);
void nir_assign_var_locations(struct exec_list *var_list, void nir_assign_var_locations(struct exec_list *var_list,

8
src/compiler/nir/nir_lower_outputs_to_temporaries.c → src/compiler/nir/nir_lower_io_to_temporaries.c
View File

@@ -29,13 +29,13 @@
#include "nir.h" #include "nir.h"
struct lower_outputs_state { struct lower_io_state {
nir_shader *shader; nir_shader *shader;
struct exec_list old_outputs; struct exec_list old_outputs;
}; };
static void static void
emit_output_copies(nir_cursor cursor, struct lower_outputs_state *state) emit_output_copies(nir_cursor cursor, struct lower_io_state *state)
{ {
assert(exec_list_length(&state->shader->outputs) == assert(exec_list_length(&state->shader->outputs) ==
exec_list_length(&state->old_outputs)); exec_list_length(&state->old_outputs));
@@ -55,9 +55,9 @@ emit_output_copies(nir_cursor cursor, struct lower_outputs_state *state)
} }
void void
nir_lower_outputs_to_temporaries(nir_shader *shader, nir_function *entrypoint) nir_lower_io_to_temporaries(nir_shader *shader, nir_function *entrypoint)
{ {
struct lower_outputs_state state; struct lower_io_state state;
if (shader->stage == MESA_SHADER_TESS_CTRL) if (shader->stage == MESA_SHADER_TESS_CTRL)
return; return;

2
src/mesa/drivers/dri/i965/brw_nir.c
View File

@@ -563,7 +563,7 @@ brw_create_nir(struct brw_context *brw,
/* First, lower the GLSL IR or Mesa IR to NIR */ /* First, lower the GLSL IR or Mesa IR to NIR */
if (shader_prog) { if (shader_prog) {
nir = glsl_to_nir(shader_prog, stage, options); nir = glsl_to_nir(shader_prog, stage, options);
OPT_V(nir_lower_outputs_to_temporaries, nir_shader_get_entrypoint(nir)); OPT_V(nir_lower_io_to_temporaries, nir_shader_get_entrypoint(nir));
} else { } else {
nir = prog_to_nir(prog, options); nir = prog_to_nir(prog, options);
OPT_V(nir_convert_to_ssa); /* turn registers into SSA */ OPT_V(nir_convert_to_ssa); /* turn registers into SSA */