mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-26 02:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Formatting and tidying changes

Browse Source
This commit is contained in:
kd-11 2023-07-01 01:45:46 +03:00 committed by kd-11
parent 1d004f2788
commit fac8bcc20c
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl
View File

@ -50,7 +50,7 @@ vec4 fetch_fog_value(const in uint mode)
// exponential2_abs // exponential2_abs
result.y = exp(-pow(4.709 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5), 2.)); result.y = exp(-pow(4.709 * (fog_param1 * abs(fog_c.x) + fog_param0 - 1.5), 2.));
break; break;
case FOG_LINEAR_ABS: case FOG_LINEAR_ABS:
// linear_abs // linear_abs
result.y = fog_param1 * abs(fog_c.x) + (fog_param0 - 1.); result.y = fog_param1 * abs(fog_c.x) + (fog_param0 - 1.);
break; break;
@ -65,8 +65,8 @@ vec4 fetch_fog_value(const in uint mode)
// Purely stochastic // Purely stochastic
bool coverage_test_passes(const in vec4 _sample) bool coverage_test_passes(const in vec4 _sample)
{ {
float random = _rand(gl_FragCoord); float random_val = _rand(gl_FragCoord);
return (_sample.a > random); return (_sample.a > random_val);
} }
#endif #endif

11
rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl
View File

@ -55,7 +55,7 @@ uint gen_bits(const in uint x, const in uint y, const in uint z, const in uint w
uint gen_bits(const in uint x, const in uint y, const in bool swap) uint gen_bits(const in uint x, const in uint y, const in bool swap)
{ {
return (swap)? _set_bits(y, x, 8, 8) : _set_bits(x, y, 8, 8); return (swap) ? _set_bits(y, x, 8, 8) : _set_bits(x, y, 8, 8);
} }
// NOTE: (int(n) or int(n)) is broken on some NVIDIA and INTEL hardware when the sign bit is involved. // NOTE: (int(n) or int(n)) is broken on some NVIDIA and INTEL hardware when the sign bit is involved.
@ -159,8 +159,8 @@ attribute_desc fetch_desc(const in int location)
uvec2 attrib = texelFetch(vertex_layout_stream, location + int(layout_ptr_offset)).xy; uvec2 attrib = texelFetch(vertex_layout_stream, location + int(layout_ptr_offset)).xy;
#else #else
// Data is packed into a ubo // Data is packed into a ubo
int block = (location >> 1); const int block = (location >> 1);
int sub_block = (location & 1) << 1; const int sub_block = (location & 1) << 1;
uvec2 attrib = uvec2( uvec2 attrib = uvec2(
ref(input_attributes_blob[block], sub_block + 0), ref(input_attributes_blob[block], sub_block + 0),
ref(input_attributes_blob[block], sub_block + 1)); ref(input_attributes_blob[block], sub_block + 1));
@ -180,8 +180,9 @@ attribute_desc fetch_desc(const in int location)
vec4 read_location(const in int location) vec4 read_location(const in int location)
{ {
int vertex_id;
attribute_desc desc = fetch_desc(location); attribute_desc desc = fetch_desc(location);
int vertex_id = _gl_VertexID - int(vertex_base_index);
if (desc.frequency == 0) if (desc.frequency == 0)
{ {
vertex_id = 0; vertex_id = 0;
@ -193,7 +194,7 @@ vec4 read_location(const in int location)
} }
else else
{ {
vertex_id /= int(desc.frequency); vertex_id = (_gl_VertexID - int(vertex_base_index)) / int(desc.frequency);
} }
if (desc.is_volatile) if (desc.is_volatile)

2
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -2328,7 +2328,7 @@ namespace rsx
// Subpixel offset so that (X + bias) * scale will round correctly. // Subpixel offset so that (X + bias) * scale will round correctly.
// This is done to work around fdiv precision issues in some GPUs (NVIDIA) // This is done to work around fdiv precision issues in some GPUs (NVIDIA)
// We apply the simplification where (x + bias) * z = xz + zbias here. // We apply the simplification where (x + bias) * z = xz + zbias here.
const auto subpixel_bias = 0.01f; constexpr auto subpixel_bias = 0.01f;
current_fragment_program.texture_params[i].bias[0] += (subpixel_bias * current_fragment_program.texture_params[i].scale[0]); current_fragment_program.texture_params[i].bias[0] += (subpixel_bias * current_fragment_program.texture_params[i].scale[0]);
current_fragment_program.texture_params[i].bias[1] += (subpixel_bias * current_fragment_program.texture_params[i].scale[1]); current_fragment_program.texture_params[i].bias[1] += (subpixel_bias * current_fragment_program.texture_params[i].scale[1]);
current_fragment_program.texture_params[i].bias[2] += (subpixel_bias * current_fragment_program.texture_params[i].scale[2]); current_fragment_program.texture_params[i].bias[2] += (subpixel_bias * current_fragment_program.texture_params[i].scale[2]);