AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Athena error handling tweak

This commit is contained in:
Jack Andersen 2015-11-22 17:09:46 -10:00
parent a443b6df73
commit a19bc6827c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/driver/main.cpp
View File

@ -76,7 +76,7 @@ static void SIGINTHandler(int sig)
static void SIGWINCHHandler(int sig) {} static void SIGWINCHHandler(int sig) {}
static LogVisor::LogModule AthenaLog("Athena"); static LogVisor::LogModule AthenaLog("Athena");
static void AthenaExc(const Athena::error::Level& level, const char* file, static void AthenaExc(Athena::error::Level level, const char* file,
const char*, int line, const char* fmt, ...) const char*, int line, const char* fmt, ...)
{ {
va_list ap; va_list ap;

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit b0d56910ceb1df893540b218b1ab1676f35fbf3a Subproject commit 0a4e8c360ebbdec3e1dc888a3907d5fe5ce59f4c

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

@ -103,8 +103,8 @@ ShaderCacheManager::ShaderCacheManager(const FileStoreManager& storeMgr,
ShaderCacheExtensions&& extension) ShaderCacheExtensions&& extension)
: m_storeMgr(storeMgr), : m_storeMgr(storeMgr),
m_extensions(std::move(extension)), m_extensions(std::move(extension)),
m_idxFr(storeMgr.getStoreRoot() + _S("/shadercache") + gfxFactory->platformName() + _S(".idx")), m_idxFr(storeMgr.getStoreRoot() + _S("/shadercache") + gfxFactory->platformName() + _S(".idx"), 32*1024, false),
m_datFr(storeMgr.getStoreRoot() + _S("/shadercache") + gfxFactory->platformName() + _S(".dat")) m_datFr(storeMgr.getStoreRoot() + _S("/shadercache") + gfxFactory->platformName() + _S(".dat"), 32*1024, false)
{ {
boo::IGraphicsDataFactory::Platform plat = gfxFactory->platform(); boo::IGraphicsDataFactory::Platform plat = gfxFactory->platform();
if (m_extensions && m_extensions.m_plat != plat) if (m_extensions && m_extensions.m_plat != plat)

10
hecl/test/main.cpp
View File

@ -218,10 +218,16 @@ struct HECLApplicationCallback : boo::IApplicationCallback
} }
}; };
void AthenaExcHandler(const Athena::error::Level& level, void AthenaExcHandler(Athena::error::Level level,
const char* file, const char* function, const char* file, const char* function,
int line, const char* fmt, ...) int line, const char* fmt, ...)
{} {
static LogVisor::LogModule Log("heclTest::AthenaExcHandler");
va_list ap;
va_start(ap, fmt);
Log.reportSource(LogVisor::Level(level), file, line, fmt, ap);
va_end(ap);
}
#if _WIN32 #if _WIN32
int wmain(int argc, const boo::SystemChar** argv) int wmain(int argc, const boo::SystemChar** argv)