mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Small change to delete microcode cache more aggressively.

Browse source
This commit is contained in:
scrawl 2013-02-11 02:28:02 +01:00
parent 814969dcae
commit 62c711d709
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extern/shiny/Main/Factory.cpp vendored
View file

@ -15,6 +15,7 @@
namespace sh namespace sh
{ {
Factory* Factory::sThis = 0; Factory* Factory::sThis = 0;
const std::string Factory::mBinaryCacheName = "binaryCache";
Factory& Factory::getInstance() Factory& Factory::getInstance()
{ {
@ -198,8 +199,7 @@ namespace sh
if (mShadersLastModified[sourceRelative] != lastModified) if (mShadersLastModified[sourceRelative] != lastModified)
{ {
// delete any outdated shaders based on this shader set // delete any outdated shaders based on this shader set
removeCache (it->first); if (removeCache (it->first))
// remove the whole binary cache (removing only the individual shaders does not seem to be possible at this point with OGRE)
removeBinaryCache = true; removeBinaryCache = true;
} }
} }
@ -207,7 +207,8 @@ namespace sh
{ {
// if we get here, this is either the first run or a new shader file was added // if we get here, this is either the first run or a new shader file was added
// in both cases we can safely delete // in both cases we can safely delete
removeCache (it->first); if (removeCache (it->first))
removeBinaryCache = true;
} }
mShaderSets.insert(std::make_pair(it->first, newSet)); mShaderSets.insert(std::make_pair(it->first, newSet));
} }
@ -304,7 +305,7 @@ namespace sh
if (mPlatform->supportsShaderSerialization () && mReadMicrocodeCache && !removeBinaryCache) if (mPlatform->supportsShaderSerialization () && mReadMicrocodeCache && !removeBinaryCache)
{ {
std::string file = mPlatform->getCacheFolder () + "/shShaderCache.txt"; std::string file = mPlatform->getCacheFolder () + "/" + mBinaryCacheName;
if (boost::filesystem::exists(file)) if (boost::filesystem::exists(file))
{ {
mPlatform->deserializeShaders (file); mPlatform->deserializeShaders (file);
@ -316,7 +317,7 @@ namespace sh
{ {
if (mPlatform->supportsShaderSerialization () && mWriteMicrocodeCache) if (mPlatform->supportsShaderSerialization () && mWriteMicrocodeCache)
{ {
std::string file = mPlatform->getCacheFolder () + "/shShaderCache.txt"; std::string file = mPlatform->getCacheFolder () + "/" + mBinaryCacheName;
mPlatform->serializeShaders (file); mPlatform->serializeShaders (file);
} }
@ -590,8 +591,9 @@ namespace sh
m->createForConfiguration (configuration, 0); m->createForConfiguration (configuration, 0);
} }
void Factory::removeCache(const std::string& pattern) bool Factory::removeCache(const std::string& pattern)
{ {
bool ret = false;
if ( boost::filesystem::exists(mPlatform->getCacheFolder()) if ( boost::filesystem::exists(mPlatform->getCacheFolder())
&& boost::filesystem::is_directory(mPlatform->getCacheFolder())) && boost::filesystem::is_directory(mPlatform->getCacheFolder()))
{ {
@ -620,10 +622,12 @@ namespace sh
if (shaderName == pattern) if (shaderName == pattern)
{ {
boost::filesystem::remove(file); boost::filesystem::remove(file);
ret = true;
std::cout << "Removing outdated shader: " << file << std::endl; std::cout << "Removing outdated shader: " << file << std::endl;
} }
} }
} }
} }
return ret;
} }
} }

5
extern/shiny/Main/Factory.hpp vendored
View file

@ -203,7 +203,10 @@ namespace sh
MaterialInstance* findInstance (const std::string& name); MaterialInstance* findInstance (const std::string& name);
MaterialInstance* searchInstance (const std::string& name); MaterialInstance* searchInstance (const std::string& name);
void removeCache (const std::string& pattern); /// @return was anything removed?
bool removeCache (const std::string& pattern);
static const std::string mBinaryCacheName;
}; };
} }