alex/slang-shaders
1
0
Fork 0
mirror of https://github.com/italicsjenga/slang-shaders.git synced 2024-11-23 00:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

fix darken in interlace, interlace off works again (#391)

Browse source 
* improvements/additions

* improvements/additions

* add prescale sharpening

* add prescale sharpening

* fix darken in interlace, interlace off works again
This commit is contained in:
metallic77 2023-04-17 23:41:23 +03:00 committed by GitHub
parent f4d1d7ce55
commit 06266c3d61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crt/shaders/crt-consumer.slang
View file

@ -14,7 +14,7 @@ layout(push_constant) uniform Push
#pragma parameter warpx "Curvature X" 0.02 0.0 0.12 0.01 #pragma parameter warpx "Curvature X" 0.02 0.0 0.12 0.01
#pragma parameter warpy "Curvature Y" 0.04 0.0 0.12 0.01 #pragma parameter warpy "Curvature Y" 0.04 0.0 0.12 0.01
#pragma parameter corner "Corner size" 0.01 0.0 0.10 0.01 #pragma parameter corner "Corner size" 0.01 0.0 0.10 0.01
#pragma parameter smoothness "Border Smoothness" 200.0 25.0 600.0 5.0 #pragma parameter smoothness "Border Smoothness" 400.0 100.0 600.0 5.0
#pragma parameter scanlow "Beam low" 6.0 1.0 15.0 1.0 #pragma parameter scanlow "Beam low" 6.0 1.0 15.0 1.0
#pragma parameter scanhigh "Beam high" 8.0 1.0 15.0 1.0 #pragma parameter scanhigh "Beam high" 8.0 1.0 15.0 1.0
#pragma parameter beamlow "Scanlines dark" 1.45.5 2.5 0.05 #pragma parameter beamlow "Scanlines dark" 1.45.5 2.5 0.05
@ -400,11 +400,14 @@ void main()
{ {
vec2 pos = Warp(vTexCoord.xy); vec2 pos = Warp(vTexCoord.xy);
vec2 tex_size = params.SourceSize.xy; vec2 tex_size = params.SourceSize.xy;
if (global.inter < 0.5 && params.SourceSize.y > 400.0) tex_size *= 0.5;
vec2 pC4 = (pos + 0.5/params.SourceSize.xy); vec2 pC4 = (pos + 0.5/tex_size);
vec2 fp = fract(pos * params.SourceSize.xy); vec2 fp = fract(pos * tex_size);
if (global.inter > 0.5 && params.SourceSize.y > 400.0) fp.y = 1.0;
if (global.inter < 0.5 && tex_size.y > 400.0){ fp = fract(pos * tex_size/2.0);}
if (global.inter > 0.5 && tex_size.y > 400.0) fp.y = 0.5;
vec4 res = vec4(1.0, 1.0, 1.0, 1.0); vec4 res = vec4(1.0, 1.0, 1.0, 1.0);
if (global.alloff == 1.0) if (global.alloff == 1.0)
@ -422,10 +425,12 @@ void main()
// Uses the hardware bilinear interpolator to avoid having to sample 4 times manually. // Uses the hardware bilinear interpolator to avoid having to sample 4 times manually.
vec2 center_dist = fp - 0.5; vec2 center_dist = fp - 0.5;
vec2 fpp = (center_dist - clamp(center_dist, -region_range, region_range)) * scale + 0.5; vec2 fpp = (center_dist - clamp(center_dist, -region_range, region_range)) * scale + 0.5;
vec2 mod_texel = texel_floored + fpp; vec2 mod_texel = texel_floored + fpp;
vec2 coords = mod_texel / params.SourceSize.xy; vec2 coords = mod_texel / params.SourceSize.xy;
vec3 sample1 = texture(Source, vec2(coords.x + global.blurx*params.SourceSize.z, coords.y - global.blury*params.SourceSize.w)).rgb; vec3 sample1 = texture(Source, vec2(coords.x + global.blurx*params.SourceSize.z, coords.y - global.blury*params.SourceSize.w)).rgb;
vec3 sample2 = texture(Source, coords).rgb; vec3 sample2 = texture(Source, coords).rgb;
vec3 sample3 = texture(Source, vec2(coords.x - global.blurx*params.SourceSize.z, coords.y + global.blury*params.SourceSize.w )).rgb; vec3 sample3 = texture(Source, vec2(coords.x - global.blurx*params.SourceSize.z, coords.y + global.blury*params.SourceSize.w )).rgb;
@ -466,10 +471,10 @@ void main()
color = pow(color,vec3(1.0 / global.GAMMA_OUT)); color = pow(color,vec3(1.0 / global.GAMMA_OUT));
if (global.glow != 0.0) color += glow0(pC4,color); if (global.glow != 0.0) color += glow0(coords,color);
if (global.sat != 1.0) color = saturation(color); if (global.sat != 1.0) color = saturation(color);
if (global.corner != 0.0) color *= corner0(pC4); if (global.corner != 0.0) color *= corner0(pC4);
if (global.nois != 0.0) color *= 1.0 + noise(pC4 * 2.0) / global.nois; if (global.nois != 0.0) color *= 1.0 + noise(coords * 2.0) / global.nois;
color*=mix(1.0,global.postbr,lum); color*=mix(1.0,global.postbr,lum);
res = vec4(color, 1.0); res = vec4(color, 1.0);
if (global.contrast != 1.0) res = contrastMatrix(global.contrast) * res; if (global.contrast != 1.0) res = contrastMatrix(global.contrast) * res;