From 68d1c38f3b0c5ff08a4ec27769466fa0eddb26f5 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Fri, 30 Jun 2023 02:42:25 +0300 Subject: [PATCH] vk: Minor refactor to make early-exit branches trivial and easier to read --- rpcs3/Emu/RSX/VK/vkutils/sync.cpp | 38 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp index 7facc1eca3..d2bae5bce9 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp @@ -304,29 +304,29 @@ namespace vk resolve_dependencies(cmd, dependency); // 2. Signalling won't wait. The caller is responsible for setting up the dependencies correctly. - if (m_backend == sync_backend::events_v2) + if (m_backend != sync_backend::events_v2) { - // We need a memory barrier to keep AMDVLK from hanging - VkMemoryBarrier2KHR mem_barrier = - { - .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR, - .srcStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR, - .srcAccessMask = VK_ACCESS_2_MEMORY_READ_BIT | VK_ACCESS_2_MEMORY_WRITE_BIT - }; - - // Empty dependency that does nothing - VkDependencyInfoKHR empty_dependency - { - .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR, - .memoryBarrierCount = 1, - .pMemoryBarriers = &mem_barrier - }; - - m_device->_vkCmdSetEvent2KHR(cmd, m_vk_event, &empty_dependency); + vkCmdSetEvent(cmd, m_vk_event, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT); return; } - vkCmdSetEvent(cmd, m_vk_event, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT); + // We need a memory barrier to keep AMDVLK from hanging + VkMemoryBarrier2KHR mem_barrier = + { + .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR, + .srcStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR, + .srcAccessMask = VK_ACCESS_2_MEMORY_READ_BIT | VK_ACCESS_2_MEMORY_WRITE_BIT + }; + + // Empty dependency that does nothing + VkDependencyInfoKHR empty_dependency + { + .sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR, + .memoryBarrierCount = 1, + .pMemoryBarriers = &mem_barrier + }; + + m_device->_vkCmdSetEvent2KHR(cmd, m_vk_event, &empty_dependency); } void event::host_signal() const