ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10977 from tellowkrinkle/FixBackendMultithreading 

VideoBackends:Vulkan: Improve backend multithreading
This commit is contained in:
JMC47 2022-10-25 04:14:01 -04:00 committed by GitHub
parent 9ef7a3b44c 6fd933915b
commit 027e10460a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
View File

@ -239,6 +239,8 @@ bool CommandBufferManager::CreateSubmitThread()
SubmitCommandBuffer(submit.command_buffer_index, submit.present_swap_chain, SubmitCommandBuffer(submit.command_buffer_index, submit.present_swap_chain,
submit.present_image_index); submit.present_image_index);
CmdBufferResources& resources = m_command_buffers[submit.command_buffer_index];
resources.waiting_for_submit.store(false, std::memory_order_release);
{ {
std::lock_guard<std::mutex> guard(m_pending_submit_lock); std::lock_guard<std::mutex> guard(m_pending_submit_lock);
@ -284,11 +286,16 @@ void CommandBufferManager::WaitForFenceCounter(u64 fence_counter)
void CommandBufferManager::WaitForCommandBufferCompletion(u32 index) void CommandBufferManager::WaitForCommandBufferCompletion(u32 index)
{ {
// Ensure this command buffer has been submitted.
WaitForWorkerThreadIdle();
CmdBufferResources& resources = m_command_buffers[index]; CmdBufferResources& resources = m_command_buffers[index];
// Ensure this command buffer has been submitted.
if (resources.waiting_for_submit.load(std::memory_order_acquire))
{
WaitForWorkerThreadIdle();
ASSERT_MSG(VIDEO, !resources.waiting_for_submit.load(std::memory_order_relaxed),
"Submit thread is idle but command buffer is still waiting for submission!");
}
// Wait for this command buffer to be completed. // Wait for this command buffer to be completed.
VkResult res = VkResult res =
vkWaitForFences(g_vulkan_context->GetDevice(), 1, &resources.fence, VK_TRUE, UINT64_MAX); vkWaitForFences(g_vulkan_context->GetDevice(), 1, &resources.fence, VK_TRUE, UINT64_MAX);
@ -339,6 +346,7 @@ void CommandBufferManager::SubmitCommandBuffer(bool submit_on_worker_thread,
// Submitting off-thread? // Submitting off-thread?
if (m_use_threaded_submission && submit_on_worker_thread && !wait_for_completion) if (m_use_threaded_submission && submit_on_worker_thread && !wait_for_completion)
{ {
resources.waiting_for_submit.store(true, std::memory_order_relaxed);
// Push to the pending submit queue. // Push to the pending submit queue.
{ {
std::lock_guard<std::mutex> guard(m_pending_submit_lock); std::lock_guard<std::mutex> guard(m_pending_submit_lock);

1
Source/Core/VideoBackends/Vulkan/CommandBufferManager.h
View File

@ -117,6 +117,7 @@ private:
u64 fence_counter = 0; u64 fence_counter = 0;
bool init_command_buffer_used = false; bool init_command_buffer_used = false;
bool semaphore_used = false; bool semaphore_used = false;
std::atomic<bool> waiting_for_submit{false};
u32 frame_index = 0; u32 frame_index = 0;
std::vector<std::function<void()>> cleanup_resources; std::vector<std::function<void()>> cleanup_resources;