archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #577 from raven02/patch-3

Browse source 
Regression fix #1
This commit is contained in:
DHrpcs3 2014-07-18 19:44:31 +03:00
commit 1cfd2c4475
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/GS/GL/GLFragmentProgram.cpp
View file

@ -251,10 +251,10 @@ std::string GLFragmentDecompilerThread::BuildCode()
static const std::pair<std::string, std::string> table[] = static const std::pair<std::string, std::string> table[] =
{ {
{ "ocol0", m_ctrl & 0x40 ? "r0" : "h0" }, { "ocol0", m_ctrl & 0x40 ? "r0" : "h0" },
{ "ocol1", m_ctrl & 0x40 ? "r1" : "h2" }, { "ocol1", m_ctrl & 0x40 ? "r2" : "h2" },
{ "ocol2", m_ctrl & 0x40 ? "r2" : "h4" }, { "ocol2", m_ctrl & 0x40 ? "r3" : "h4" },
{ "ocol3", m_ctrl & 0x40 ? "r3" : "h6" }, { "ocol3", m_ctrl & 0x40 ? "r4" : "h6" },
{ "ocol4", m_ctrl & 0x40 ? "r4" : "h8" }, { "ocol4", m_ctrl & 0x40 ? "r5" : "h8" },
}; };
for (int i = 0; i < sizeof(table) / sizeof(*table); ++i) for (int i = 0; i < sizeof(table) / sizeof(*table); ++i)
@ -263,19 +263,19 @@ std::string GLFragmentDecompilerThread::BuildCode()
AddCode(m_parr.AddParam(PARAM_OUT, "vec4", table[i].first, i) + " = " + table[i].second + ";"); AddCode(m_parr.AddParam(PARAM_OUT, "vec4", table[i].first, i) + " = " + table[i].second + ";");
} }
if(m_ctrl & 0xe) main += "\tgl_FragDepth = r1.z;\n"; if (m_ctrl & 0xe) main += "\tgl_FragDepth = r1.z;\n";
std::string p; std::string p;
for(u32 i=0; i<m_parr.params.size(); ++i) for (u32 i = 0; i<m_parr.params.size(); ++i)
{ {
p += m_parr.params[i].Format(); p += m_parr.params[i].Format();
} }
return std::string("#version 330\n" return std::string("#version 330\n"
"\n" "\n"
+ p + "\n" + p + "\n"
"void main()\n{\n" + main + "}\n"); "void main()\n{\n" + main + "}\n");
} }
void GLFragmentDecompilerThread::Task() void GLFragmentDecompilerThread::Task()