Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 13:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGLDevice: Fix reused pipeline creation failing without cache

Browse source
This commit is contained in:
Stenzek 2023-09-23 13:38:27 +10:00
parent 7edb57ca15
commit 2a5b3aa695
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/util/opengl_pipeline.cpp
View file

@ -290,21 +290,23 @@ GLuint OpenGLDevice::LookupProgramCache(const OpenGLPipeline::ProgramCacheKey& k
return it->second.program_id; return it->second.program_id;
} }
const GLuint program_id = CompileProgram(plconfig);
if (program_id == 0)
{
// Compile failed, don't add to map, it just gets confusing.
return 0;
}
OpenGLPipeline::ProgramCacheItem item; OpenGLPipeline::ProgramCacheItem item;
item.program_id = CompileProgram(plconfig); item.program_id = program_id;
item.reference_count = 0; item.reference_count = 1;
item.file_format = 0; item.file_format = 0;
item.file_offset = 0; item.file_offset = 0;
item.file_uncompressed_size = 0; item.file_uncompressed_size = 0;
item.file_compressed_size = 0; item.file_compressed_size = 0;
if (item.program_id != 0) if (m_pipeline_disk_cache_file)
{ AddToPipelineCache(&item);
if (m_pipeline_disk_cache_file)
AddToPipelineCache(&item);
item.reference_count++;
}
// Insert into cache even if we failed, so we don't compile it again, but don't increment reference count.
m_program_cache.emplace(key, item); m_program_cache.emplace(key, item);
return item.program_id; return item.program_id;
} }
@ -443,6 +445,10 @@ void OpenGLDevice::UnrefProgram(const OpenGLPipeline::ProgramCacheKey& key)
glDeleteProgram(it->second.program_id); glDeleteProgram(it->second.program_id);
it->second.program_id = 0; it->second.program_id = 0;
// If it's not in the pipeline cache, we need to remove it completely, otherwise we won't recreate it.
if (it->second.file_uncompressed_size == 0)
m_program_cache.erase(it);
} }
GLuint OpenGLDevice::LookupVAOCache(const OpenGLPipeline::VertexArrayCacheKey& key) GLuint OpenGLDevice::LookupVAOCache(const OpenGLPipeline::VertexArrayCacheKey& key)