AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-12 19:25:51 +00:00
Code Issues Projects Releases Wiki Activity

Update boo

Browse Source
This commit is contained in:
Jack Andersen 2016-02-18 10:52:36 -10:00
parent b430c28529
commit f1cb3bdb58
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/libBoo vendored

@ -1 +1 @@
Subproject commit 38326298a94ca4f5c4c1eb68ff8c74bc30ae6a56
Subproject commit 8bfb883d59cbd88c858f034622d95324a6d266fa

14
hecl/lib/Runtime/ShaderCacheManager.cpp
View File

@ -65,11 +65,10 @@ void ShaderCacheManager::bootstrapIndex()
m_datFr.close();
#if _WIN32
SystemString tmp = m_idxFr.wfilename();
SystemString idxFilename = m_idxFr.wfilename();
#else
SystemString tmp = m_idxFr.filename();
SystemString idxFilename = m_idxFr.filename();
#endif
SystemStringView idxFilename(tmp);
FILE* idxFp = HECL::Fopen(idxFilename.c_str(), _S("wb"));
if (!idxFp)
@ -81,16 +80,15 @@ void ShaderCacheManager::bootstrapIndex()
fwrite(&ZERO64, 1, 8, idxFp);
fclose(idxFp);
#if _WIN32
tmp = m_datFr.wfilename();
SystemString datFilename = m_datFr.wfilename();
#else
tmp = m_datFr.filename();
SystemString datFilename = m_datFr.filename();
#endif
SystemStringView datFilename(tmp);
FILE* datFp = HECL::Fopen(datFilename.c_str(), _S("wb"));
if (!datFp)
Log.report(LogVisor::FatalError, _S("unable to write shader cache data at %s"),
idxFilename.c_str());
datFilename.c_str());
fwrite(&DAT_MAGIC, 1, 8, datFp);
fwrite(&m_timeHash, 1, 8, datFp);
fclose(datFp);
@ -106,7 +104,7 @@ ShaderCacheManager::ShaderCacheManager(const FileStoreManager& storeMgr,
m_extensions(std::move(extension)),
m_idxFr(storeMgr.getStoreRoot() + _S("/shadercache") + gfxFactory->platformName() + _S(".idx"), 32*1024, false),
m_datFr(storeMgr.getStoreRoot() + _S("/shadercache") + gfxFactory->platformName() + _S(".dat"), 32*1024, false)
{
{
boo::IGraphicsDataFactory::Platform plat = gfxFactory->platform();
if (m_extensions && m_extensions.m_plat != plat)
Log.report(LogVisor::FatalError, "ShaderCacheExtension backend mismatch (should be %s)",