MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-24 21:39:35 +00:00
Code Issues Projects Releases Wiki Activity

Rename [save/load]CombinersCache() methods to [save/load]ShadersStorage() ones.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-10-08 22:22:59 +06:00
parent 4cc253db62
commit f267ca36fc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Combiner.cpp
View File

@ -100,7 +100,7 @@ void CombinerInfo::init()
m_bShaderCacheSupported = config.generalEmulation.enableShadersStorage != 0 && OGLVideo::isExtensionSupported(GET_PROGRAM_BINARY_EXTENSION);
m_shadersLoaded = 0;
if (m_bShaderCacheSupported && !_loadCombinersCache()) {
if (m_bShaderCacheSupported && !_loadShadersStorage()) {
for (Combiners::iterator cur = m_combiners.begin(); cur != m_combiners.end(); ++cur)
delete cur->second;
m_combiners.clear();
@ -113,7 +113,7 @@ void CombinerInfo::destroy()
m_pUniformCollection = NULL;
m_pCurrent = NULL;
if (m_bShaderCacheSupported)
_saveCombinersCache();
_saveShadersStorage();
m_shadersLoaded = 0;
for (Combiners::iterator cur = m_combiners.begin(); cur != m_combiners.end(); ++cur)
delete cur->second;
@ -350,7 +350,7 @@ Storage format:
shaders in binary form
*/
static const u32 CombinersCacheFormatVersion = 0x01U;
void CombinerInfo::_saveCombinersCache() const
void CombinerInfo::_saveShadersStorage() const
{
if (m_shadersLoaded >= m_combiners.size())
return;
@ -388,7 +388,7 @@ void CombinerInfo::_saveCombinersCache() const
fout.close();
}
bool CombinerInfo::_loadCombinersCache()
bool CombinerInfo::_loadShadersStorage()
{
wchar_t fileName[PLUGIN_PATH_SIZE];
getStorageFileName(fileName);
@ -443,10 +443,10 @@ bool CombinerInfo::_loadCombinersCache()
return !isGLError();
}
#else // GLES2
void CombinerInfo::_saveCombinersCache() const
void CombinerInfo::_saveShadersStorage() const
{}
bool CombinerInfo::_loadCombinersCache()
bool CombinerInfo::_loadShadersStorage()
{
return true;
}

4
src/Combiner.h
View File

@ -146,8 +146,8 @@ private:
CombinerInfo() : m_bChanged(false), m_bShaderCacheSupported(false), m_shadersLoaded(0), m_pCurrent(NULL) {}
CombinerInfo(const CombinerInfo &);
void _saveCombinersCache() const;
bool _loadCombinersCache();
void _saveShadersStorage() const;
bool _loadShadersStorage();
ShaderCombiner * _compile(u64 mux) const;
bool m_bChanged;