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

Vulkan: Don't save/load pipeline UID cache when shader cache is disabled

This commit is contained in:
Stenzek 2017-06-30 14:37:41 +10:00
parent b380f292b4
commit 7c5bbafdd1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/VideoBackends/Vulkan/StateTracker.cpp
View File

@ -143,13 +143,16 @@ void StateTracker::ReloadPipelineUIDCache()
StateTracker* this_ptr; StateTracker* this_ptr;
}; };
m_uid_cache.Sync();
m_uid_cache.Close();
// UID caches don't contain any host state, so use a single uid cache per gameid. // UID caches don't contain any host state, so use a single uid cache per gameid.
std::string filename = g_object_cache->GetDiskCacheFileName("pipeline-uid", true, false); std::string filename = g_object_cache->GetDiskCacheFileName("pipeline-uid", true, false);
PipelineInserter inserter(this); if (g_ActiveConfig.bShaderCache)
{
// OpenAndRead calls Close() first, which will flush all data to disk when reloading. PipelineInserter inserter(this);
// This assertion must hold true, otherwise data corruption will result. m_uid_cache.OpenAndRead(filename, inserter);
m_uid_cache.OpenAndRead(filename, inserter); }
} }
void StateTracker::AppendToPipelineUIDCache(const PipelineInfo& info) void StateTracker::AppendToPipelineUIDCache(const PipelineInfo& info)
@ -887,7 +890,7 @@ VkPipeline StateTracker::GetPipelineAndCacheUID(const PipelineInfo& info)
auto result = g_object_cache->GetPipelineWithCacheResult(info); auto result = g_object_cache->GetPipelineWithCacheResult(info);
// Add to the UID cache if it is a new pipeline. // Add to the UID cache if it is a new pipeline.
if (!result.second) if (!result.second && g_ActiveConfig.bShaderCache)
AppendToPipelineUIDCache(info); AppendToPipelineUIDCache(info);
return result.first; return result.first;