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

radv: Cleanup PS input generation.

Browse Source 
This cleans up radv_pipeline_generate_ps_inputs.
Makes the code a little cleaner, and makes it easier to add
per-primitive PS inputs.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13580>
This commit is contained in:
Timur Kristóf
2021-12-15 10:56:54 +01:00
committed by Marge Bot
parent 459b4961bd
commit 256dcc209f
1 changed files with 59 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/amd/vulkan/radv_pipeline.c
View File

@@ -5080,6 +5080,47 @@ offset_to_ps_input(uint32_t offset, bool flat_shade, bool explicit, bool float16
return ps_input_cntl; return ps_input_cntl;
} }
static void
single_slot_to_ps_input(const struct radv_vs_output_info *outinfo,
unsigned slot, uint32_t *ps_input_cntl, unsigned *ps_offset,
bool skip_undef, bool use_default_0, bool flat_shade)
{
unsigned vs_offset = outinfo->vs_output_param_offset[slot];
if (vs_offset == AC_EXP_PARAM_UNDEFINED) {
if (skip_undef)
return;
else if (use_default_0)
vs_offset = AC_EXP_PARAM_DEFAULT_VAL_0000;
else
unreachable("vs_offset should not be AC_EXP_PARAM_UNDEFINED.");
}
ps_input_cntl[*ps_offset] = offset_to_ps_input(vs_offset, flat_shade, false, false);
++(*ps_offset);
}
static void
input_mask_to_ps_inputs(const struct radv_vs_output_info *outinfo, const struct radv_shader *ps,
uint32_t input_mask, uint32_t *ps_input_cntl, unsigned *ps_offset)
{
u_foreach_bit(i, input_mask) {
unsigned vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_VAR0 + i];
if (vs_offset == AC_EXP_PARAM_UNDEFINED) {
ps_input_cntl[*ps_offset] = S_028644_OFFSET(0x20);
++(*ps_offset);
continue;
}
bool flat_shade = !!(ps->info.ps.flat_shaded_mask & (1u << *ps_offset));
bool explicit = !!(ps->info.ps.explicit_shaded_mask & (1u << *ps_offset));
bool float16 = !!(ps->info.ps.float16_shaded_mask & (1u << *ps_offset));
ps_input_cntl[*ps_offset] = offset_to_ps_input(vs_offset, flat_shade, explicit, float16);
++(*ps_offset);
}
}
static void static void
radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs, const struct radv_pipeline *pipeline) radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs, const struct radv_pipeline *pipeline)
{ {
@@ -5089,76 +5130,32 @@ radv_pipeline_generate_ps_inputs(struct radeon_cmdbuf *ctx_cs, const struct radv
unsigned ps_offset = 0; unsigned ps_offset = 0;
if (ps->info.ps.prim_id_input) { if (ps->info.ps.prim_id_input)
unsigned vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_PRIMITIVE_ID]; single_slot_to_ps_input(outinfo, VARYING_SLOT_PRIMITIVE_ID, ps_input_cntl, &ps_offset,
if (vs_offset != AC_EXP_PARAM_UNDEFINED) { true, false, true);
ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false, false);
++ps_offset;
}
}
if (ps->info.ps.layer_input) { if (ps->info.ps.layer_input)
unsigned vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_LAYER]; single_slot_to_ps_input(outinfo, VARYING_SLOT_LAYER, ps_input_cntl, &ps_offset,
if (vs_offset != AC_EXP_PARAM_UNDEFINED) false, true, true);
ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false, false);
else
ps_input_cntl[ps_offset] =
offset_to_ps_input(AC_EXP_PARAM_DEFAULT_VAL_0000, true, false, false);
++ps_offset;
}
if (ps->info.ps.viewport_index_input) { if (ps->info.ps.viewport_index_input)
unsigned vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_VIEWPORT]; single_slot_to_ps_input(outinfo, VARYING_SLOT_VIEWPORT, ps_input_cntl, &ps_offset,
assert(vs_offset != AC_EXP_PARAM_UNDEFINED); false, false, true);
ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, true, false, false);
++ps_offset;
}
if (ps->info.ps.has_pcoord) { if (ps->info.ps.has_pcoord)
unsigned val; ps_input_cntl[ps_offset++] = S_028644_PT_SPRITE_TEX(1) | S_028644_OFFSET(0x20);
val = S_028644_PT_SPRITE_TEX(1) | S_028644_OFFSET(0x20);
ps_input_cntl[ps_offset] = val;
ps_offset++;
}
if (ps->info.ps.num_input_clips_culls) { if (ps->info.ps.num_input_clips_culls) {
unsigned vs_offset; single_slot_to_ps_input(outinfo, VARYING_SLOT_CLIP_DIST0, ps_input_cntl, &ps_offset,
true, false, false);
vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_CLIP_DIST0]; if (ps->info.ps.num_input_clips_culls > 4)
if (vs_offset != AC_EXP_PARAM_UNDEFINED) { single_slot_to_ps_input(outinfo, VARYING_SLOT_CLIP_DIST1, ps_input_cntl, &ps_offset,
ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, false, false, false); true, false, false);
++ps_offset;
}
vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_CLIP_DIST1];
if (vs_offset != AC_EXP_PARAM_UNDEFINED && ps->info.ps.num_input_clips_culls > 4) {
ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, false, false, false);
++ps_offset;
}
} }
for (unsigned i = 0; i < 32 && (1u << i) <= ps->info.ps.input_mask; ++i) { input_mask_to_ps_inputs(outinfo, ps, ps->info.ps.input_mask,
unsigned vs_offset; ps_input_cntl, &ps_offset);
bool flat_shade;
bool explicit;
bool float16;
if (!(ps->info.ps.input_mask & (1u << i)))
continue;
vs_offset = outinfo->vs_output_param_offset[VARYING_SLOT_VAR0 + i];
if (vs_offset == AC_EXP_PARAM_UNDEFINED) {
ps_input_cntl[ps_offset] = S_028644_OFFSET(0x20);
++ps_offset;
continue;
}
flat_shade = !!(ps->info.ps.flat_shaded_mask & (1u << ps_offset));
explicit = !!(ps->info.ps.explicit_shaded_mask & (1u << ps_offset));
float16 = !!(ps->info.ps.float16_shaded_mask & (1u << ps_offset));
ps_input_cntl[ps_offset] = offset_to_ps_input(vs_offset, flat_shade, explicit, float16);
++ps_offset;
}
if (ps_offset) { if (ps_offset) {
radeon_set_context_reg_seq(ctx_cs, R_028644_SPI_PS_INPUT_CNTL_0, ps_offset); radeon_set_context_reg_seq(ctx_cs, R_028644_SPI_PS_INPUT_CNTL_0, ps_offset);