The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-13 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2164 from Armada651/cache-fix

Browse Source 
ProgramShaderCache: Do plenty of error checking before writing shaders to the disk.
This commit is contained in:
Markus Wick 2015-03-02 17:24:00 +01:00
commit cc5a2f3411
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -473,25 +473,33 @@ void ProgramShaderCache::Shutdown()
{ {
for (auto& entry : pshaders) for (auto& entry : pshaders)
{ {
// Clear any prior error code
glGetError();
if (entry.second.in_cache) if (entry.second.in_cache)
{ {
continue; continue;
} }
GLint binary_size; GLint link_status = GL_FALSE, delete_status = GL_TRUE, binary_size = 0;
glGetProgramiv(entry.second.shader.glprogid, GL_LINK_STATUS, &link_status);
glGetProgramiv(entry.second.shader.glprogid, GL_DELETE_STATUS, &delete_status);
glGetProgramiv(entry.second.shader.glprogid, GL_PROGRAM_BINARY_LENGTH, &binary_size); glGetProgramiv(entry.second.shader.glprogid, GL_PROGRAM_BINARY_LENGTH, &binary_size);
if (!binary_size) if (glGetError() != GL_NO_ERROR || link_status == GL_FALSE || delete_status == GL_TRUE || !binary_size)
{ {
continue; continue;
} }
u8 *data = new u8[binary_size+sizeof(GLenum)]; std::vector<u8> data(binary_size + sizeof(GLenum));
u8 *binary = data + sizeof(GLenum); u8* binary = &data[sizeof(GLenum)];
GLenum *prog_format = (GLenum*)data; GLenum* prog_format = (GLenum*)&data[0];
glGetProgramBinary(entry.second.shader.glprogid, binary_size, nullptr, prog_format, binary); glGetProgramBinary(entry.second.shader.glprogid, binary_size, nullptr, prog_format, binary);
if (glGetError() != GL_NO_ERROR)
{
continue;
}
g_program_disk_cache.Append(entry.first, data, binary_size+sizeof(GLenum)); g_program_disk_cache.Append(entry.first, &data[0], binary_size + sizeof(GLenum));
delete [] data;
} }
g_program_disk_cache.Sync(); g_program_disk_cache.Sync();