mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 22:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk/gl: cleanup formatting in glsl, move some common magic numbers to variables

Browse Source
This commit is contained in:
Megamouse 2024-01-31 01:09:10 +01:00
parent 32f2b14429
commit 7d9460a560
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl
View File

@ -22,10 +22,12 @@ layout(location=0) out vec4 ocol;
#define STEREO_MODE_ANAGLYPH_MAGENTA_CYAN 7 #define STEREO_MODE_ANAGLYPH_MAGENTA_CYAN 7
#define STEREO_MODE_ANAGLYPH_TRIOSCOPIC 8 #define STEREO_MODE_ANAGLYPH_TRIOSCOPIC 8
vec2 sbs_single_matrix = vec2(2.0, 0.4898f); vec2 left_single_matrix = vec2(1.f, 0.4898f);
vec2 sbs_multi_matrix = vec2(2.0, 1.0); vec2 right_single_matrix = vec2(0.f, 0.510204f);
vec2 ou_single_matrix = vec2(1.0, 0.9796f); vec2 sbs_single_matrix = vec2(2.0, 0.4898f);
vec2 ou_multi_matrix = vec2(1.0, 2.0); vec2 sbs_multi_matrix = vec2(2.0, 1.0);
vec2 ou_single_matrix = vec2(1.0, 0.9796f);
vec2 ou_multi_matrix = vec2(1.0, 2.0);
#ifdef VULKAN #ifdef VULKAN
layout(push_constant) uniform static_data layout(push_constant) uniform static_data
@ -54,36 +56,39 @@ vec4 read_source()
switch (stereo_display_mode) switch (stereo_display_mode)
{ {
case STEREO_MODE_ANAGLYPH_RED_GREEN: case STEREO_MODE_ANAGLYPH_RED_GREEN:
left = texture(fs0, tc0 * vec2(1.f, 0.4898f)); left = texture(fs0, tc0 * left_single_matrix);
right = texture(fs0, (tc0 * vec2(1.f, 0.4898f)) + vec2(0.f, 0.510204f)); right = texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
return vec4(left.r, right.g, 0.f, 1.f); return vec4(left.r, right.g, 0.f, 1.f);
case STEREO_MODE_ANAGLYPH_RED_BLUE: case STEREO_MODE_ANAGLYPH_RED_BLUE:
left = texture(fs0, tc0 * vec2(1.f, 0.4898f)); left = texture(fs0, tc0 * left_single_matrix);
right = texture(fs0, (tc0 * vec2(1.f, 0.4898f)) + vec2(0.f, 0.510204f)); right = texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
return vec4(left.r, 0.f, right.b, 1.f); return vec4(left.r, 0.f, right.b, 1.f);
case STEREO_MODE_ANAGLYPH_RED_CYAN: case STEREO_MODE_ANAGLYPH_RED_CYAN:
left = texture(fs0, tc0 * vec2(1.f, 0.4898f)); left = texture(fs0, tc0 * left_single_matrix);
right = texture(fs0, (tc0 * vec2(1.f, 0.4898f)) + vec2(0.f, 0.510204f)); right = texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
return vec4(left.r, right.g, right.b, 1.f); return vec4(left.r, right.g, right.b, 1.f);
case STEREO_MODE_ANAGLYPH_MAGENTA_CYAN: case STEREO_MODE_ANAGLYPH_MAGENTA_CYAN:
left = texture(fs0, tc0 * vec2(1.f, 0.4898f)); left = texture(fs0, tc0 * left_single_matrix);
right = texture(fs0, (tc0 * vec2(1.f, 0.4898f)) + vec2(0.f, 0.510204f)); right = texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
return vec4(left.r, right.g, (left.b + right.b) / 2.f, 1.f); return vec4(left.r, right.g, (left.b + right.b) / 2.f, 1.f);
case STEREO_MODE_ANAGLYPH_TRIOSCOPIC: case STEREO_MODE_ANAGLYPH_TRIOSCOPIC:
left = texture(fs0, tc0 * vec2(1.f, 0.4898f)); left = texture(fs0, tc0 * left_single_matrix);
right = texture(fs0, (tc0 * vec2(1.f, 0.4898f)) + vec2(0.f, 0.510204f)); right = texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
return vec4(right.r, left.g, right.b, 1.f); return vec4(right.r, left.g, right.b, 1.f);
case STEREO_MODE_SIDE_BY_SIDE: case STEREO_MODE_SIDE_BY_SIDE:
if (tc0.x < 0.5) return texture(fs0, tc0* sbs_single_matrix); return (tc0.x < 0.5)
else return texture(fs0, (tc0* sbs_single_matrix) + vec2(-1.f, 0.510204f)); ? texture(fs0, tc0 * sbs_single_matrix)
: texture(fs0, (tc0 * sbs_single_matrix) + vec2(-1.f, 0.510204f));
case STEREO_MODE_OVER_UNDER: case STEREO_MODE_OVER_UNDER:
if (tc0.y < 0.5) return texture(fs0, tc0* ou_single_matrix); return (tc0.y < 0.5)
else return texture(fs0, (tc0* ou_single_matrix) + vec2(0.f, 0.020408f) ); ? texture(fs0, tc0 * ou_single_matrix)
: texture(fs0, (tc0 * ou_single_matrix) + vec2(0.f, 0.020408f));
case STEREO_MODE_INTERLACED: case STEREO_MODE_INTERLACED:
if (mod(height * tc0.y, 2.f) < 1.f) return texture(fs0, tc0 * vec2(1.f, 0.4898f)); return (mod(height * tc0.y, 2.f) < 1.f)
else return texture(fs0, (tc0 * vec2(1.f, 0.4898f)) + vec2(0.f, 0.510204f)); ? texture(fs0, tc0 * left_single_matrix)
: texture(fs0, (tc0 * left_single_matrix) + right_single_matrix);
default: // undefined behavior default: // undefined behavior
return texture(fs0,tc0); return texture(fs0, tc0);
} }
} }
else if (stereo_image_count == 2) else if (stereo_image_count == 2)
@ -111,22 +116,25 @@ vec4 read_source()
right = texture(fs1, tc0); right = texture(fs1, tc0);
return vec4(right.r, left.g, right.b, 1.f); return vec4(right.r, left.g, right.b, 1.f);
case STEREO_MODE_SIDE_BY_SIDE: case STEREO_MODE_SIDE_BY_SIDE:
if (tc0.x < 0.5) return texture(fs0,(tc0 * sbs_multi_matrix)); return (tc0.x < 0.5)
else return texture(fs1,(tc0 * sbs_multi_matrix) + vec2(-1.f,0.f)); ? texture(fs0, (tc0 * sbs_multi_matrix))
: texture(fs1, (tc0 * sbs_multi_matrix) + vec2(-1.f, 0.f));
case STEREO_MODE_OVER_UNDER: case STEREO_MODE_OVER_UNDER:
if (tc0.y < 0.5) return texture(fs0,(tc0 * ou_multi_matrix)); return (tc0.y < 0.5)
else return texture(fs1,(tc0 * ou_multi_matrix) + vec2(0.f,-1.f)); ? texture(fs0, (tc0 * ou_multi_matrix))
: texture(fs1, (tc0 * ou_multi_matrix) + vec2(0.f, -1.f));
case STEREO_MODE_INTERLACED: case STEREO_MODE_INTERLACED:
if (mod(height * tc0.y, 2.f) < 1.f) return texture(fs0, tc0); return (mod(height * tc0.y, 2.f) < 1.f)
else return texture(fs1, tc0); ? texture(fs0, tc0)
: texture(fs1, tc0);
default: // undefined behavior default: // undefined behavior
return texture(fs0,tc0); return texture(fs0, tc0);
} }
} }
else else
{ {
vec2 coord_left = tc0 * vec2(1.f, 0.4898f); vec2 coord_left = tc0 * left_single_matrix;
vec2 coord_right = coord_left + vec2(0.f, 0.510204f); vec2 coord_right = coord_left + right_single_matrix;
left = texture(fs0, coord_left); left = texture(fs0, coord_left);
right = texture(fs0, coord_right); right = texture(fs0, coord_right);
return vec4(left.r, right.g, right.b, 1.); return vec4(left.r, right.g, right.b, 1.);