radv: ignore conditional rendering with vkCmdTraceRays*

CmdTraceRays is neither a dispatch or a draw command which means it
shouldn't be affected by conditional rendering.

Fixes recent VKCTS coverage.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34868>
(cherry picked from commit 4b76d04f7f)
This commit is contained in:
Samuel Pitoiset 2025-05-08 09:47:25 +02:00 committed by Eric Engestrom
parent a06889bd0f
commit 25c188a743
2 changed files with 5 additions and 1 deletions

View file

@ -4954,7 +4954,7 @@
"description": "radv: ignore conditional rendering with vkCmdTraceRays*",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -12701,6 +12701,8 @@ radv_trace_rays(struct radv_cmd_buffer *cmd_buffer, VkTraceRaysIndirectCommand2K
if (instance->debug_flags & RADV_DEBUG_NO_RT)
return;
radv_suspend_conditional_rendering(cmd_buffer);
if (unlikely(device->rra_trace.ray_history_buffer))
radv_trace_trace_rays(cmd_buffer, tables, indirect_va);
@ -12783,6 +12785,8 @@ radv_trace_rays(struct radv_cmd_buffer *cmd_buffer, VkTraceRaysIndirectCommand2K
radv_dispatch(cmd_buffer, &info, pipeline, rt_prolog, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR);
}
radv_resume_conditional_rendering(cmd_buffer);
}
VKAPI_ATTR void VKAPI_CALL