Make a bunch of implicit scaling settings explicit (#375)

* make a bunch of implicit scaling rules explicit and move color shaders before scaling shaders in the handheld directory

* remove extraneous file

* switch vhs from viewport to source scaling

anti-aliasing/aa-shader-4.0-level2.slangp

@@ -12,3 +12,4 @@ scale1 = 2.0
 
 shader2 = ../sharpen/shaders/adaptive-sharpen.slang
 filter_linear2 = false
+scale_type2 = viewport

anti-aliasing/advanced-aa.slangp

@@ -14,3 +14,4 @@ scale1 = 1.0
 
 shader2 = ../cubic/shaders/bicubic-y.slang
 filter_linear2 = false
+scale_type2 = viewport

anti-aliasing/fxaa.slangp

@@ -2,5 +2,4 @@ shaders = 1
 
 shader0 = shaders/fxaa.slang
 filter_linear0 = true
-scale_type0 = source
-scale0 = 1.0
+scale_type0 = viewport

anti-aliasing/reverse-aa.slangp

@@ -1,7 +1,10 @@
-shaders = 1
+shaders = 2
 
 shader0 = shaders/reverse-aa.slang
 filter_linear0 = false
 scale_type0 = source
 scale0 = 2.0
 
+shader1 = ../cubic/shaders/bicubic.slang
+filter_linear1 = false
+scale_type1 = viewport

anti-aliasing/smaa+linear.slangp

@@ -27,6 +27,7 @@ searchTex = shaders/smaa/SearchTex.png
 
 shader4 = ../stock.slang
 filter_linear4 = true
+scale_type4 = viewport
 
 parameters = "SMAA_EDT"
 SMAA_EDT = 0.0

anti-aliasing/smaa+sharpen.slangp

@@ -18,7 +18,7 @@ scale2 = 1.0
 
 shader3 = shaders/smaa/smaa-pass2.slang
 filter_linear3 = true
-scale_type3 = source
+scale_type3 = viewport
 scale3 = 1.0
 
 textures = "areaTex;searchTex"

anti-aliasing/smaa.slangp

@@ -18,7 +18,7 @@ scale2 = 1.0
 
 shader3 = shaders/smaa/smaa-pass2.slang
 filter_linear3 = true
-scale_type3 = source
+scale_type3 = viewport
 scale3 = 1.0
 
 textures = "areaTex;searchTex"

border/ambient-glow.slangp

@@ -6,6 +6,7 @@ filter_linear0 = true
 shader1 = shaders/ambient-glow.slang
 filter_linear1 = true
 mipmap_input1 = true
+scale_type1 = viewport
 
 parameters = "mixfactor;aspect_x;integer_scale;OS_MASK_TOP;OS_MASK_BOTTOM"
-mixfactor = 0.95
+mixfactor = 0.95

border/bigblur.slangp

@@ -42,3 +42,4 @@ filter_linear7 = true
 
 shader8 = shaders/bigblur.slang
 filter_linear8 = true
+scale_type8 = viewport

border/imgborder.slangp

@@ -1,9 +1,10 @@
 shaders = 1
 
 shader0 = shaders/imgborder.slang
+scale_type0 = viewport
 
 textures = BORDER
 BORDER = textures/pvm.png
 
 parameters = border_on_top
-border_on_top = 0.0
+border_on_top = 0.0

crt/GritsScanlines.slangp

@@ -8,11 +8,12 @@ scale_y0 = 4.0
 
 shader1 = ../stock.slang
 filter_linear1 = true
+scale_type1 = viewport
 
 textures = "scanlines_LUT;color_LUT;luminance_LUT"
 scanlines_LUT = shaders/GritsScanlines/Scanline-LUT-4px.png
 scanlines_LUT_linear = false
 color_LUT = shaders/GritsScanlines/trinitron_color.png
 color_LUT_linear = true
 luminance_LUT = shaders/GritsScanlines/Fake-Self-Illumination.png
-luminance_LUT_linear = true
+luminance_LUT_linear = true

crt/advanced_crt_whkrmrgks0.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/Advanced_CRT_shader_whkrmrgks0.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-1tap-bloom.slangp

@@ -281,9 +281,9 @@ mipmap_input25 = "false"
 alias25 = ""
 float_framebuffer25 = "false"
 srgb_framebuffer25 = "false"
-scale_type_x25 = "source"
+scale_type_x25 = "viewport"
 scale_x25 = "1.000000"
-scale_type_y25 = "source"
+scale_type_y25 = "viewport"
 scale_y25 = "1.000000"
 BLUR_RADIUS = "2.000000"
 MIN_EXP_INTENSITY = "0.500000"

crt/crt-1tap-bloom_fast.slangp

@@ -215,9 +215,9 @@ mipmap_input19 = "false"
 alias19 = ""
 float_framebuffer19 = "false"
 srgb_framebuffer19 = "false"
-scale_type_x19 = "source"
+scale_type_x19 = "viewport"
 scale_x19 = "1.000000"
-scale_type_y19 = "source"
+scale_type_y19 = "viewport"
 scale_y19 = "1.000000"
 MIN_EXP_INTENSITY = "0.650000"
 BLOOM_THRESHOLD = "2.500001"

crt/crt-1tap-bloom_fastest.slangp

@@ -105,9 +105,9 @@ mipmap_input9 = "false"
 alias9 = ""
 float_framebuffer9 = "false"
 srgb_framebuffer9 = "false"
-scale_type_x9 = "source"
+scale_type_x9 = "viewport"
 scale_x9 = "1.000000"
-scale_type_y9 = "source"
+scale_type_y9 = "viewport"
 scale_y9 = "1.000000"
 BLUR_RADIUS = "2.000000"
 MIN_EXP_INTENSITY = "0.450000"

crt/crt-aperture.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-aperture.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-caligari.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-caligari.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-cgwg-fast.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-cgwg-fast.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-consumer.slangp

@@ -6,4 +6,5 @@ mipmap_input0 = "false"
 alias0 = ""
 float_framebuffer0 = "false"
 srgb_framebuffer0 = "false"
+scale_type0 = viewport
 

crt/crt-easymode-halation.slangp

@@ -28,9 +28,9 @@ scale_y2 = "1.000000"
 shader3 = "shaders/crt-easymode-halation/threshold.slang"
 filter_linear3 = "false"
 srgb_framebuffer3 = "true"
-scale_type_x3 = "source"
+scale_type_x3 = "viewport"
 scale_x3 = "1.000000"
-scale_type_y3 = "source"
+scale_type_y3 = "viewport"
 scale_y3 = "1.000000"
 
 shader4 = "shaders/crt-easymode-halation/crt-easymode-halation.slang"

crt/crt-easymode.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-easymode.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-frutbunn.slangp

@@ -1,3 +1,4 @@
 shaders = 1
 
-shader0 = shaders/crt-frutbunn.slang
+shader0 = shaders/crt-frutbunn.slang
+scale_type0 = viewport

crt/crt-gdv-mini.slangp

@@ -1,3 +1,4 @@
 shaders = 1
 
 shader0 = shaders/crt-gdv-mini.slang
+scale_type0 = viewport

crt/crt-geom-deluxe.slangp

@@ -17,6 +17,7 @@ alias3 = blur_texture
 shader4 = shaders/geom-deluxe/crt-geom-deluxe.slang
 filter_linear4 = true
 mipmap_input4 = true
+scale_type4 = viewport
 
 textures = "aperture;slot;delta"
 delta = shaders/geom-deluxe/masks/delta_2_4x1_rgb.png

crt/crt-geom-tate.slangp

@@ -2,6 +2,7 @@ shaders = 1
 
 shader0 = shaders/crt-geom.slang
 filter_linear0 = false
+scale_type0 = viewport
 
 CRTgamma = "2.2"
 CURVATURE = "1.0"

crt/crt-geom.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-geom.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-hyllian-3d.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/hyllian/crt-hyllian-3d.slang
 filter_linear0 = true
+scale_type0 = viewport

crt/crt-hyllian-curvature-ntsc.slangp

@@ -65,6 +65,7 @@ mipmap_input6 = "false"
 alias6 = ""
 float_framebuffer6 = "false"
 srgb_framebuffer6 = "false"
+scale_type6 = viewport
 parameters = "linearize;quality;ntsc_sat;BEAM_PROFILE;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES;CRT_CURVATURE;CRT_warpX;CRT_warpY;CRT_cornersize;CRT_cornersmooth;GLOW_WHITEPOINT;GLOW_ROLLOFF;BLOOM_STRENGTH;OUTPUT_GAMMA;CURVATURE;warpX;warpY;cornersize;cornersmooth;noise_amt;shadowMask;maskDark;maskLight"
 BEAM_PROFILE = "0.000000"
 HFILTER_PROFILE = "1.000000"

crt/crt-hyllian-curvature.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/hyllian/crt-hyllian-curvature.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-hyllian-dedither.slangp

@@ -67,6 +67,7 @@ mipmap_input8 = "false"
 alias8 = ""
 float_framebuffer8 = "false"
 srgb_framebuffer8 = "false"
+scale_type8 = viewport
 parameters = "CD_HUD_DETAILS;INPUT_GAMMA;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;SHARPNESS_HACK;PHOSPHOR_LAYOUT;MASK_INTENSITY;InputGamma;OutputGamma;VSCANLINES;GLOW_WHITEPOINT;GLOW_ROLLOFF;BLOOM_STRENGTH;OUTPUT_GAMMA;CURVATURE;warpX;warpY;cornersize;cornersmooth;noise_amt;shadowMask;maskDark;maskLight"
 CD_HUD_DETAILS = "5.0"
 INPUT_GAMMA = "2.000000"

crt/crt-hyllian-glow.slangp

@@ -49,6 +49,7 @@ mipmap_input5 = "false"
 alias5 = ""
 float_framebuffer5 = "false"
 srgb_framebuffer5 = "false"
+scale_type5 = viewport
 parameters = "INPUT_GAMMA;BEAM_PROFILE;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;SHARPNESS_HACK;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES;GLOW_WHITEPOINT;GLOW_ROLLOFF;BLOOM_STRENGTH;OUTPUT_GAMMA;CURVATURE;warpX;warpY;cornersize;cornersmooth;noise_amt;shadowMask;maskDark;maskLight"
 INPUT_GAMMA = "2.400000"
 BEAM_PROFILE = "0.000000"

crt/crt-hyllian-multipass.slangp

@@ -10,6 +10,7 @@ scale_y0 = 1.0
 
 shader1 = shaders/hyllian/crt-hyllian-multipass/crt-hyllian-pass1.slang
 filter_linear1 = false
+scale_type1 = viewport
 
 # Uncomment these lines for a sharper variation
 #parameters = "SHARPNESS;SCANLINES_STRENGTH;BEAM_MIN_WIDTH"

crt/crt-hyllian-sinc-curvature.slangp

@@ -3,3 +3,4 @@ shaders = 1
 shader0 = shaders/hyllian/crt-hyllian-sinc-curvature.slang
 filter_linear0 = false
 float_framebuffer0 = true
+scale_type0 = viewport

crt/crt-hyllian-sinc-glow.slangp

@@ -49,6 +49,7 @@ mipmap_input5 = "false"
 alias5 = ""
 float_framebuffer5 = "false"
 srgb_framebuffer5 = "false"
+scale_type5 = viewport
 parameters = "INPUT_GAMMA;BEAM_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;HFILTER_SHARPNESS;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES;GLOW_WHITEPOINT;GLOW_ROLLOFF;BLOOM_STRENGTH;OUTPUT_GAMMA;CURVATURE;warpX;warpY;cornersize;cornersmooth;noise_amt;shadowMask;maskDark;maskLight"
 INPUT_GAMMA = "2.400000"
 BEAM_PROFILE = "0'.000000"

crt/crt-hyllian-sinc.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/hyllian/crt-hyllian-sinc.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-hyllian.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/hyllian/crt-hyllian.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-interlaced-halation.slangp

@@ -30,4 +30,5 @@ scale_y3 = "3.000000"
 shader4 = ../stock.slang
 filter_linear4 = "true"
 float_framebuffer4 = "false"
+scale_type4 = viewport
 

crt/crt-lottes-fast.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-lottes-fast.slang
 filter_linear0 = true
+scale_type0 = viewport

crt/crt-lottes-multipass-glow.slangp

@@ -44,3 +44,4 @@ srgb_framebuffer5 = true
 
 shader6 = "shaders/crt-lottes-multipass/scanpass-glow.slang"
 filter_linear6 = "true"
+scale_type6 = viewport

crt/crt-lottes-multipass.slangp

@@ -9,3 +9,4 @@ filter_linear1 = true
 
 shader2 = shaders/crt-lottes-multipass/scanpass.slang
 filter_linear2 = true
+scale_type2 = viewport

crt/crt-lottes.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-lottes.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-mattias.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-mattias.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-maximus-royale-fast-mode.slangp

@@ -1,4 +1,4 @@
-shaders = "21"
+shaders = "22"
 
 shader0 = ../stock.slang
 alias0 = maximus_refpass
@@ -163,6 +163,9 @@ wrap_mode20 = "clamp_to_border"
 scale_type20 = "source"
 scale20 = "1.0"
 
+shader21 = ../stock.slang
+scale_type21 = viewport
+
 crt_gamma = "1.7"
 lcd_gamma = "1.2"
 diffusion_weight = "0.3"

crt/crt-maximus-royale-half-res-mode.slangp

@@ -1,4 +1,4 @@
-shaders = "21"
+shaders = "22"
 
 shader0 = ../stock.slang
 alias0 = maximus_refpass
@@ -163,6 +163,9 @@ wrap_mode20 = "clamp_to_border"
 scale_type20 = "source"
 scale20 = "1.0"
 
+shader21 = ../stock.slang
+scale_type21 = viewport
+
 crt_gamma = "1.7"
 lcd_gamma = "1.2"
 diffusion_weight = "0.3"

crt/crt-maximus-royale.slangp

@@ -1,4 +1,4 @@
-shaders = "24"
+shaders = "25"
 
 shader0 = ../stock.slang
 alias0 = maximus_refpass
@@ -189,6 +189,9 @@ wrap_mode23 = "clamp_to_border"
 scale_type23 = "source"
 scale23 = "1.0"
 
+shader24 = ../stock.slang
+scale_type24 = viewport
+
 crt_gamma = "1.7"
 lcd_gamma = "1.2"
 diffusion_weight = "0.3"

crt/crt-nes-mini.slangp

@@ -1,3 +1,4 @@
 shaders = 1
 
 shader0 = shaders/crt-nes-mini.slang
+scale_type0 = viewport

crt/crt-nobody.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-nobody.slang
 filter_linear0 = false
+scale_type0 = viewport

crt/crt-pi.slangp

@@ -2,3 +2,4 @@ shaders = 1
 
 shader0 = shaders/crt-pi.slang
 filter_linear0 = true
+scale_type0 = viewport

crt/crt-slangtest-cubic.slangp

@@ -16,3 +16,4 @@ scale_y1 = 1.0
 srgb_framebuffer1 = true
 
 filter_linear2 = false 
+scale_type0 = viewport

crt/crt-slangtest-lanczos.slangp

@@ -16,3 +16,4 @@ scale_y1 = 1.0
 srgb_framebuffer1 = true
 
 filter_linear2 = false 
+scale_type2 = viewport

crt/crt-super-xbr.slangp

@@ -124,3 +124,4 @@ mipmap_input10 = "false"
 alias10 = ""
 float_framebuffer10 = "false"
 srgb_framebuffer10 = "true"
+scale_type10 = viewport

crt/crt-torridgristle.slangp

@@ -27,6 +27,7 @@ scale_type5 = source
 
 shader6 = shaders/torridgristle/Candy-Bloom.slang
 filter_linear6 = true
+scale_type6 = viewport
 
 textures = "overlay"
 overlay = ../reshade/shaders/blendoverlay/shadowmask-4x4.png

crt/crt-yo6-KV-M1420B-sharp.slangp

@@ -16,6 +16,7 @@ scale_y1 = 1329
 
 shader2 = "../windowed/shaders/jinc2.slang"
 filter_linear2 = false
+scale_type2 = viewport
 
 textures = TEX_CRT
 TEX_CRT = "shaders/crt-yo6/KV-M1420B.png"