2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:07:43 +00:00

Metal extended shader fixes

This commit is contained in:
Jack Andersen
2016-08-03 13:46:25 -10:00
parent 5f60a33cce
commit 07fcc2db92
4 changed files with 29 additions and 9 deletions

View File

@@ -229,6 +229,18 @@ std::string Metal::makeFrag(size_t blockCount, const char** blockNames, bool alp
"{\n"
" FragOut out;\n";
if (lighting.m_source)
{
retval += " float4 colorReg0 = block0.colorReg0;\n"
" float4 colorReg1 = block0.colorReg1;\n"
" float4 colorReg2 = block0.colorReg2;\n";
}
else
{
retval += " float4 colorReg0 = float4(1.0, 1.0, 1.0, 1.0);\n"
" float4 colorReg1 = float4(1.0, 1.0, 1.0, 1.0);\n"
" float4 colorReg2 = float4(1.0, 1.0, 1.0, 1.0);\n";
}
if (m_lighting)
{
@@ -307,6 +319,19 @@ std::string Metal::makeFrag(size_t blockCount, const char** blockNames, bool alp
"{\n"
" FragOut out;\n";
if (lighting.m_source)
{
retval += " float4 colorReg0 = block0.colorReg0;\n"
" float4 colorReg1 = block0.colorReg1;\n"
" float4 colorReg2 = block0.colorReg2;\n";
}
else
{
retval += " float4 colorReg0 = float4(1.0, 1.0, 1.0, 1.0);\n"
" float4 colorReg1 = float4(1.0, 1.0, 1.0, 1.0);\n"
" float4 colorReg2 = float4(1.0, 1.0, 1.0, 1.0);\n";
}
if (m_lighting)
{
if (lighting.m_entry)