diff --git a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp b/rpcs3/Emu/RSX/VK/VKCommandStream.cpp index 428df67ac6..d211a88c4d 100644 --- a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommandStream.cpp @@ -26,7 +26,7 @@ namespace vk FORCE_INLINE static void queue_submit_impl(const queue_submit_t& submit_info) { - ensure(submit_info.fence); + ensure(submit_info.pfence); acquire_global_submit_lock(); VkSubmitInfo info { @@ -41,11 +41,11 @@ namespace vk .pSignalSemaphores = submit_info.signal_semaphores.data() }; - vkQueueSubmit(submit_info.queue, 1, &info, submit_info.fence->handle); + vkQueueSubmit(submit_info.queue, 1, &info, submit_info.pfence->handle); release_global_submit_lock(); // Signal fence - submit_info.fence->signal_flushed(); + submit_info.pfence->signal_flushed(); } void queue_submit(const queue_submit_t& submit_info, VkBool32 flush) diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp b/rpcs3/Emu/RSX/VK/vkutils/commands.cpp index f419ddbdaa..415a1f4520 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/commands.cpp @@ -123,10 +123,10 @@ namespace vk // Check for hanging queries to avoid driver hang ensure((flags & cb_has_open_query) == 0); // "close and submit of commandbuffer with a hanging query!" - if (!submit_info.fence) + if (!submit_info.pfence) { - submit_info.fence = m_submit_fence; - is_pending = bool(submit_info.fence); + submit_info.pfence = m_submit_fence; + is_pending = bool(submit_info.pfence); } submit_info.commands = this->commands; diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.h b/rpcs3/Emu/RSX/VK/vkutils/commands.h index c0f3001869..0dae943329 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/commands.h +++ b/rpcs3/Emu/RSX/VK/vkutils/commands.h @@ -28,7 +28,7 @@ namespace vk struct queue_submit_t { VkQueue queue = VK_NULL_HANDLE; - fence* fence = nullptr; + fence* pfence = nullptr; VkCommandBuffer commands = VK_NULL_HANDLE; std::array wait_semaphores; std::array signal_semaphores; @@ -38,7 +38,7 @@ namespace vk queue_submit_t() = default; queue_submit_t(VkQueue queue_, vk::fence* fence_) - : queue(queue_), fence(fence_) {} + : queue(queue_), pfence(fence_) {} queue_submit_t(const queue_submit_t& other) {