fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-08 18:40:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/rt: Refactor shader group stack size calculation to include traversal stack

Browse source 
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39579>
This commit is contained in:
Natalie Vock 2026-01-25 14:48:00 +01:00 • committed by Marge Bot
parent f234d15924
commit 62254ab0be
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/amd/vulkan/radv_pipeline_rt.c
View file

@ -1464,17 +1464,39 @@ radv_GetRayTracingShaderGroupStackSizeKHR(VkDevice device, VkPipeline _pipeline,
VK_FROM_HANDLE(radv_pipeline, pipeline, _pipeline);
struct radv_ray_tracing_pipeline *rt_pipeline = radv_pipeline_to_ray_tracing(pipeline);
struct radv_ray_tracing_group *rt_group = &rt_pipeline->groups[group];
struct radv_ray_tracing_stage *shader_stage;
switch (groupShader) {
case VK_SHADER_GROUP_SHADER_GENERAL_KHR:
case VK_SHADER_GROUP_SHADER_CLOSEST_HIT_KHR:
return rt_pipeline->stages[rt_group->recursive_shader].stack_size;
shader_stage = &rt_pipeline->stages[rt_group->recursive_shader];
break;
case VK_SHADER_GROUP_SHADER_ANY_HIT_KHR:
return rt_pipeline->stages[rt_group->any_hit_shader].stack_size;
/* If the any-hit shader is inlined into an intersection shader, there is no stack specific to the any-hit shader
* and all stack will be allocated for the intersection shader instead.
*/
if (rt_group->intersection_shader != VK_SHADER_UNUSED_KHR)
return 0;
shader_stage = &rt_pipeline->stages[rt_group->any_hit_shader];
break;
case VK_SHADER_GROUP_SHADER_INTERSECTION_KHR:
return rt_pipeline->stages[rt_group->intersection_shader].stack_size;
shader_stage = &rt_pipeline->stages[rt_group->intersection_shader];
break;
default:
return 0;
}
uint32_t stack_size = shader_stage->stack_size;
/* Applications need to allocate stack for the traversal shader, too. The API doesn't intend for a constant
* traversal stack size, so add the stack size to every shader potentially called by the traversal shader.
* Applications are expected to max() shader stages together, so this shouldn't result in any unnecessary stack
* usage.
*/
if (shader_stage->stage == MESA_SHADER_CLOSEST_HIT || shader_stage->stage == MESA_SHADER_ANY_HIT ||
shader_stage->stage == MESA_SHADER_INTERSECTION || shader_stage->stage == MESA_SHADER_MISS)
stack_size += rt_pipeline->traversal_stack_size;
return stack_size;
}
VKAPI_ATTR VkResult VKAPI_CALL