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

switch geom-deluxe to use generated subpixel masks instead of LUTs

Browse source
This commit is contained in:
hunterk 2020-01-25 13:24:52 -06:00
parent 02c53d6605
commit b38342095a
3 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crt/crt-geom-deluxe.slangp
View file

@ -17,13 +17,14 @@ alias3 = blur
shader4 = shaders/geom-deluxe/crt-geom-deluxe.slang shader4 = shaders/geom-deluxe/crt-geom-deluxe.slang
filter_linear4 = true filter_linear4 = true
textures = "aperture;slot;delta" # comment these mask textures since we're generating them in the shader
delta = shaders/geom-deluxe/masks/delta_2_4x1_rgb.png #textures = "aperture;slot;delta"
delta_filter_linear = true #delta = shaders/geom-deluxe/masks/delta_2_4x1_rgb.png
delta_repeat_mode = repeat #delta_filter_linear = true
slot = shaders/geom-deluxe/masks/slot_2_5x4_bgr.png #delta_repeat_mode = repeat
slot_filter_linear = true #slot = shaders/geom-deluxe/masks/slot_2_5x4_bgr.png
slot_repeat_mode = repeat #slot_filter_linear = true
aperture = shaders/geom-deluxe/masks/aperture_2_4_rgb.png #slot_repeat_mode = repeat
aperture_filter_linear = true #aperture = shaders/geom-deluxe/masks/aperture_2_4_rgb.png
aperture_repeat_mode = repeat #aperture_filter_linear = true
#aperture_repeat_mode = repeat

24
crt/shaders/geom-deluxe/crt-geom-deluxe.slang
View file

@ -12,6 +12,8 @@
#include "geom-deluxe-params.inc" #include "geom-deluxe-params.inc"
#include "../../../include/subpixel_masks.h"
#define u_tex_size0 global.SourceSize #define u_tex_size0 global.SourceSize
#define u_tex_size1 global.internal1Size #define u_tex_size1 global.internal1Size
#define u_quad_dims global.OutputSize #define u_quad_dims global.OutputSize
@ -117,9 +119,10 @@ layout(location = 4) in vec2 v_one;
layout(location = 0) out vec4 FragColor; layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 2) uniform sampler2D blur; layout(set = 0, binding = 2) uniform sampler2D blur;
layout(set = 0, binding = 3) uniform sampler2D internal1; layout(set = 0, binding = 3) uniform sampler2D internal1;
layout(set = 0, binding = 4) uniform sampler2D aperture; // comment these out, as we're using generated masks instead of LUTs
layout(set = 0, binding = 5) uniform sampler2D slot; //layout(set = 0, binding = 4) uniform sampler2D aperture;
layout(set = 0, binding = 6) uniform sampler2D delta; //layout(set = 0, binding = 5) uniform sampler2D slot;
//layout(set = 0, binding = 6) uniform sampler2D delta;
#define blur_texture blur #define blur_texture blur
@ -301,23 +304,10 @@ void main()
// original code; just makes a giant phosphor here // original code; just makes a giant phosphor here
// xy = v_texCoord.xy * u_quad_dims.xy / u_tex_size1.xy; // xy = v_texCoord.xy * u_quad_dims.xy / u_tex_size1.xy;
// tiling; looks nasty at non-integer x and/or y
// xy = fract(v_texCoord * global.SourceSize.xy * 1.9999);
// gl_FragCoord; tied to physical pixel size // gl_FragCoord; tied to physical pixel size
xy = v_texCoord.xy * global.OutputSize.xy; xy = v_texCoord.xy * global.OutputSize.xy;
//vec3 mask = texture(mask_texture, xy).rgb; vec3 mask = mask_weights(xy, aperture_strength.x, mask_picker);
vec3 mask = vec3(1.0);
if(mask_picker == 0) // no mask
{
FragColor = vec4(mul_res, col.a);
return;
}
else if(mask_picker == 1) mask = texture(aperture, xy * 0.3333).rgb;
else if(mask_picker == 2) mask = texture(slot, xy * 0.25).rgb;
else mask = texture(delta, xy * 0.49999).rgb;
mask = mix(vec3(1.0), mask, aperture_strength.x);
FragColor = vec4(mul_res*mask, col.a); FragColor = vec4(mul_res*mask, col.a);
} }

2
crt/shaders/geom-deluxe/geom-deluxe-params.inc
View file

@ -16,7 +16,7 @@ layout(std140, set = 0, binding = 0) uniform UBO
mat4 MVP; mat4 MVP;
} global; } global;
#pragma parameter mask_type "Mask (none, aperture, slot, delta)" 1.0 0.0 3.0 1.0 #pragma parameter mask_type "Mask (aperture, delta, slot)" 1.0 1.0 19.0 1.0
#pragma parameter aperture_strength "Shadow mask strength" 0.4 0.0 1.0 0.05 #pragma parameter aperture_strength "Shadow mask strength" 0.4 0.0 1.0 0.05
#pragma parameter phosphor_power "Phosphor decay power" 1.2 0.5 3.0 0.05 #pragma parameter phosphor_power "Phosphor decay power" 1.2 0.5 3.0 0.05
#pragma parameter phosphor_amplitude "Phosphor persistence amplitude" 0.04 0.0 0.2 0.01 #pragma parameter phosphor_amplitude "Phosphor persistence amplitude" 0.04 0.0 0.2 0.01