Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Henrik Rydgård 2024-01-22 11:13:27 +01:00
parent 0bf7a98aff
commit d502929cb2
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Common/GPU/Vulkan/VulkanRenderManager.cpp
View File

@ -370,22 +370,22 @@ void VulkanRenderManager::StopThreads() {
// Tell the render thread to quit when it's done.
VKRRenderThreadTask *task = new VKRRenderThreadTask(VKRRunType::EXIT);
task->frame = vulkan_->GetCurFrame();
std::unique_lock<std::mutex> lock(pushMutex_);
renderThreadQueue_.push(task);
{
std::unique_lock<std::mutex> lock(pushMutex_);
renderThreadQueue_.push(task);
}
pushCondVar_.notify_one();
// Once the render thread encounters the above exit task, it'll exit.
renderThread_.join();
}
// Compiler and present thread still relies on this.
runCompileThread_ = false;
if (presentWaitThread_.joinable()) {
presentWaitThread_.join();
}
// Stop the thread.
if (useRenderThread_) {
renderThread_.join();
}
for (int i = 0; i < vulkan_->GetInflightFrames(); i++) {
auto &frameData = frameData_[i];
// Zero the queries so we don't try to pull them later.
@ -394,17 +394,12 @@ void VulkanRenderManager::StopThreads() {
INFO_LOG(G3D, "Vulkan submission thread joined. Frame=%d", vulkan_->GetCurFrame());
if (compileThread_.joinable()) {
// Lock to avoid race conditions. Not sure if needed.
{
std::lock_guard<std::mutex> guard(compileMutex_);
compileCond_.notify_all();
}
compileThread_.join();
}
_assert_(compileThread_.joinable());
compileCond_.notify_all();
compileThread_.join();
INFO_LOG(G3D, "Vulkan compiler thread joined. Now wait for any straggling compile tasks.");
CreateMultiPipelinesTask::WaitForAll();
_dbg_assert_(steps_.empty());
}
@ -488,12 +483,12 @@ void VulkanRenderManager::CompileThreadFunc() {
g_threadManager.EnqueueTask(task);
}
// Hold off just a bit before we check again, to allow bunches of pipelines to collect.
sleep_ms(1);
if (!runCompileThread_) {
break;
}
// Hold off just a bit before we check again, to allow bunches of pipelines to collect.
sleep_ms(1);
}
}