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

radv: remove draw_id from mesh shader a bit later

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40982>
This commit is contained in:
Georg Lehmann 2026-04-15 14:21:18 +02:00 • committed by Marge Bot
parent f85767a035
commit 8e74c0020e
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/amd/vulkan/radv_pipeline_graphics.c
View file

@ -1258,17 +1258,6 @@ radv_link_gs(struct radv_shader_stage *gs_stage, struct radv_shader_stage *fs_st
}
}
static void
radv_link_mesh(struct radv_shader_stage *mesh_stage, struct radv_shader_stage *fs_stage,
const struct radv_graphics_state_key *gfx_state)
{
assert(mesh_stage->nir->info.stage == MESA_SHADER_MESH);
/* Lower mesh shader draw ID to zero prevent app bugs from triggering undefined behaviour. */
if (mesh_stage->info.ms.has_task && BITSET_TEST(mesh_stage->nir->info.system_values_read, SYSTEM_VALUE_DRAW_ID))
radv_nir_lower_draw_id_to_zero(mesh_stage->nir);
}
static bool
radv_pipeline_needs_noop_fs(struct radv_graphics_pipeline *pipeline, const struct radv_graphics_state_key *gfx_state)
{
@ -1311,7 +1300,6 @@ radv_graphics_shaders_link(const struct radv_device *device, const struct radv_g
case MESA_SHADER_TASK:
break;
case MESA_SHADER_MESH:
radv_link_mesh(&stages[s], next_stage, gfx_state);
break;
case MESA_SHADER_FRAGMENT:
break;
@ -2678,6 +2666,11 @@ radv_graphics_shaders_compile(struct radv_device *device, struct vk_pipeline_cac
if (!radv_is_last_vgt_stage(&stages[i]))
continue;
/* Lower mesh shader draw ID to zero prevent app bugs from triggering undefined behaviour. */
if (i == MESA_SHADER_MESH && stages[i].info.ms.has_task &&
BITSET_TEST(stages[i].nir->info.system_values_read, SYSTEM_VALUE_DRAW_ID))
radv_nir_lower_draw_id_to_zero(stages[i].nir);
uint64_t remove_as_varying = 0;
uint64_t remove_as_sysval = 0;