libretro/slang-shaders
1
0
Fork 0
mirror of https://github.com/libretro/slang-shaders.git synced 2024-12-04 07:11:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix color clipping in crt-hyllian (#624)

Browse Source 
- Fiz color clipping.
This commit is contained in:
Hyllian 2024-08-17 14:10:34 -03:00 committed by GitHub
parent b6b55c3995
commit ef702029d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crt/shaders/hyllian/crt-hyllian-base.slang
View File

@ -35,7 +35,6 @@ layout(push_constant) uniform Push
float BEAM_MAX_WIDTH; float BEAM_MAX_WIDTH;
float SCANLINES_STRENGTH; float SCANLINES_STRENGTH;
float SCANLINES_SHAPE; float SCANLINES_SHAPE;
float BRIGHTBOOST;
float SHARPNESS_HACK; float SHARPNESS_HACK;
float SCANLINES_CUTOFF; float SCANLINES_CUTOFF;
float SCANLINES_HIRES; float SCANLINES_HIRES;
@ -60,7 +59,7 @@ layout(std140, set = 0, binding = 0) uniform UBO
#pragma parameter SCANLINES_SHAPE " SCANLINES SHAPE [ Sharp | Soft ]" 1.0 0.0 1.0 1.0 #pragma parameter SCANLINES_SHAPE " SCANLINES SHAPE [ Sharp | Soft ]" 1.0 0.0 1.0 1.0
#pragma parameter PHOSPHOR_LAYOUT " MASK [1..6 Aperture, 7..10 Shadow, 11..14 Slot]" 1.0 0.0 15.0 1.0 #pragma parameter PHOSPHOR_LAYOUT " MASK [1..6 Aperture, 7..10 Shadow, 11..14 Slot]" 1.0 0.0 15.0 1.0
#pragma parameter MASK_STRENGTH " MASK STRENGTH" 0.0 0.0 1.0 0.02 #pragma parameter MASK_STRENGTH " MASK STRENGTH" 0.0 0.0 1.0 0.02
#pragma parameter BRIGHTBOOST "BRIGHTBOOST" 1.0 1.0 2.0 0.01 #pragma parameter BRIGHTBOOST "BRIGHTBOOST" 1.0 0.5 2.0 0.01
#pragma parameter MONITOR_SUBPIXELS "MONITOR SUBPIXELS LAYOUT [ RGB | BGR ]" 0.0 0.0 1.0 1.0 #pragma parameter MONITOR_SUBPIXELS "MONITOR SUBPIXELS LAYOUT [ RGB | BGR ]" 0.0 0.0 1.0 1.0
#pragma parameter SCANLINES_CUTOFF "SCANLINES CUTOFF" 400.0 0.0 1000.0 2.0 #pragma parameter SCANLINES_CUTOFF "SCANLINES CUTOFF" 400.0 0.0 1000.0 2.0
#pragma parameter SCANLINES_HIRES "HIGH RESOLUTION SCANLINES" 0.0 0.0 1.0 1.0 #pragma parameter SCANLINES_HIRES "HIGH RESOLUTION SCANLINES" 0.0 0.0 1.0 1.0
@ -70,7 +69,6 @@ layout(std140, set = 0, binding = 0) uniform UBO
#pragma parameter CRT_ANTI_RINGING "ANTI RINGING" 1.0 0.0 1.0 1.0 #pragma parameter CRT_ANTI_RINGING "ANTI RINGING" 1.0 0.0 1.0 1.0
#define CRT_ANTI_RINGING params.CRT_ANTI_RINGING #define CRT_ANTI_RINGING params.CRT_ANTI_RINGING
#define BRIGHTBOOST params.BRIGHTBOOST
#define SHARPNESS_HACK params.SHARPNESS_HACK #define SHARPNESS_HACK params.SHARPNESS_HACK
#define SCANLINES_SHAPE params.SCANLINES_SHAPE #define SCANLINES_SHAPE params.SCANLINES_SHAPE
#define SCANLINES_STRENGTH (-0.16*SCANLINES_SHAPE+params.SCANLINES_STRENGTH) #define SCANLINES_STRENGTH (-0.16*SCANLINES_SHAPE+params.SCANLINES_STRENGTH)
@ -239,8 +237,6 @@ void main()
vec3 d1 = scanlines_strength*pos1/(lum1*lum1+0.0000001); vec3 d1 = scanlines_strength*pos1/(lum1*lum1+0.0000001);
vec3 color = (draw_scanlines > 0.5) ? get_scanlines(d0, d1, color0, color1, scanlines_shape) : texture(Source, vTexCoord).xyz; vec3 color = (draw_scanlines > 0.5) ? get_scanlines(d0, d1, color0, color1, scanlines_shape) : texture(Source, vTexCoord).xyz;
color *= BRIGHTBOOST;
FragColor = vec4(color, 1.0); FragColor = vec4(color, 1.0);
} }

6
crt/shaders/hyllian/support/glow/blur-glow-mask-geom.slang
View File

@ -9,6 +9,7 @@ layout(push_constant) uniform Push
float DISPLAY_RES; float DISPLAY_RES;
float PHOSPHOR_LAYOUT; float PHOSPHOR_LAYOUT;
float MASK_STRENGTH; float MASK_STRENGTH;
float BRIGHTBOOST;
float MONITOR_SUBPIXELS; float MONITOR_SUBPIXELS;
float VSCANLINES; float VSCANLINES;
float H_OUTPUT_GAMMA; float H_OUTPUT_GAMMA;
@ -45,6 +46,7 @@ layout(std140, set = 0, binding = 0) uniform UBO
#pragma parameter PRESET_OPTION "PRESET [0=Custom, Aperture1, Aperture2, Slot1, Slot2, Shadow]" 0.0 0.0 5.0 1.0 #pragma parameter PRESET_OPTION "PRESET [0=Custom, Aperture1, Aperture2, Slot1, Slot2, Shadow]" 0.0 0.0 5.0 1.0
#pragma parameter PHOSPHOR_LAYOUT " MASK [1..6 Aperture, 7..10 Shadow, 11..14 Slot]" 1.0 0.0 15.0 1.0 #pragma parameter PHOSPHOR_LAYOUT " MASK [1..6 Aperture, 7..10 Shadow, 11..14 Slot]" 1.0 0.0 15.0 1.0
#pragma parameter MASK_STRENGTH " MASK STRENGTH" 0.0 0.0 1.0 0.02 #pragma parameter MASK_STRENGTH " MASK STRENGTH" 0.0 0.0 1.0 0.02
#pragma parameter BRIGHTBOOST "BRIGHTBOOST" 1.0 0.5 2.0 0.01
#pragma parameter MONITOR_SUBPIXELS "MONITOR SUBPIXELS LAYOUT [ RGB | BGR ]" 0.0 0.0 1.0 1.0 #pragma parameter MONITOR_SUBPIXELS "MONITOR SUBPIXELS LAYOUT [ RGB | BGR ]" 0.0 0.0 1.0 1.0
#pragma parameter VSCANLINES "VERTICAL SCANLINES [ Off | On ]" 0.0 0.0 1.0 1.0 #pragma parameter VSCANLINES "VERTICAL SCANLINES [ Off | On ]" 0.0 0.0 1.0 1.0
@ -61,7 +63,7 @@ layout(std140, set = 0, binding = 0) uniform UBO
#pragma parameter geom_overscan_x "Geom Horiz. Overscan %" 100.0 -125.0 125.0 0.5 #pragma parameter geom_overscan_x "Geom Horiz. Overscan %" 100.0 -125.0 125.0 0.5
#pragma parameter geom_overscan_y "Geom Vert. Overscan %" 100.0 -125.0 125.0 0.5 #pragma parameter geom_overscan_y "Geom Vert. Overscan %" 100.0 -125.0 125.0 0.5
#define BRIGHTBOOST params.BRIGHTBOOST
#define DISPLAY_RES params.DISPLAY_RES #define DISPLAY_RES params.DISPLAY_RES
#define GLOW_ENABLE params.GLOW_ENABLE #define GLOW_ENABLE params.GLOW_ENABLE
#define GLOW_RADIUS params.GLOW_RADIUS #define GLOW_RADIUS params.GLOW_RADIUS
@ -552,7 +554,7 @@ void main()
mask_wgts = (MONITOR_SUBPIXELS > 0.5) ? mask_wgts.bgr : mask_wgts; mask_wgts = (MONITOR_SUBPIXELS > 0.5) ? mask_wgts.bgr : mask_wgts;
// CRT + Bloom + Mask + Curvature // CRT + Bloom + Mask + Curvature
vec3 crt = texture(CRTPass, uv).rgb; vec3 crt = BRIGHTBOOST * texture(CRTPass, uv).rgb;
crt += GLOW_STRENGTH * bloom; crt += GLOW_STRENGTH * bloom;