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

Update GLSL backend for memory testing

This commit is contained in:
Jack Andersen 2016-04-03 16:27:16 -10:00
parent 5563ff403e
commit 4388cf64e5
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit 34d3bd67245a533c1dacedcfd031d67b41c407e6
Subproject commit 50406520baeb169def9ff573108ae135ef561e34

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

@ -91,11 +91,18 @@ std::string GLSL::GenerateVertUniformStruct(unsigned skinSlots, unsigned texMtxs
"{\n"
" mat4 mv[%u];\n"
" mat4 mvInv[%u];\n"
" mat4 proj;\n",
" mat4 proj;\n"
"};\n",
skinSlots, skinSlots);
if (texMtxs)
retval += hecl::Format(" mat4 texMtxs[%u];\n", texMtxs);
return retval + "};\n";
{
retval += hecl::Format("UBINDING1 uniform HECLTexMtxUniform\n"
"{\n"
" mat4 texMtxs[%u];\n"
"};\n", texMtxs);
}
return retval;
}
void GLSL::reset(const IR& ir, Diagnostics& diag)
@ -174,7 +181,7 @@ std::string GLSL::makeFrag(const char* glslVer,
if (m_lighting)
{
if (lighting.m_entry)
retval += hecl::Format(" vec4 lighting = %s();\n", lighting.m_entry);
retval += hecl::Format(" vec4 lighting = %s(vtf.mvPos, vtf.mvNorm);\n", lighting.m_entry);
else
retval += " vec4 lighting = vec4(1.0,1.0,1.0,1.0);\n";
}
@ -224,7 +231,7 @@ std::string GLSL::makeFrag(const char* glslVer,
if (m_lighting)
{
if (lighting.m_entry)
retval += hecl::Format(" vec4 lighting = %s();\n", lighting.m_entry);
retval += hecl::Format(" vec4 lighting = %s(vtf.mvPos, vtf.mvNorm);\n", lighting.m_entry);
else
retval += " vec4 lighting = vec4(1.0,1.0,1.0,1.0);\n";
}