Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-07 02:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16689 from unknownbrackets/vk-shutdown

Browse Source 
Vulkan: Avoid race in compile thread exit
This commit is contained in:
Henrik Rydgård 2023-01-01 15:59:55 +01:00 committed by GitHub
commit 1353817afa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,7 +302,11 @@ void VulkanRenderManager::StopThread() {
INFO_LOG(G3D, "Vulkan submission thread joined. Frame=%d", vulkan_->GetCurFrame());
compileCond_.notify_all();
if (compileThread_.joinable()) {
// Lock to avoid race conditions.
std::lock_guard<std::mutex> guard(compileMutex_);
compileCond_.notify_all();
}
compileThread_.join();
INFO_LOG(G3D, "Vulkan compiler thread joined.");
@ -360,7 +364,7 @@ void VulkanRenderManager::CompileThreadFunc() {
std::vector<CompileQueueEntry> toCompile;
{
std::unique_lock<std::mutex> lock(compileMutex_);
if (compileQueue_.empty()) {
if (compileQueue_.empty() && run_) {
compileCond_.wait(lock);
}
toCompile = std::move(compileQueue_);