fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ac/nir: remove shader_info parameter from ac_nir_compute_tess_wg_info

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34544>
This commit is contained in:
Marek Olšák 2025-04-11 01:57:57 -04:00
parent 6d9e708642
commit be8977811b
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/amd/common/nir/ac_nir.h
View file

@ -118,7 +118,8 @@ ac_nir_lower_tes_inputs_to_mem(nir_shader *shader,
ac_nir_map_io_driver_location map);
void
ac_nir_compute_tess_wg_info(const struct radeon_info *info, const struct shader_info *tcs_info,
ac_nir_compute_tess_wg_info(const struct radeon_info *info, uint64_t outputs_read, uint64_t outputs_written,
uint32_t patch_outputs_read, uint32_t patch_outputs_written, unsigned tcs_vertices_out,
unsigned wave_size, bool tess_uses_primid, bool all_invocations_define_tess_levels,
unsigned num_tcs_input_cp, unsigned lds_input_vertex_size,
unsigned num_mem_tcs_outputs, unsigned num_mem_tcs_patch_outputs,

11
src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c
View file

@ -1289,19 +1289,20 @@ ac_nir_lower_tes_inputs_to_mem(nir_shader *shader,
}
void
ac_nir_compute_tess_wg_info(const struct radeon_info *info, const struct shader_info *tcs_info,
ac_nir_compute_tess_wg_info(const struct radeon_info *info, uint64_t outputs_read, uint64_t outputs_written,
uint32_t patch_outputs_read, uint32_t patch_outputs_written, unsigned tcs_vertices_out,
unsigned wave_size, bool tess_uses_primid, bool all_invocations_define_tess_levels,
unsigned num_tcs_input_cp, unsigned lds_input_vertex_size,
unsigned num_mem_tcs_outputs, unsigned num_mem_tcs_patch_outputs,
unsigned *num_patches_per_wg, unsigned *hw_lds_size)
{
unsigned num_tcs_output_cp = tcs_info->tess.tcs_vertices_out;
unsigned num_tcs_output_cp = tcs_vertices_out;
unsigned lds_output_vertex_size =
util_bitcount64(tcs_info->outputs_read & tcs_info->outputs_written & ~TESS_LVL_MASK) * 16;
util_bitcount64(outputs_read & outputs_written & ~TESS_LVL_MASK) * 16;
unsigned lds_perpatch_output_patch_size =
(util_bitcount64(all_invocations_define_tess_levels ?
0 : tcs_info->outputs_written & TESS_LVL_MASK) +
util_bitcount(tcs_info->patch_outputs_read & tcs_info->patch_outputs_written)) * 16;
0 : outputs_written & TESS_LVL_MASK) +
util_bitcount(patch_outputs_read & patch_outputs_written)) * 16;
unsigned lds_per_patch = num_tcs_input_cp * lds_input_vertex_size +
num_tcs_output_cp * lds_output_vertex_size +

8
src/amd/vulkan/radv_shader.c
View file

@ -3604,9 +3604,11 @@ radv_get_tess_wg_info(const struct radv_physical_device *pdev, const struct shad
{
const uint32_t lds_input_vertex_size = get_tcs_input_vertex_stride(tcs_num_lds_inputs);
ac_nir_compute_tess_wg_info(&pdev->info, tcs_info, pdev->ge_wave_size, false, all_invocations_define_tess_levels,
tcs_num_input_vertices, lds_input_vertex_size, tcs_num_vram_outputs,
tcs_num_vram_patch_outputs, num_patches_per_wg, hw_lds_size);
ac_nir_compute_tess_wg_info(&pdev->info, tcs_info->outputs_read, tcs_info->outputs_written,
tcs_info->patch_outputs_read, tcs_info->patch_outputs_written,
tcs_info->tess.tcs_vertices_out, pdev->ge_wave_size, false,
all_invocations_define_tess_levels, tcs_num_input_vertices, lds_input_vertex_size,
tcs_num_vram_outputs, tcs_num_vram_patch_outputs, num_patches_per_wg, hw_lds_size);
}
VkResult

5
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -4806,7 +4806,10 @@ void si_update_tess_io_layout_state(struct si_context *sctx)
unsigned num_patches, lds_size;
/* Compute NUM_PATCHES and LDS_SIZE. */
ac_nir_compute_tess_wg_info(&sctx->screen->info, &tcs->info.base, ls_current->wave_size,
ac_nir_compute_tess_wg_info(&sctx->screen->info, tcs->info.base.outputs_read,
tcs->info.base.outputs_written, tcs->info.base.patch_outputs_read,
tcs->info.base.patch_outputs_written,
tcs->info.base.tess.tcs_vertices_out, ls_current->wave_size,
tess_uses_primid, tcs->info.tessfactors_are_def_in_all_invocs,
num_tcs_input_cp, lds_input_vertex_size,
num_mem_tcs_outputs, num_mem_tcs_patch_outputs,