KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/ir3: Rename ir3_nir_lower_to_explicit_io 

We rename it to ir3_nir_lower_to_explicit_output, since it only
handles output and we'll add a lowering pass for input next.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4562>
This commit is contained in:
Kristian H. Kristensen 2020-04-28 12:29:46 -07:00 committed by Marge Bot
parent a16ee14f37
commit b7bfccf085
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedreno/ir3/ir3_nir.c
View File

@ -222,7 +222,7 @@ ir3_optimize_nir(struct ir3_shader *shader, nir_shader *s,
if (key && (key->has_gs || key->tessellation)) {
switch (shader->type) {
case MESA_SHADER_VERTEX:
NIR_PASS_V(s, ir3_nir_lower_to_explicit_io, shader, key->tessellation);
NIR_PASS_V(s, ir3_nir_lower_to_explicit_output, shader, key->tessellation);
break;
case MESA_SHADER_TESS_CTRL:
NIR_PASS_V(s, ir3_nir_lower_tess_ctrl, shader, key->tessellation);
@ -230,7 +230,7 @@ ir3_optimize_nir(struct ir3_shader *shader, nir_shader *s,
case MESA_SHADER_TESS_EVAL:
NIR_PASS_V(s, ir3_nir_lower_tess_eval, key->tessellation);
if (key->has_gs)
NIR_PASS_V(s, ir3_nir_lower_to_explicit_io, shader, key->tessellation);
NIR_PASS_V(s, ir3_nir_lower_to_explicit_output, shader, key->tessellation);
break;
case MESA_SHADER_GEOMETRY:
NIR_PASS_V(s, ir3_nir_lower_gs, shader);

2
src/freedreno/ir3/ir3_nir.h
View File

@ -44,7 +44,7 @@ int ir3_nir_coord_offset(nir_ssa_def *ssa);
bool ir3_nir_lower_tex_prefetch(nir_shader *shader);
void ir3_nir_lower_to_explicit_io(nir_shader *shader,
void ir3_nir_lower_to_explicit_output(nir_shader *shader,
struct ir3_shader *s, unsigned topology);
void ir3_nir_lower_tess_ctrl(nir_shader *shader, struct ir3_shader *s, unsigned topology);
void ir3_nir_lower_tess_eval(nir_shader *shader, unsigned topology);

6
src/freedreno/ir3/ir3_nir_lower_tess.c
View File

@ -179,7 +179,7 @@ build_primitive_map(nir_shader *shader, struct primitive_map *map, struct exec_l
}
static void
lower_vs_block(nir_block *block, nir_builder *b, struct state *state)
lower_block_to_explicit_output(nir_block *block, nir_builder *b, struct state *state)
{
nir_foreach_instr_safe (instr, block) {
if (instr->type != nir_instr_type_intrinsic)
@ -222,7 +222,7 @@ local_thread_id(nir_builder *b)
}
void
ir3_nir_lower_to_explicit_io(nir_shader *shader, struct ir3_shader *s, unsigned topology)
ir3_nir_lower_to_explicit_output(nir_shader *shader, struct ir3_shader *s, unsigned topology)
{
struct state state = { };
@ -242,7 +242,7 @@ ir3_nir_lower_to_explicit_io(nir_shader *shader, struct ir3_shader *s, unsigned
state.header = nir_load_gs_header_ir3(&b);
nir_foreach_block_safe (block, impl)
lower_vs_block(block, &b, &state);
lower_block_to_explicit_output(block, &b, &state);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);