octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk_scheduler: Prevent DispatchWork stalls

Browse Source 
* Now that Finish no longer depends on the queue being empty of not we can move the chunk execution out of the work_mutex scope
This commit is contained in:
GPUCode
2023-03-04 22:33:25 +02:00
parent ad4339464a
commit 223627c381
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/renderer_vulkan/vk_scheduler.cpp
View File

@@ -72,7 +72,6 @@ void Scheduler::WorkerThread(std::stop_token stop_token) {
Common::SetCurrentThreadName("VulkanWorker"); Common::SetCurrentThreadName("VulkanWorker");
do { do {
std::unique_ptr<CommandChunk> work; std::unique_ptr<CommandChunk> work;
bool has_submit{false};
{ {
std::unique_lock lock{work_mutex}; std::unique_lock lock{work_mutex};
if (work_queue.empty()) { if (work_queue.empty()) {
@@ -84,10 +83,9 @@ void Scheduler::WorkerThread(std::stop_token stop_token) {
} }
work = std::move(work_queue.front()); work = std::move(work_queue.front());
work_queue.pop(); work_queue.pop();
has_submit = work->HasSubmit();
work->ExecuteAll(current_cmdbuf);
} }
const bool has_submit = work->HasSubmit();
work->ExecuteAll(current_cmdbuf);
if (has_submit) { if (has_submit) {
AllocateWorkerCommandBuffers(); AllocateWorkerCommandBuffers();
} }

1
src/video_core/renderer_vulkan/vk_scheduler.h
View File

@@ -213,7 +213,6 @@ private:
std::mutex work_mutex; std::mutex work_mutex;
std::mutex queue_mutex; std::mutex queue_mutex;
std::condition_variable_any work_cv; std::condition_variable_any work_cv;
std::condition_variable wait_cv;
std::jthread worker_thread; std::jthread worker_thread;
bool use_worker_thread; bool use_worker_thread;
}; };