fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 11:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Extract input and output stride info to new functions.

Browse source 
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28021>
This commit is contained in:
Timur Kristóf 2024-03-07 13:36:30 +01:00 • committed by Marge Bot
parent c72bb8de75
commit 2f1f55cf32
1 changed files with 53 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/amd/vulkan/radv_shader_info.c
View file

@ -422,6 +422,53 @@ gather_shader_info_ngg_query(struct radv_device *device, struct radv_shader_info
info->has_prim_query = device->cache_key.primitives_generated_query || info->has_xfb_query; info->has_prim_query = device->cache_key.primitives_generated_query || info->has_xfb_query;
} }
static void
gather_info_unlinked_input(struct radv_shader_info *info, const nir_shader *nir)
{
if (info->inputs_linked)
return;
const unsigned num_linked_inputs = util_last_bit64(nir->info.inputs_read);
switch (nir->info.stage) {
case MESA_SHADER_TESS_CTRL:
info->tcs.num_linked_inputs = num_linked_inputs;
break;
case MESA_SHADER_TESS_EVAL:
info->tes.num_linked_inputs = num_linked_inputs;
break;
case MESA_SHADER_GEOMETRY:
info->gs.num_linked_inputs = num_linked_inputs;
break;
default:
unreachable("Stage doesn't have linked inputs.");
}
}
static void
gather_info_unlinked_output(struct radv_shader_info *info, const nir_shader *nir)
{
if (info->outputs_linked)
return;
const unsigned num_linked_outputs = util_last_bit64(nir->info.outputs_written);
switch (nir->info.stage) {
case MESA_SHADER_VERTEX:
info->vs.num_linked_outputs = num_linked_outputs;
break;
case MESA_SHADER_TESS_CTRL:
info->tcs.num_linked_outputs = num_linked_outputs;
info->tcs.num_linked_patch_outputs = util_last_bit64(nir->info.patch_outputs_written);
break;
case MESA_SHADER_TESS_EVAL:
info->tes.num_linked_outputs = num_linked_outputs;
break;
default:
unreachable("Stage doesn't have linked outputs.");
}
}
static void static void
gather_shader_info_vs(struct radv_device *device, const nir_shader *nir, gather_shader_info_vs(struct radv_device *device, const nir_shader *nir,
const struct radv_graphics_state_key *gfx_state, const struct radv_shader_stage_key *stage_key, const struct radv_graphics_state_key *gfx_state, const struct radv_shader_stage_key *stage_key,
@ -454,8 +501,7 @@ gather_shader_info_vs(struct radv_device *device, const nir_shader *nir,
*/ */
info->vs.dynamic_num_verts_per_prim = gfx_state->ia.topology == V_008958_DI_PT_NONE && info->is_ngg && nir->xfb_info; info->vs.dynamic_num_verts_per_prim = gfx_state->ia.topology == V_008958_DI_PT_NONE && info->is_ngg && nir->xfb_info;
if (!info->outputs_linked) gather_info_unlinked_output(info, nir);
info->vs.num_linked_outputs = util_last_bit64(nir->info.outputs_written);
if (info->next_stage == MESA_SHADER_TESS_CTRL) { if (info->next_stage == MESA_SHADER_TESS_CTRL) {
info->vs.as_ls = true; info->vs.as_ls = true;
@ -481,12 +527,8 @@ gather_shader_info_tcs(struct radv_device *device, const nir_shader *nir,
info->tcs.tes_inputs_read = ~0ULL; info->tcs.tes_inputs_read = ~0ULL;
info->tcs.tes_patch_inputs_read = ~0ULL; info->tcs.tes_patch_inputs_read = ~0ULL;
if (!info->inputs_linked) gather_info_unlinked_input(info, nir);
info->tcs.num_linked_inputs = util_last_bit64(nir->info.inputs_read); gather_info_unlinked_output(info, nir);
if (!info->outputs_linked) {
info->tcs.num_linked_outputs = util_last_bit64(nir->info.outputs_written);
info->tcs.num_linked_patch_outputs = util_last_bit64(nir->info.patch_outputs_written);
}
if (gfx_state->ts.patch_control_points) { if (gfx_state->ts.patch_control_points) {
/* Number of tessellation patches per workgroup processed by the current pipeline. */ /* Number of tessellation patches per workgroup processed by the current pipeline. */
@ -518,10 +560,8 @@ gather_shader_info_tes(struct radv_device *device, const nir_shader *nir, struct
info->tes.reads_tess_factors = info->tes.reads_tess_factors =
!!(nir->info.inputs_read & (VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER)); !!(nir->info.inputs_read & (VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER));
if (!info->inputs_linked) gather_info_unlinked_input(info, nir);
info->tes.num_linked_inputs = util_last_bit64(nir->info.inputs_read); gather_info_unlinked_output(info, nir);
if (!info->outputs_linked)
info->tes.num_linked_outputs = util_last_bit64(nir->info.outputs_written);
if (info->next_stage == MESA_SHADER_GEOMETRY) { if (info->next_stage == MESA_SHADER_GEOMETRY) {
info->tes.as_es = true; info->tes.as_es = true;
@ -696,8 +736,7 @@ gather_shader_info_gs(struct radv_device *device, const nir_shader *nir, struct
info->gs.has_pipeline_stat_query = device->physical_device->emulate_ngg_gs_query_pipeline_stat; info->gs.has_pipeline_stat_query = device->physical_device->emulate_ngg_gs_query_pipeline_stat;
if (!info->inputs_linked) gather_info_unlinked_input(info, nir);
info->gs.num_linked_inputs = util_last_bit64(nir->info.inputs_read);
if (info->is_ngg) { if (info->is_ngg) {
gather_shader_info_ngg_query(device, info); gather_shader_info_ngg_query(device, info);