From b58de424f41ffcdd2c997276c7d20a659e10c272 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 8 Feb 2024 09:10:30 +0100 Subject: [PATCH] radv: fix RGP barrier reason for RP barriers inserted by the runtime Without that, RGP is confused and it's reporting CmdPipelineBarrier() instead of CmdRenderPassSync(). Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 6ce18afb70a..050f15425be 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -11081,8 +11081,15 @@ VKAPI_ATTR void VKAPI_CALL radv_CmdPipelineBarrier2(VkCommandBuffer commandBuffer, const VkDependencyInfo *pDependencyInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); + enum rgp_barrier_reason barrier_reason; - radv_barrier(cmd_buffer, pDependencyInfo, RGP_BARRIER_EXTERNAL_CMD_PIPELINE_BARRIER); + if (cmd_buffer->vk.runtime_rp_barrier) { + barrier_reason = RGP_BARRIER_EXTERNAL_RENDER_PASS_SYNC; + } else { + barrier_reason = RGP_BARRIER_EXTERNAL_CMD_PIPELINE_BARRIER; + } + + radv_barrier(cmd_buffer, pDependencyInfo, barrier_reason); } static void