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

radv: support more tessellation parameters with TCS for ESO unlinked shaders

Browse source 
The Vulkan spec change hasn't been released yet but the VKCTS test
is public, so let's merge the fix to make VKCTS green again locally.

Fixes dEQP-VK.shader_object.tessellation.*.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38209>
This commit is contained in:
Samuel Pitoiset 2024-11-12 18:31:09 +01:00 • committed by Marge Bot
parent 373faab109
commit c6d9b9b4e0
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -6179,6 +6179,7 @@ radv_emit_tess_domain_origin_state(struct radv_cmd_buffer *cmd_buffer)
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
const struct radv_physical_device *pdev = radv_device_physical(device); const struct radv_physical_device *pdev = radv_device_physical(device);
const struct radv_shader *tes = radv_get_shader(cmd_buffer->state.shaders, MESA_SHADER_TESS_EVAL); const struct radv_shader *tes = radv_get_shader(cmd_buffer->state.shaders, MESA_SHADER_TESS_EVAL);
const struct radv_shader *tcs = cmd_buffer->state.shaders[MESA_SHADER_TESS_CTRL];
const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic; const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
unsigned type = 0, partitioning = 0; unsigned type = 0, partitioning = 0;
unsigned topology; unsigned topology;
@ -6200,7 +6201,10 @@ radv_emit_tess_domain_origin_state(struct radv_cmd_buffer *cmd_buffer)
UNREACHABLE("Invalid tess primitive type"); UNREACHABLE("Invalid tess primitive type");
} }
switch (tes->info.tes.spacing) { const uint32_t tess_spacing =
tes->info.tes.spacing == TESS_SPACING_UNSPECIFIED ? tcs->info.tcs.spacing : tes->info.tes.spacing;
switch (tess_spacing) {
case TESS_SPACING_EQUAL: case TESS_SPACING_EQUAL:
partitioning = V_028B6C_PART_INTEGER; partitioning = V_028B6C_PART_INTEGER;
break; break;
@ -6214,12 +6218,14 @@ radv_emit_tess_domain_origin_state(struct radv_cmd_buffer *cmd_buffer)
UNREACHABLE("Invalid tess spacing type"); UNREACHABLE("Invalid tess spacing type");
} }
if (tes->info.tes.point_mode) { const bool point_mode = tes->info.tes.point_mode | tcs->info.tcs.point_mode;
if (point_mode) {
topology = V_028B6C_OUTPUT_POINT; topology = V_028B6C_OUTPUT_POINT;
} else if (tes->info.tes._primitive_mode == TESS_PRIMITIVE_ISOLINES) { } else if (tes->info.tes._primitive_mode == TESS_PRIMITIVE_ISOLINES) {
topology = V_028B6C_OUTPUT_LINE; topology = V_028B6C_OUTPUT_LINE;
} else { } else {
bool ccw = tes->info.tes.ccw; bool ccw = tes->info.tes.ccw | tcs->info.tcs.ccw;
if (d->vk.ts.domain_origin != VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT) { if (d->vk.ts.domain_origin != VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT) {
ccw = !ccw; ccw = !ccw;

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

@ -589,6 +589,9 @@ gather_shader_info_tcs(struct radv_device *device, const nir_shader *nir,
nir_gather_tcs_info(nir, &tcs_info, nir->info.tess._primitive_mode, nir->info.tess.spacing); nir_gather_tcs_info(nir, &tcs_info, nir->info.tess._primitive_mode, nir->info.tess.spacing);
ac_nir_get_tess_io_info(nir, &tcs_info, ~0ull, ~0, map_output, true, &info->tcs.io_info); ac_nir_get_tess_io_info(nir, &tcs_info, ~0ull, ~0, map_output, true, &info->tcs.io_info);
info->tcs.spacing = nir->info.tess.spacing;
info->tcs.ccw = nir->info.tess.ccw;
info->tcs.point_mode = nir->info.tess.point_mode;
info->tcs.tcs_vertices_out = nir->info.tess.tcs_vertices_out; info->tcs.tcs_vertices_out = nir->info.tess.tcs_vertices_out;
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;

3
src/amd/vulkan/radv_shader_info.h
View file

@ -241,6 +241,9 @@ struct radv_shader_info {
uint32_t tcs_vertices_out; uint32_t tcs_vertices_out;
uint32_t lds_size; /* in bytes */ uint32_t lds_size; /* in bytes */
uint8_t num_linked_inputs; /* Number of reserved per-vertex input slots in LDS. */ uint8_t num_linked_inputs; /* Number of reserved per-vertex input slots in LDS. */
enum gl_tess_spacing spacing;
bool ccw;
bool point_mode;
bool tes_reads_tess_factors : 1; bool tes_reads_tess_factors : 1;
} tcs; } tcs;
struct { struct {