Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix rare deadlock in Vulkan shader compilation.

Browse source 
Hopefully won't introduce new problems..
This commit is contained in:
Henrik Rydgård 2025-03-05 13:34:45 +01:00
parent b9843f3000
commit fed476bc94
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Common/GPU/Vulkan/VulkanRenderManager.cpp
View file

@ -869,21 +869,26 @@ void VulkanRenderManager::EndCurRenderStep() {
VkSampleCountFlagBits sampleCount = curRenderStep_->render.framebuffer ? curRenderStep_->render.framebuffer->sampleCount : VK_SAMPLE_COUNT_1_BIT;
compileQueueMutex_.lock();
bool needsCompile = false;
for (VKRGraphicsPipeline *pipeline : pipelinesToCheck_) {
if (!pipeline) {
// Not good, but let's try not to crash.
continue;
}
std::lock_guard<std::mutex> lock(pipeline->mutex_);
std::unique_lock<std::mutex> lock(pipeline->mutex_);
if (!pipeline->pipeline[(size_t)rpType]) {
pipeline->pipeline[(size_t)rpType] = Promise<VkPipeline>::CreateEmpty();
lock.unlock();
_assert_(renderPass);
compileQueueMutex_.lock();
compileQueue_.emplace_back(pipeline, renderPass->Get(vulkan_, rpType, sampleCount), rpType, sampleCount);
compileQueueMutex_.unlock();
needsCompile = true;
}
}
compileQueueMutex_.lock();
if (needsCompile)
compileCond_.notify_one();
compileQueueMutex_.unlock();