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

d3d12/gl: Separate fog distance and fog frag in fogc input.

Browse source
This commit is contained in:
Vincent Lejeune 2016-03-04 17:51:24 +01:00
parent 52e2800fb5
commit 1dcc6858b4
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
View file

@ -152,22 +152,22 @@ namespace
switch (mode) switch (mode)
{ {
case rsx::fog_mode::linear: case rsx::fog_mode::linear:
OS << " float4 fogc = fog_param1 * In.fogc + (fog_param0 - 1.);\n"; OS << " float4 fogc = float4(fog_param1 * In.fogc + (fog_param0 - 1.), fog_param1 * In.fogc + (fog_param0 - 1.), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential: case rsx::fog_mode::exponential:
OS << " float4 fogc = exp(11.084 * (fog_param1 * In.fogc + fog_param0 - 1.5));\n"; OS << " float4 fogc = float4(11.084 * (fog_param1 * In.fogc + fog_param0 - 1.5), exp(11.084 * (fog_param1 * In.fogc + fog_param0 - 1.5)), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential2: case rsx::fog_mode::exponential2:
OS << " float4 fogc = exp(-pow(4.709 * (fog_param1 * In.fogc + fog_param0 - 1.5)), 2.);\n"; OS << " float4 fogc = float4(4.709 * (fog_param1 * In.fogc + fog_param0 - 1.5), exp(-pow(4.709 * (fog_param1 * In.fogc + fog_param0 - 1.5)), 2.)), 0., 0.);\n";
return; return;
case rsx::fog_mode::linear_abs: case rsx::fog_mode::linear_abs:
OS << " float4 fogc = fog_param1 * abs(In.fogc) + (fog_param0 - 1.);\n"; OS << " float4 fogc = float4(fog_param1 * abs(In.fogc) + (fog_param0 - 1.), fog_param1 * abs(In.fogc) + (fog_param0 - 1.), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential_abs: case rsx::fog_mode::exponential_abs:
OS << " float4 fogc = exp(11.084 * (fog_param1 * abs(In.fogc) + fog_param0 - 1.5));\n"; OS << " float4 fogc = float4(11.084 * (fog_param1 * abs(In.fogc) + fog_param0 - 1.5), exp(11.084 * (fog_param1 * abs(In.fogc) + fog_param0 - 1.5)), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential2_abs: case rsx::fog_mode::exponential2_abs:
OS << " float4 fogc = exp(-pow(4.709 * (fog_param1 * abs(In.fogc) + fog_param0 - 1.5)), 2.);\n"; OS << " float4 fogc = float4(4.709 * (fog_param1 * abs(In.fogc) + fog_param0 - 1.5), exp(-pow(4.709 * (fog_param1 * abs(In.fogc) + fog_param0 - 1.5)), 2.)), 0., 0.);\n";
return; return;
} }
} }

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

@ -122,22 +122,22 @@ namespace
switch (mode) switch (mode)
{ {
case rsx::fog_mode::linear: case rsx::fog_mode::linear:
OS << " vec4 fogc = fog_param1 * fog_c + (fog_param0 - 1.);\n"; OS << " vec4 fogc = vec4(fog_param1 * fog_c.x + (fog_param0 - 1.), fog_param1 * fog_c.x + (fog_param0 - 1.), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential: case rsx::fog_mode::exponential:
OS << " vec4 fogc = exp(11.084 * (fog_param1 * fog_c + fog_param0 - 1.5));\n"; OS << " vec4 fogc = vec4(11.084 * (fog_param1 * fog_c.x + fog_param0 - 1.5), exp(11.084 * (fog_param1 * fog_c.x + fog_param0 - 1.5)), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential2: case rsx::fog_mode::exponential2:
OS << " vec4 fogc = exp(-pow(4.709 * (fog_param1 * fog_c + fog_param0 - 1.5)), 2.);\n"; OS << " vec4 fogc = vec4(4.709 * (fog_param1 * fog_c.x + fog_param0 - 1.5), exp(-pow(4.709 * (fog_param1 * fog_c.x + fog_param0 - 1.5)), 2.), 0., 0.);\n";
return; return;
case rsx::fog_mode::linear_abs: case rsx::fog_mode::linear_abs:
OS << " vec4 fogc = fog_param1 * abs(fog_c) + (fog_param0 - 1.);\n"; OS << " vec4 fogc = vec4(fog_param1 * abs(fog_c.x) + (fog_param0 - 1.), fog_param1 * abs(fog_c.x) + (fog_param0 - 1.), 0., 0.);\n";
return; return;
case rsx::fog_mode::exponential_abs: case rsx::fog_mode::exponential_abs:
OS << " vec4 fogc = exp(11.084 * (fog_param1 * abs(fog_c) + fog_param0 - 1.5));\n"; OS << " vec4 fogc = vec4(11.084 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5), exp(11.084 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5)), 0., 0.);\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(fog_c) + fog_param0 - 1.5)), 2.);\n"; OS << " vec4 fogc = vec4(4.709 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5), exp(-pow(4.709 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5)), 2.), 0., 0.);\n";
return; return;
} }
} }