libretro/glsl-shaders
1
0
Fork 0
mirror of https://github.com/libretro/glsl-shaders.git synced 2024-11-27 01:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update (#290)

Browse Source 
* Update crt-m7.glsl

correct errors, update color spaces

* Update color_profiler.glsl

* Update crt-m7.glsl
This commit is contained in:
metallic77 2023-09-09 03:45:47 +03:00 committed by GitHub
parent 2b7d841d35
commit b28f28d382
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crt/shaders/crt-m7.glsl
View File

@ -11,9 +11,9 @@
// any later version.
#pragma parameter scanline "Scanline Strength" 0.75 0.0 1.0 0.05
#pragma parameter SIZE "Mask Type" 1.0 0.666 1.0 0.3333
#pragma parameter cspace "Color Space: RGB, PAL,SMPTE-C,NTSC-J" 3.0 0.0 3.0 1.0
#pragma parameter scanline "Scanline Strength" 0.8 0.0 1.0 0.05
#pragma parameter SIZE "Mask Type: Coarse/Fine" 1.0 0.666 1.0 0.3333
#pragma parameter cspace "Color Space: RGB, PAL,NTSC-U,NTSC-J" 2.0 0.0 3.0 1.0
#define PI 3.1415926535897932384626433
@ -138,7 +138,6 @@ uniform COMPAT_PRECISION float cspace;
vec2 Warp(vec2 pos)
{
pos *= vec2 (1.0 + pos.y*pos.y*0.0275,
1.0 + pos.x*pos.x*0.045 );
pos = pos * 0.5 +0.5;
@ -152,14 +151,14 @@ const mat3 PAL = mat3(
);
const mat3 SMPTE = mat3(
0.8641, 0.0716, 0.0528,
-0.0248, 0.9911, 0.0298,
0.0074, -0.0321, 1.1125
const mat3 NTSC = mat3(
0.8870, 0.0451, 0.0566,
-0.0800, 1.0368, 0.0361,
0.0053, -0.1196, 1.2320
);
const mat3 NTSC = mat3(
const mat3 NTSC_J = mat3(
0.7203, 0.1344 , 0.1233,
-0.1051, 1.0305, 0.0637,
0.0127 , -0.0743, 1.3545
@ -186,23 +185,24 @@ void main()
vec2 i = floor(p) + 0.5;
vec2 f = p - i;
p = (i + 4.0*f*f*f)*SourceSize.zw;
p.x = mix( p.x , vTexCoord.x, 0.4);
p.y = mix(p.y , i.y*SourceSize.z, 0.2);
vec3 res = COMPAT_TEXTURE(Source,p).rgb;
// crt-Geom-like pixel luminance influence on scanline
float lum = 2.0+dot(vec3(0.666),res);
float wid = 2.0+dot(vec3(0.666),res);
res *= res;
float scan = pow(scanline,lum); // 2 + lum (max 2), more 'lum' leads to less 'scan'.
float scan = pow(scanline,wid); // 2 + wid (max 2), more 'wid' leads to less 'scan'.
if (InputSize.x < 400.0)
res *= 0.4+(scan*sin(pos.y*omega)+1.0-scan)/(0.8+0.15*lum);
res *= 0.4+(0.3*sin(fragpos)+0.7)/(0.8+0.15*lum);
if (InputSize.y < 400.0)
res *= 0.4+(scan*sin(pos.y*omega)+1.0-scan)/(0.8+0.15*wid);
res *= 0.4+(0.4*sin(fragpos)+0.6)/(0.8+0.15*wid);
if (cspace == 1.0) res *= PAL;
if (cspace == 2.0) res *= SMPTE;
if (cspace == 3.0) res *= NTSC;
if (cspace == 2.0) res *= NTSC;
if (cspace == 3.0) res *= NTSC_J;
if (cspace != 0.0) res = clamp(res,0.0,1.0);
// Corners cut
@ -225,7 +225,6 @@ void main()
res = vec3(0.0);
#endif
// Output to screen
FragColor = vec4(res,1.0);
}

35
misc/shaders/color_profiler.glsl
View File

@ -1,12 +1,14 @@
#pragma parameter R "Red Channel" 1.1 0.0 2.0 0.01
#pragma parameter G "Green Channel" 1.05 0.0 2.0 0.01
#pragma parameter B "Blue Channel" 1.2 0.0 2.0 0.01
#pragma parameter gamma "Gamma" 0.9 0.0 2.0 0.01
#pragma parameter sat "Saturation" 0.83 0.0 2.0 0.01
#pragma parameter bright "Brightness" 1.06 0.0 2.0 0.01
#pragma parameter BLACK "Black Level" 0.06 -0.20 0.20 0.01
#pragma parameter R "Red Channel" 1.0 0.0 2.0 0.01
#pragma parameter G "Green Channel" 1.0 0.0 2.0 0.01
#pragma parameter B "Blue Channel" 1.0 0.0 2.0 0.01
#pragma parameter gamma "Gamma" 1.0 0.0 2.0 0.01
#pragma parameter sat "Saturation" 1.0 0.0 2.0 0.01
#pragma parameter bright "Brightness" 1.0 0.0 2.0 0.01
#pragma parameter BLACK "Black Level" 0.0 -0.20 0.20 0.01
#pragma parameter RG "Red <-> Green Hue" 0.0 -0.25 0.25 0.01
#pragma parameter RB "Red <-> Blue Hue" 0.0 -0.25 0.25 0.01
#pragma parameter GB "Green <-> Blue Hue" 0.0 -0.25 0.25 0.01
#define pi 3.14159
@ -62,7 +64,9 @@ uniform COMPAT_PRECISION float gamma;
uniform COMPAT_PRECISION float sat;
uniform COMPAT_PRECISION float bright;
uniform COMPAT_PRECISION float BLACK;
uniform COMPAT_PRECISION float RG;
uniform COMPAT_PRECISION float RB;
uniform COMPAT_PRECISION float GB;
#else
#define R 1.0
#define G 1.0
@ -72,11 +76,19 @@ uniform COMPAT_PRECISION float BLACK;
#define BLACK 0.0
#define bright 1.0
#define sat 1.0
#define RG 0.0
#define RB 0.0
#define GB 0.0
#endif
void main()
{
mat3 hue = mat3(
1.0, -RG, -RB,
RG, 1.0, -GB,
RB, GB, 1.0
);
vec3 res = texture2D(Source, vTexCoord).rgb;
res *= bright;
res = pow(res,vec3(gamma));
@ -85,8 +97,9 @@ void main()
float l = dot(lumweight, res);
vec3 grays = vec3(l);
res = mix(grays,res,sat);
res *= hue;
res -= vec3(BLACK);
res *= vec3(1.0)/vec3(1.0-BLACK);
res *= vec3(1.0)/vec3(1.0-BLACK);
FragColor = vec4(res, 1.0);
}
#endif