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

Huge compile performance refactor

Browse Source
This commit is contained in:
Jack Andersen
2017-12-28 21:56:31 -10:00
parent bc055b9126
commit aae0dc56b7
53 changed files with 1523 additions and 1729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hecl/lib/Backend/GLSL.cpp
View File

@@ -5,11 +5,9 @@
#include <boo/graphicsdev/GL.hpp>
#include <boo/graphicsdev/Vulkan.hpp>
static logvisor::Module Log("hecl::Backend::GLSL");
static logvisor::Module GLSL_Log("hecl::Backend::GLSL");
namespace hecl
{
namespace Backend
namespace hecl::Backend
{
std::string GLSL::EmitTexGenSource2(TexGenSrc src, int uvIdx) const
@@ -364,7 +362,8 @@ std::string GLSL::makeFrag(const char* glslVer, bool alphaTest,
}
}
namespace Runtime
namespace hecl::Runtime
{
static const char* STD_BLOCKNAMES[] = {HECL_GLSL_VERT_UNIFORM_BLOCK_NAME,
@@ -407,7 +406,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
cachedSz += fragSource.size() + 1;
if (m_backend.m_texMapEnd > 8)
Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
objOut =
static_cast<boo::GLDataFactory::Context&>(ctx).
@@ -420,7 +419,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
tag.getDepthWrite(), true, false,
tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None);
if (!objOut)
Log.report(logvisor::Fatal, "unable to build shader");
GLSL_Log.report(logvisor::Fatal, "unable to build shader");
ShaderCachedData dataOut(tag, cachedSz);
athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
@@ -448,7 +447,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
return nullptr;
if (texMapEnd > 8)
Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
auto ret =
static_cast<boo::GLDataFactory::Context&>(ctx).
@@ -460,7 +459,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
tag.getDepthWrite(), true, false,
tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None);
if (!ret)
Log.report(logvisor::Fatal, "unable to build shader");
GLSL_Log.report(logvisor::Fatal, "unable to build shader");
return ret;
}
@@ -475,7 +474,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
size_t cachedSz = 3;
if (m_backend.m_texMapEnd > 8)
Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
std::vector<std::pair<std::string, std::string>> sources;
sources.reserve(extensionSlots.size());
@@ -531,7 +530,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
(tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) :
boo::CullMode(slot.cullMode));
if (!ret)
Log.report(logvisor::Fatal, "unable to build shader");
GLSL_Log.report(logvisor::Fatal, "unable to build shader");
returnFunc(ret);
}
@@ -564,7 +563,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
return false;
if (texMapEnd > 8)
Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
for (const ShaderCacheExtensions::ExtensionSlot& slot : extensionSlots)
{
@@ -614,7 +613,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
(tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) :
boo::CullMode(slot.cullMode));
if (!ret)
Log.report(logvisor::Fatal, "unable to build shader");
GLSL_Log.report(logvisor::Fatal, "unable to build shader");
returnFunc(ret);
}
@@ -927,4 +926,3 @@ IShaderBackendFactory* _NewSPIRVBackendFactory()
#endif
}
}

5
hecl/lib/Backend/GX.cpp
View File

@@ -1,9 +1,7 @@
#include "hecl/Backend/GX.hpp"
#include <map>
namespace hecl
{
namespace Backend
namespace hecl::Backend
{
unsigned GX::addKColor(Diagnostics& diag, const SourceLocation& loc, const Color& color)
@@ -773,4 +771,3 @@ void GX::reset(const IR& ir, Diagnostics& diag)
}
}
}

5
hecl/lib/Backend/HLSL.cpp
View File

@@ -6,9 +6,7 @@
static logvisor::Module Log("hecl::Backend::HLSL");
namespace hecl
{
namespace Backend
namespace hecl::Backend
{
std::string HLSL::EmitTexGenSource2(TexGenSrc src, int uvIdx) const
@@ -683,4 +681,3 @@ IShaderBackendFactory* _NewHLSLBackendFactory()
}
}
}

8
hecl/lib/Backend/Metal.cpp
View File

@@ -6,9 +6,7 @@
static logvisor::Module Log("hecl::Backend::Metal");
namespace hecl
{
namespace Backend
namespace hecl::Backend
{
std::string Metal::EmitTexGenSource2(TexGenSrc src, int uvIdx) const
@@ -432,7 +430,8 @@ std::string Metal::makeFrag(size_t blockCount, const char** blockNames, bool alp
}
}
namespace Runtime
namespace hecl::Runtime
{
struct MetalBackendFactory : IShaderBackendFactory
@@ -701,7 +700,6 @@ IShaderBackendFactory* _NewMetalBackendFactory()
return new struct MetalBackendFactory();
}
}
}
#endif

5
hecl/lib/Backend/ProgrammableCommon.cpp
View File

@@ -1,9 +1,7 @@
#include "hecl/Backend/ProgrammableCommon.hpp"
#include <map>
namespace hecl
{
namespace Backend
namespace hecl::Backend
{
unsigned ProgrammableCommon::addTexCoordGen(TexGenSrc src, int uvIdx, int mtx, bool normalize)
@@ -337,4 +335,3 @@ std::string ProgrammableCommon::EmitSwizzle1(Diagnostics& diag, const SourceLoca
}
}
}