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

Update boo and GLSL macros

Browse Source
This commit is contained in:
Jack Andersen
2016-02-23 17:18:19 -10:00
parent d76fcf0f5b
commit c424e37fba
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ std::string GLSL::GenerateVertUniformStruct(unsigned skinSlots, unsigned texMtxs
{
if (skinSlots == 0)
skinSlots = 1;
std::string retval = HECL::Format("uniform HECLVertUniform\n"
std::string retval = HECL::Format("UBINDING0 uniform HECLVertUniform\n"
"{\n"
" mat4 mv[%u];\n"
" mat4 mvInv[%u];\n"
@@ -107,7 +107,7 @@ void GLSL::reset(const IR& ir, Diagnostics& diag)
std::string GLSL::makeVert(const char* glslVer, unsigned col, unsigned uv, unsigned w,
unsigned s, unsigned tm) const
{
std::string retval = std::string(glslVer) + "\n" +
std::string retval = std::string(glslVer) + "\n" BOO_GLSL_BINDING_HEAD +
GenerateVertInStruct(col, uv, w) + "\n" +
GenerateVertToFragStruct() + "\n" +
GenerateVertUniformStruct(s, tm) +
@@ -160,9 +160,9 @@ std::string GLSL::makeFrag(const char* glslVer,
std::string texMapDecl;
if (m_texMapEnd)
texMapDecl = HECL::Format("uniform sampler2D texs[%u];\n", m_texMapEnd);
texMapDecl = HECL::Format("TBINDING0 uniform sampler2D texs[%u];\n", m_texMapEnd);
std::string retval = std::string(glslVer) + "\n" +
std::string retval = std::string(glslVer) + "\n" BOO_GLSL_BINDING_HEAD +
GenerateVertToFragStruct() +
"\nlayout(location=0) out vec4 colorOut;\n" +
texMapDecl +
@@ -210,9 +210,9 @@ std::string GLSL::makeFrag(const char* glslVer,
std::string texMapDecl;
if (m_texMapEnd)
texMapDecl = HECL::Format("uniform sampler2D texs[%u];\n", m_texMapEnd);
texMapDecl = HECL::Format("TBINDING0 uniform sampler2D texs[%u];\n", m_texMapEnd);
std::string retval = std::string(glslVer) + "\n" +
std::string retval = std::string(glslVer) + "\n" BOO_GLSL_BINDING_HEAD +
GenerateVertToFragStruct() +
"\nlayout(location=0) out vec4 colorOut;\n" +
texMapDecl +