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

Merge pull request #1533 from kd-11/gl_fogc_fix

Browse source 
gl: Properly set up fog parameters for openGL
This commit is contained in:
vlj 2016-03-03 20:46:50 +01:00
commit b0a2f9f65a
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,9 +43,15 @@ void GLFragmentDecompilerThread::insertIntputs(std::stringstream & OS)
for (const ParamType& PT : m_parr.params[PF_PARAM_IN]) for (const ParamType& PT : m_parr.params[PF_PARAM_IN])
{ {
for (const ParamItem& PI : PT.items) for (const ParamItem& PI : PT.items)
{
//Rename fogc to fog_c to differentiate the input register from the variable
if (PI.name == "fogc")
OS << "in vec4 fog_c;" << std::endl;
else
OS << "in " << PT.type << " " << PI.name << ";" << std::endl; OS << "in " << PT.type << " " << PI.name << ";" << std::endl;
} }
} }
}
void GLFragmentDecompilerThread::insertOutputs(std::stringstream & OS) void GLFragmentDecompilerThread::insertOutputs(std::stringstream & OS)
{ {
@ -116,22 +122,22 @@ namespace
switch (mode) switch (mode)
{ {
case rsx::fog_mode::linear: case rsx::fog_mode::linear:
OS << " vec4 fogc = fog_param1 * fogc + (fog_param0 - 1.);\n"; OS << " vec4 fogc = fog_param1 * fog_c + (fog_param0 - 1.);\n";
return; return;
case rsx::fog_mode::exponential: case rsx::fog_mode::exponential:
OS << " vec4 fogc = exp(11.084 * (fog_param1 * fogc + fog_param0 - 1.5));\n"; OS << " vec4 fogc = exp(11.084 * (fog_param1 * fog_c + fog_param0 - 1.5));\n";
return; return;
case rsx::fog_mode::exponential2: case rsx::fog_mode::exponential2:
OS << " vec4 fogc = exp(-pow(4.709 * (fog_param1 * fogc + fog_param0 - 1.5)), 2.);\n"; OS << " vec4 fogc = exp(-pow(4.709 * (fog_param1 * fog_c + fog_param0 - 1.5)), 2.);\n";
return; return;
case rsx::fog_mode::linear_abs: case rsx::fog_mode::linear_abs:
OS << " vec4 fogc = fog_param1 * abs(fogc) + (fog_param0 - 1.);\n"; OS << " vec4 fogc = fog_param1 * abs(fog_c) + (fog_param0 - 1.);\n";
return; return;
case rsx::fog_mode::exponential_abs: case rsx::fog_mode::exponential_abs:
OS << " vec4 fogc = exp(11.084 * (fog_param1 * abs(fogc) + fog_param0 - 1.5));\n"; OS << " vec4 fogc = exp(11.084 * (fog_param1 * abs(fog_c) + fog_param0 - 1.5));\n";
return; return;
case rsx::fog_mode::exponential2_abs: case rsx::fog_mode::exponential2_abs:
OS << " vec4 fogc = exp(-pow(4.709 * (fog_param1 * abs(fogc) + fog_param0 - 1.5)), 2.);\n"; OS << " vec4 fogc = exp(-pow(4.709 * (fog_param1 * abs(fog_c) + fog_param0 - 1.5)), 2.);\n";
return; return;
} }
} }

5
rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
View file

@ -92,7 +92,7 @@ static const reg_info reg_table[] =
{ "spec_color", true, "dst_reg2", "", false }, { "spec_color", true, "dst_reg2", "", false },
{ "front_diff_color", true, "dst_reg3", "", false }, { "front_diff_color", true, "dst_reg3", "", false },
{ "front_spec_color", true, "dst_reg4", "", false }, { "front_spec_color", true, "dst_reg4", "", false },
{ "fogc", true, "dst_reg5", ".x", true }, { "fog_c", true, "dst_reg5", ".xxxx", true },
{ "gl_ClipDistance[0]", false, "dst_reg5", ".y", false }, { "gl_ClipDistance[0]", false, "dst_reg5", ".y", false },
{ "gl_ClipDistance[1]", false, "dst_reg5", ".z", false }, { "gl_ClipDistance[1]", false, "dst_reg5", ".z", false },
{ "gl_ClipDistance[2]", false, "dst_reg5", ".w", false }, { "gl_ClipDistance[2]", false, "dst_reg5", ".w", false },
@ -118,9 +118,6 @@ void GLVertexDecompilerThread::insertOutputs(std::stringstream & OS, const std::
{ {
if (m_parr.HasParam(PF_PARAM_NONE, "vec4", i.src_reg) && i.need_declare) if (m_parr.HasParam(PF_PARAM_NONE, "vec4", i.src_reg) && i.need_declare)
{ {
if (i.name == "fogc")
OS << "out float " << i.name << ";" << std::endl;
else
OS << "out vec4 " << i.name << ";" << std::endl; OS << "out vec4 " << i.name << ";" << std::endl;
} }
} }