diff options
| author | Kristian H. Kristensen <[email protected]> | 2020-04-28 12:29:46 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-01 16:26:31 +0000 |
| commit | b7bfccf08509ada02c3f5c2992f9983b7f5fc7a7 (patch) | |
| tree | b194beebcc9d44f32b92b761519b7818e753bba8 | |
| parent | a16ee14f37fca71c0c14d468db690aa410ac4ce4 (diff) | |
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>
| -rw-r--r-- | src/freedreno/ir3/ir3_nir.c | 4 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_nir.h | 2 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_nir_lower_tess.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c index c40fb43f82d..26035501e35 100644 --- a/src/freedreno/ir3/ir3_nir.c +++ b/src/freedreno/ir3/ir3_nir.c @@ -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); diff --git a/src/freedreno/ir3/ir3_nir.h b/src/freedreno/ir3/ir3_nir.h index ee7c01b0dfa..6a0445c6cf7 100644 --- a/src/freedreno/ir3/ir3_nir.h +++ b/src/freedreno/ir3/ir3_nir.h @@ -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); diff --git a/src/freedreno/ir3/ir3_nir_lower_tess.c b/src/freedreno/ir3/ir3_nir_lower_tess.c index 249e36dad6a..c2bb664a8eb 100644 --- a/src/freedreno/ir3/ir3_nir_lower_tess.c +++ b/src/freedreno/ir3/ir3_nir_lower_tess.c @@ -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); |