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

ShaderCache: Fix crash if pipeline from uid cache fails creation

This commit is contained in:
Stenzek 2019-04-20 23:15:25 +10:00
parent 96aa762d1e
commit c6b45c5ca9
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/VideoCommon/ShaderCache.cpp
View File

@ -641,17 +641,19 @@ const AbstractPipeline* ShaderCache::InsertGXPipeline(const GXPipelineUid& confi
auto& entry = m_gx_pipeline_cache[config]; auto& entry = m_gx_pipeline_cache[config];
entry.second = false; entry.second = false;
if (!entry.first && pipeline) if (!entry.first && pipeline)
{
entry.first = std::move(pipeline); entry.first = std::move(pipeline);
if (g_ActiveConfig.bShaderCache) if (g_ActiveConfig.bShaderCache)
{
auto cache_data = entry.first->GetCacheData();
if (!cache_data.empty())
{ {
SerializedGXPipelineUid disk_uid; auto cache_data = entry.first->GetCacheData();
SerializePipelineUid(config, disk_uid); if (!cache_data.empty())
m_gx_pipeline_disk_cache.Append(disk_uid, cache_data.data(), {
static_cast<u32>(cache_data.size())); SerializedGXPipelineUid disk_uid;
SerializePipelineUid(config, disk_uid);
m_gx_pipeline_disk_cache.Append(disk_uid, cache_data.data(),
static_cast<u32>(cache_data.size()));
}
} }
} }
@ -665,17 +667,19 @@ ShaderCache::InsertGXUberPipeline(const GXUberPipelineUid& config,
auto& entry = m_gx_uber_pipeline_cache[config]; auto& entry = m_gx_uber_pipeline_cache[config];
entry.second = false; entry.second = false;
if (!entry.first && pipeline) if (!entry.first && pipeline)
{
entry.first = std::move(pipeline); entry.first = std::move(pipeline);
if (g_ActiveConfig.bShaderCache) if (g_ActiveConfig.bShaderCache)
{
auto cache_data = entry.first->GetCacheData();
if (!cache_data.empty())
{ {
SerializedGXUberPipelineUid disk_uid; auto cache_data = entry.first->GetCacheData();
SerializePipelineUid(config, disk_uid); if (!cache_data.empty())
m_gx_uber_pipeline_disk_cache.Append(disk_uid, cache_data.data(), {
static_cast<u32>(cache_data.size())); SerializedGXUberPipelineUid disk_uid;
SerializePipelineUid(config, disk_uid);
m_gx_uber_pipeline_disk_cache.Append(disk_uid, cache_data.data(),
static_cast<u32>(cache_data.size()));
}
} }
} }