ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename outputs correctly when writing default values to them (#3574) 

- Fix for undeclared variable errors
This commit is contained in:
yzwduck 2017-10-11 06:50:43 +08:00 committed by kd-11
parent 9bcc298b18
commit 2e5f8c0786
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
View File

@ -248,6 +248,14 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
for (auto &i : reg_table) for (auto &i : reg_table)
{ {
std::string name = i.name;
if (front_back_diffuse && name == "diff_color")
name = "back_diff_color";
if (front_back_specular && name == "spec_color")
name = "back_spec_color";
if (m_parr.HasParam(PF_PARAM_NONE, "vec4", i.src_reg)) if (m_parr.HasParam(PF_PARAM_NONE, "vec4", i.src_reg))
{ {
if (i.check_mask && (rsx_vertex_program.output_mask & i.check_mask_value) == 0) if (i.check_mask && (rsx_vertex_program.output_mask & i.check_mask_value) == 0)
@ -259,15 +267,7 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
if (i.name == "front_spec_color") if (i.name == "front_spec_color")
insert_front_specular = false; insert_front_specular = false;
std::string name = i.name;
std::string condition = (!i.cond.empty()) ? "(" + i.cond + ") " : ""; std::string condition = (!i.cond.empty()) ? "(" + i.cond + ") " : "";
if (front_back_diffuse && name == "diff_color")
name = "back_diff_color";
if (front_back_specular && name == "spec_color")
name = "back_spec_color";
if (condition.empty() || i.default_val.empty()) if (condition.empty() || i.default_val.empty())
{ {
if (!condition.empty()) condition = "if " + condition; if (!condition.empty()) condition = "if " + condition;
@ -283,7 +283,7 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
{ {
//An output was declared but nothing was written to it //An output was declared but nothing was written to it
//Set it to all ones (Atelier Escha) //Set it to all ones (Atelier Escha)
OS << " " << i.name << " = vec4(1.);\n"; OS << " " << name << " = vec4(1.);\n";
} }
} }