Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[vk] Tighten queue wait stages (#2734)

Ribbitf273ac446bb4
diff --git a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp
index e65755de64..001b1b84d8 100644
--- a/src/video_core/renderer_vulkan/vk_master_semaphore.cpp
+++ b/src/video_core/renderer_vulkan/vk_master_semaphore.cpp
@@ -114,8 +114,11 @@ VkResult MasterSemaphore::SubmitQueue(vk::CommandBuffer& cmdbuf, vk::CommandBuff
}
}
+// Use precise wait stages instead of ALL_COMMANDS to avoid pipeline-wide stalls.
+// First entry is used for external acquire waits; we wait at transfer and color output stages
+// because this submit contains an upload cmd buffer and a render cmd buffer.
static constexpr std::array<VkPipelineStageFlags, 2> wait_stage_masks{
- VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+ VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
};