diff --git a/anti-aliasing/aa-shader-4.0-level2.slangp b/anti-aliasing/aa-shader-4.0-level2.slangp index c20d69d0..ef5fc3b1 100644 --- a/anti-aliasing/aa-shader-4.0-level2.slangp +++ b/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 diff --git a/anti-aliasing/advanced-aa.slangp b/anti-aliasing/advanced-aa.slangp index 13f6e472..476b97df 100644 --- a/anti-aliasing/advanced-aa.slangp +++ b/anti-aliasing/advanced-aa.slangp @@ -14,3 +14,4 @@ scale1 = 1.0 shader2 = ../cubic/shaders/bicubic-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/anti-aliasing/fxaa.slangp b/anti-aliasing/fxaa.slangp index 7de8fd3f..c043cb54 100644 --- a/anti-aliasing/fxaa.slangp +++ b/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 diff --git a/anti-aliasing/reverse-aa.slangp b/anti-aliasing/reverse-aa.slangp index 5908be8e..a3716d30 100644 --- a/anti-aliasing/reverse-aa.slangp +++ b/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 diff --git a/anti-aliasing/smaa+linear.slangp b/anti-aliasing/smaa+linear.slangp index ddac65a0..e460272a 100644 --- a/anti-aliasing/smaa+linear.slangp +++ b/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 diff --git a/anti-aliasing/smaa+sharpen.slangp b/anti-aliasing/smaa+sharpen.slangp index 18297c60..1fa31c51 100644 --- a/anti-aliasing/smaa+sharpen.slangp +++ b/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" diff --git a/anti-aliasing/smaa.slangp b/anti-aliasing/smaa.slangp index f8c54798..afd4de1b 100644 --- a/anti-aliasing/smaa.slangp +++ b/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" diff --git a/border/ambient-glow.slangp b/border/ambient-glow.slangp index bb2366ae..7bdf322b 100644 --- a/border/ambient-glow.slangp +++ b/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 \ No newline at end of file +mixfactor = 0.95 diff --git a/border/bigblur.slangp b/border/bigblur.slangp index d47f5234..3a3ef4ab 100644 --- a/border/bigblur.slangp +++ b/border/bigblur.slangp @@ -42,3 +42,4 @@ filter_linear7 = true shader8 = shaders/bigblur.slang filter_linear8 = true +scale_type8 = viewport diff --git a/border/imgborder.slangp b/border/imgborder.slangp index bfc3185d..41e10de1 100644 --- a/border/imgborder.slangp +++ b/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 \ No newline at end of file +border_on_top = 0.0 diff --git a/crt/GritsScanlines.slangp b/crt/GritsScanlines.slangp index 9491d793..1658c240 100644 --- a/crt/GritsScanlines.slangp +++ b/crt/GritsScanlines.slangp @@ -8,6 +8,7 @@ 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 @@ -15,4 +16,4 @@ 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 \ No newline at end of file +luminance_LUT_linear = true diff --git a/crt/advanced_crt_whkrmrgks0.slangp b/crt/advanced_crt_whkrmrgks0.slangp index f51ad98c..850088de 100644 --- a/crt/advanced_crt_whkrmrgks0.slangp +++ b/crt/advanced_crt_whkrmrgks0.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/Advanced_CRT_shader_whkrmrgks0.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-1tap-bloom.slangp b/crt/crt-1tap-bloom.slangp index 2a5f35ae..793bcf73 100644 --- a/crt/crt-1tap-bloom.slangp +++ b/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" diff --git a/crt/crt-1tap-bloom_fast.slangp b/crt/crt-1tap-bloom_fast.slangp index 7d977ec9..ce0f5969 100644 --- a/crt/crt-1tap-bloom_fast.slangp +++ b/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" diff --git a/crt/crt-1tap-bloom_fastest.slangp b/crt/crt-1tap-bloom_fastest.slangp index dc353de2..efcd7761 100644 --- a/crt/crt-1tap-bloom_fastest.slangp +++ b/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" diff --git a/crt/crt-aperture.slangp b/crt/crt-aperture.slangp index bc0a06a7..f3e1aea3 100644 --- a/crt/crt-aperture.slangp +++ b/crt/crt-aperture.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-aperture.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-caligari.slangp b/crt/crt-caligari.slangp index 7af7ad4f..f883beb4 100644 --- a/crt/crt-caligari.slangp +++ b/crt/crt-caligari.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-caligari.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-cgwg-fast.slangp b/crt/crt-cgwg-fast.slangp index 2442e070..5c5b2743 100644 --- a/crt/crt-cgwg-fast.slangp +++ b/crt/crt-cgwg-fast.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-cgwg-fast.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-consumer.slangp b/crt/crt-consumer.slangp index dd3ce034..fd981c1b 100644 --- a/crt/crt-consumer.slangp +++ b/crt/crt-consumer.slangp @@ -6,4 +6,5 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport diff --git a/crt/crt-easymode-halation.slangp b/crt/crt-easymode-halation.slangp index a17ee569..099a7e4d 100644 --- a/crt/crt-easymode-halation.slangp +++ b/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" diff --git a/crt/crt-easymode.slangp b/crt/crt-easymode.slangp index e635424a..716e5ec4 100644 --- a/crt/crt-easymode.slangp +++ b/crt/crt-easymode.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-easymode.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-frutbunn.slangp b/crt/crt-frutbunn.slangp index ad9faac3..a9b172d4 100644 --- a/crt/crt-frutbunn.slangp +++ b/crt/crt-frutbunn.slangp @@ -1,3 +1,4 @@ shaders = 1 -shader0 = shaders/crt-frutbunn.slang \ No newline at end of file +shader0 = shaders/crt-frutbunn.slang +scale_type0 = viewport diff --git a/crt/crt-gdv-mini.slangp b/crt/crt-gdv-mini.slangp index d5f6b151..4350ee87 100644 --- a/crt/crt-gdv-mini.slangp +++ b/crt/crt-gdv-mini.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/crt-gdv-mini.slang +scale_type0 = viewport diff --git a/crt/crt-geom-deluxe.slangp b/crt/crt-geom-deluxe.slangp index 4bfdef34..426b81b1 100644 --- a/crt/crt-geom-deluxe.slangp +++ b/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 diff --git a/crt/crt-geom-tate.slangp b/crt/crt-geom-tate.slangp index 4c3ff5e3..d14290d2 100644 --- a/crt/crt-geom-tate.slangp +++ b/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" diff --git a/crt/crt-geom.slangp b/crt/crt-geom.slangp index 50e96084..d90bcd4a 100644 --- a/crt/crt-geom.slangp +++ b/crt/crt-geom.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-geom.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-hyllian-3d.slangp b/crt/crt-hyllian-3d.slangp index b13bc59d..17cd8bbe 100644 --- a/crt/crt-hyllian-3d.slangp +++ b/crt/crt-hyllian-3d.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/hyllian/crt-hyllian-3d.slang filter_linear0 = true +scale_type0 = viewport diff --git a/crt/crt-hyllian-curvature-ntsc.slangp b/crt/crt-hyllian-curvature-ntsc.slangp index 9ceead54..2720ab27 100644 --- a/crt/crt-hyllian-curvature-ntsc.slangp +++ b/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" diff --git a/crt/crt-hyllian-curvature.slangp b/crt/crt-hyllian-curvature.slangp index 5530cde5..6d87923c 100644 --- a/crt/crt-hyllian-curvature.slangp +++ b/crt/crt-hyllian-curvature.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/hyllian/crt-hyllian-curvature.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-hyllian-dedither.slangp b/crt/crt-hyllian-dedither.slangp index 5de8c9eb..a7767424 100644 --- a/crt/crt-hyllian-dedither.slangp +++ b/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" diff --git a/crt/crt-hyllian-glow.slangp b/crt/crt-hyllian-glow.slangp index d3720f77..556ca535 100644 --- a/crt/crt-hyllian-glow.slangp +++ b/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" diff --git a/crt/crt-hyllian-multipass.slangp b/crt/crt-hyllian-multipass.slangp index aad902d4..2cca3359 100644 --- a/crt/crt-hyllian-multipass.slangp +++ b/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" diff --git a/crt/crt-hyllian-sinc-curvature.slangp b/crt/crt-hyllian-sinc-curvature.slangp index 2c39122a..5682ad0f 100644 --- a/crt/crt-hyllian-sinc-curvature.slangp +++ b/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 diff --git a/crt/crt-hyllian-sinc-glow.slangp b/crt/crt-hyllian-sinc-glow.slangp index 34aff687..a23c603d 100644 --- a/crt/crt-hyllian-sinc-glow.slangp +++ b/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" diff --git a/crt/crt-hyllian-sinc.slangp b/crt/crt-hyllian-sinc.slangp index c739cf36..54f0c483 100644 --- a/crt/crt-hyllian-sinc.slangp +++ b/crt/crt-hyllian-sinc.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/hyllian/crt-hyllian-sinc.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-hyllian.slangp b/crt/crt-hyllian.slangp index 4007389e..ec60e66b 100644 --- a/crt/crt-hyllian.slangp +++ b/crt/crt-hyllian.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/hyllian/crt-hyllian.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-interlaced-halation.slangp b/crt/crt-interlaced-halation.slangp index 8f5aea00..4fc52ca7 100644 --- a/crt/crt-interlaced-halation.slangp +++ b/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 diff --git a/crt/crt-lottes-fast.slangp b/crt/crt-lottes-fast.slangp index 7dce6025..74ac13af 100644 --- a/crt/crt-lottes-fast.slangp +++ b/crt/crt-lottes-fast.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-lottes-fast.slang filter_linear0 = true +scale_type0 = viewport diff --git a/crt/crt-lottes-multipass-glow.slangp b/crt/crt-lottes-multipass-glow.slangp index cbf9a552..9e4b58a4 100644 --- a/crt/crt-lottes-multipass-glow.slangp +++ b/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 diff --git a/crt/crt-lottes-multipass.slangp b/crt/crt-lottes-multipass.slangp index 1ce0b89e..17be4ba3 100644 --- a/crt/crt-lottes-multipass.slangp +++ b/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 diff --git a/crt/crt-lottes.slangp b/crt/crt-lottes.slangp index 6b42b64e..9896df30 100644 --- a/crt/crt-lottes.slangp +++ b/crt/crt-lottes.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-lottes.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-mattias.slangp b/crt/crt-mattias.slangp index cd358d0b..8faa9f2d 100644 --- a/crt/crt-mattias.slangp +++ b/crt/crt-mattias.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-mattias.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-maximus-royale-fast-mode.slangp b/crt/crt-maximus-royale-fast-mode.slangp index 2bbfbfbf..ea07d9a0 100644 --- a/crt/crt-maximus-royale-fast-mode.slangp +++ b/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" diff --git a/crt/crt-maximus-royale-half-res-mode.slangp b/crt/crt-maximus-royale-half-res-mode.slangp index 421e885b..5292672c 100644 --- a/crt/crt-maximus-royale-half-res-mode.slangp +++ b/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" diff --git a/crt/crt-maximus-royale.slangp b/crt/crt-maximus-royale.slangp index c4f974fe..8bd7117b 100644 --- a/crt/crt-maximus-royale.slangp +++ b/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" diff --git a/crt/crt-nes-mini.slangp b/crt/crt-nes-mini.slangp index 591af6d5..05c8e729 100644 --- a/crt/crt-nes-mini.slangp +++ b/crt/crt-nes-mini.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/crt-nes-mini.slang +scale_type0 = viewport diff --git a/crt/crt-nobody.slangp b/crt/crt-nobody.slangp index 0fdab5ae..04c07288 100644 --- a/crt/crt-nobody.slangp +++ b/crt/crt-nobody.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-nobody.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/crt-pi.slangp b/crt/crt-pi.slangp index 599a5fa1..a87658a6 100644 --- a/crt/crt-pi.slangp +++ b/crt/crt-pi.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/crt-pi.slang filter_linear0 = true +scale_type0 = viewport diff --git a/crt/crt-slangtest-cubic.slangp b/crt/crt-slangtest-cubic.slangp index bd9e8797..e0cbb159 100644 --- a/crt/crt-slangtest-cubic.slangp +++ b/crt/crt-slangtest-cubic.slangp @@ -16,3 +16,4 @@ scale_y1 = 1.0 srgb_framebuffer1 = true filter_linear2 = false +scale_type0 = viewport diff --git a/crt/crt-slangtest-lanczos.slangp b/crt/crt-slangtest-lanczos.slangp index a116f6a2..89cb33a9 100644 --- a/crt/crt-slangtest-lanczos.slangp +++ b/crt/crt-slangtest-lanczos.slangp @@ -16,3 +16,4 @@ scale_y1 = 1.0 srgb_framebuffer1 = true filter_linear2 = false +scale_type2 = viewport diff --git a/crt/crt-super-xbr.slangp b/crt/crt-super-xbr.slangp index c9b60ea3..4fe96bfd 100644 --- a/crt/crt-super-xbr.slangp +++ b/crt/crt-super-xbr.slangp @@ -124,3 +124,4 @@ mipmap_input10 = "false" alias10 = "" float_framebuffer10 = "false" srgb_framebuffer10 = "true" +scale_type10 = viewport diff --git a/crt/crt-torridgristle.slangp b/crt/crt-torridgristle.slangp index 7c48b1f4..e6a70f1e 100644 --- a/crt/crt-torridgristle.slangp +++ b/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 diff --git a/crt/crt-yo6-KV-M1420B-sharp.slangp b/crt/crt-yo6-KV-M1420B-sharp.slangp index 31b8ac01..630e99cc 100644 --- a/crt/crt-yo6-KV-M1420B-sharp.slangp +++ b/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" diff --git a/crt/crt-yo6-KV-M1420B.slangp b/crt/crt-yo6-KV-M1420B.slangp index d0685b63..48d096b1 100644 --- a/crt/crt-yo6-KV-M1420B.slangp +++ b/crt/crt-yo6-KV-M1420B.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" diff --git a/crt/crtglow_gauss.slangp b/crt/crtglow_gauss.slangp index 890c80f8..bb766a51 100644 --- a/crt/crtglow_gauss.slangp +++ b/crt/crtglow_gauss.slangp @@ -36,4 +36,5 @@ srgb_framebuffer5 = true shader6 = shaders/glow/resolve.slang filter_linear6 = true +scale_type6 = viewport diff --git a/crt/crtglow_lanczos.slangp b/crt/crtglow_lanczos.slangp index 25d6b90f..5a7dc14a 100644 --- a/crt/crtglow_lanczos.slangp +++ b/crt/crtglow_lanczos.slangp @@ -36,4 +36,5 @@ srgb_framebuffer5 = true shader6 = shaders/glow/resolve.slang filter_linear6 = true +scale_type6 = viewport diff --git a/crt/crtsim.slangp b/crt/crtsim.slangp index e3ac6857..3bc512d8 100644 --- a/crt/crtsim.slangp +++ b/crt/crtsim.slangp @@ -14,9 +14,10 @@ filter_linear3 = true shader4 = shaders/crtsim/present.slang filter_linear4 = true +scale_type4 = viewport textures = "NTSCArtifactSampler;shadowMaskSampler" NTSCArtifactSampler = "shaders/crtsim/artifacts.png" NTSCArtifactSampler_linear = true shadowMaskSampler = "shaders/crtsim/mask.png" -shadowMaskSampler_linear = true \ No newline at end of file +shadowMaskSampler_linear = true diff --git a/crt/fakelottes.slangp b/crt/fakelottes.slangp index 01897c4a..4a41e279 100644 --- a/crt/fakelottes.slangp +++ b/crt/fakelottes.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/fakelottes.slang -filter_linear0 = true \ No newline at end of file +filter_linear0 = true +scale_type0 = viewport diff --git a/crt/metacrt.slangp b/crt/metacrt.slangp index b7a209ba..69f2a61c 100644 --- a/crt/metacrt.slangp +++ b/crt/metacrt.slangp @@ -17,6 +17,7 @@ float_framebuffer2 = true shader3 = ../anti-aliasing/shaders/fxaa.slang filter_linear3 = true +scale_type3 = viewport textures = "cubeMap;table" cubeMap = shaders/metacrt/basilica.png diff --git a/crt/newpixie-crt.slangp b/crt/newpixie-crt.slangp index 96006d2e..4f0931a0 100644 --- a/crt/newpixie-crt.slangp +++ b/crt/newpixie-crt.slangp @@ -20,6 +20,7 @@ filter_linear2 = true shader3 = shaders/newpixie/newpixie-crt.slang filter_linear3 = true +scale_type3 = viewport textures = "frametexture" frametexture = shaders/newpixie/crtframe.png diff --git a/crt/phosphorlut.slangp b/crt/phosphorlut.slangp index a1bf5484..419a259b 100644 --- a/crt/phosphorlut.slangp +++ b/crt/phosphorlut.slangp @@ -31,6 +31,7 @@ srgb_framebuffer3 = true shader4 = shaders/phosphorlut/phosphorlut-pass1.slang filter_linear4 = true +scale_type4 = viewport textures = "shadow;aperture;slot" shadow = shaders/phosphorlut/luts/shadowmask.png @@ -41,4 +42,4 @@ aperture_linear = true aperture_wrap_mode = "repeat" slot = shaders/phosphorlut/luts/slotmask.png slot_linear = true -slot_wrap_mode = "repeat" \ No newline at end of file +slot_wrap_mode = "repeat" diff --git a/crt/tvout-tweaks.slangp b/crt/tvout-tweaks.slangp index c46cde4d..492b70e0 100644 --- a/crt/tvout-tweaks.slangp +++ b/crt/tvout-tweaks.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/tvout-tweaks.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = viewport diff --git a/crt/vector-glow.slangp b/crt/vector-glow.slangp index 6c3e2f84..1a0cdcff 100644 --- a/crt/vector-glow.slangp +++ b/crt/vector-glow.slangp @@ -38,6 +38,7 @@ srgb_framebuffer6 = "true" shader7 = "shaders/glow-trails/combine.slang" shader8 = "../misc/shaders/image-adjustment.slang" +scale_type8 = viewport parameters = "mixfactor;threshold;trail_bright;glowFactor;haze_strength;luminance;bright" mixfactor = "0.18" @@ -46,4 +47,4 @@ trail_bright = "0.30" glowFactor = "0.10" haze_strength = "0.25" luminance = "1.50" -bright = "1.0" \ No newline at end of file +bright = "1.0" diff --git a/crt/vt220.slangp b/crt/vt220.slangp index ce89b895..f5fd0f50 100644 --- a/crt/vt220.slangp +++ b/crt/vt220.slangp @@ -19,6 +19,7 @@ filter_linear2 = false shader3 = shaders/vt220/vt220.slang mipmap_input3 = true wrap_mode3 = mirrored_repeat +scale_type3 = viewport parameters = "quality" quality = 1.0 diff --git a/crt/yee64.slangp b/crt/yee64.slangp index e7fde6cf..d80f6aec 100644 --- a/crt/yee64.slangp +++ b/crt/yee64.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/yee64.slang +scale_type0 = viewport diff --git a/crt/yeetron.slangp b/crt/yeetron.slangp index 1d54f0c0..86ab4def 100644 --- a/crt/yeetron.slangp +++ b/crt/yeetron.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/yeetron.slang filter_linear0 = false +scale_type0 = viewport diff --git a/crt/zfast-crt-composite.slangp b/crt/zfast-crt-composite.slangp index ef4f6fdb..d42fc790 100644 --- a/crt/zfast-crt-composite.slangp +++ b/crt/zfast-crt-composite.slangp @@ -1,7 +1,9 @@ shaders = 1 + shader0 = shaders/zfast_crt/zfast_crt_composite.slang filter_linear0 = true wrap_mode0 = clamp_to_border mipmap_input0 = false float_framebuffer0 = false srgb_framebuffer0 = false +scale_type0 = viewport diff --git a/crt/zfast-crt-curvature.slangp b/crt/zfast-crt-curvature.slangp index 6737ed48..85f37452 100644 --- a/crt/zfast-crt-curvature.slangp +++ b/crt/zfast-crt-curvature.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/zfast_crt/zfast_crt_curvature.slang -filter_linear0 = true \ No newline at end of file +filter_linear0 = true +scale_type0 = viewport diff --git a/crt/zfast-crt-hdmask.slangp b/crt/zfast-crt-hdmask.slangp index acbc1819..87c0d3ef 100644 --- a/crt/zfast-crt-hdmask.slangp +++ b/crt/zfast-crt-hdmask.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/zfast_crt/zfast_crt_coarsemask.slang filter_linear0 = true +scale_type0 = viewport diff --git a/crt/zfast-crt.slangp b/crt/zfast-crt.slangp index e428734b..bc13a000 100644 --- a/crt/zfast-crt.slangp +++ b/crt/zfast-crt.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/zfast_crt/zfast_crt_finemask.slang -filter_linear0 = true \ No newline at end of file +filter_linear0 = true +scale_type0 = viewport diff --git a/cubic/bicubic.slangp b/cubic/bicubic.slangp index 3f6e39c7..857417d3 100644 --- a/cubic/bicubic.slangp +++ b/cubic/bicubic.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/bicubic.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = viewport diff --git a/cubic/catmull-rom.slangp b/cubic/catmull-rom.slangp index 31352e67..f4e5e8fe 100644 --- a/cubic/catmull-rom.slangp +++ b/cubic/catmull-rom.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/catmull-rom.slang filter_linear0 = true +scale_type0 = viewport diff --git a/cubic/cubic-gamma-correct.slangp b/cubic/cubic-gamma-correct.slangp index 2ed2681c..ee5c6ceb 100644 --- a/cubic/cubic-gamma-correct.slangp +++ b/cubic/cubic-gamma-correct.slangp @@ -1,6 +1,7 @@ shaders = 2 shader0 = shaders/linearize.slang shader1 = shaders/cubic-gamma-correct.slang +scale_type1 = viewport filter_linear0 = false scale_type0 = source diff --git a/cubic/cubic.slangp b/cubic/cubic.slangp index 644d9b9e..d43a140b 100644 --- a/cubic/cubic.slangp +++ b/cubic/cubic.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/cubic.slang filter_linear0 = false +scale_type0 = viewport diff --git a/ddt/cut.slangp b/ddt/cut.slangp index 310cf4ce..d372d176 100644 --- a/ddt/cut.slangp +++ b/ddt/cut.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/cut.slang filter_linear0 = false +scale_type0 = viewport diff --git a/ddt/ddt-extended.slangp b/ddt/ddt-extended.slangp index 535941d9..beee6847 100644 --- a/ddt/ddt-extended.slangp +++ b/ddt/ddt-extended.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/ddt-extended.slang filter_linear0 = false +scale_type0 = viewport diff --git a/ddt/ddt-jinc.slangp b/ddt/ddt-jinc.slangp index aa49d101..72bef41f 100644 --- a/ddt/ddt-jinc.slangp +++ b/ddt/ddt-jinc.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/ddt-jinc.slang filter_linear0 = false +scale_type0 = viewport diff --git a/ddt/ddt-xbr-lv1.slangp b/ddt/ddt-xbr-lv1.slangp index 3409768d..10be1c04 100644 --- a/ddt/ddt-xbr-lv1.slangp +++ b/ddt/ddt-xbr-lv1.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/ddt-xbr-lv1.slang filter_linear0 = false +scale_type0 = viewport diff --git a/ddt/ddt.slangp b/ddt/ddt.slangp index adf28253..e9042de3 100644 --- a/ddt/ddt.slangp +++ b/ddt/ddt.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/ddt.slang filter_linear0 = false +scale_type0 = viewport diff --git a/denoisers/crt-fast-bilateral-super-xbr.slangp b/denoisers/crt-fast-bilateral-super-xbr.slangp index 4c6aab59..171caa1e 100644 --- a/denoisers/crt-fast-bilateral-super-xbr.slangp +++ b/denoisers/crt-fast-bilateral-super-xbr.slangp @@ -40,6 +40,7 @@ shader5 = "../crt/shaders/hyllian/crt-hyllian.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" float_framebuffer5 = "false" +scale_type5 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.50 diff --git a/denoisers/fast-bilateral-super-xbr-4p.slangp b/denoisers/fast-bilateral-super-xbr-4p.slangp index 74ecb899..52e563b9 100644 --- a/denoisers/fast-bilateral-super-xbr-4p.slangp +++ b/denoisers/fast-bilateral-super-xbr-4p.slangp @@ -40,8 +40,9 @@ scale_y4 = "2.000000" shader5 = "../windowed/shaders/jinc2.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" +scale_type5 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.42 JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral-super-xbr-6p.slangp b/denoisers/fast-bilateral-super-xbr-6p.slangp index d12f9ca8..6d26409b 100644 --- a/denoisers/fast-bilateral-super-xbr-6p.slangp +++ b/denoisers/fast-bilateral-super-xbr-6p.slangp @@ -55,8 +55,9 @@ scale_y6 = "1.000000" shader7 = "../windowed/shaders/jinc2.slang" filter_linear7 = "false" wrap_mode7 = "clamp_to_edge" +scale_type7 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.42 JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp index e1649bd7..5143fb24 100644 --- a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp +++ b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp @@ -37,8 +37,9 @@ scale_y4 = "1.000000" shader5 = "../windowed/shaders/jinc2.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" +scale_type5 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.42 JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral-super-xbr.slangp b/denoisers/fast-bilateral-super-xbr.slangp index b4586431..d5177ebb 100644 --- a/denoisers/fast-bilateral-super-xbr.slangp +++ b/denoisers/fast-bilateral-super-xbr.slangp @@ -30,8 +30,9 @@ scale_y3 = "1.000000" shader4 = "../windowed/shaders/jinc2.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" +scale_type4 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.42 JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral.slangp b/denoisers/fast-bilateral.slangp index 93f9b358..37a65922 100644 --- a/denoisers/fast-bilateral.slangp +++ b/denoisers/fast-bilateral.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/fast-bilateral.slang filter_linear0 = false +scale_type0 = source diff --git a/dithering/bayer-matrix-dithering.slangp b/dithering/bayer-matrix-dithering.slangp index 24b210f7..ba3c3d69 100644 --- a/dithering/bayer-matrix-dithering.slangp +++ b/dithering/bayer-matrix-dithering.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/bayer-matrix-dithering.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = source diff --git a/dithering/checkerboard-dedither.slangp b/dithering/checkerboard-dedither.slangp index 9f0d2bd6..aa3038ac 100644 --- a/dithering/checkerboard-dedither.slangp +++ b/dithering/checkerboard-dedither.slangp @@ -18,3 +18,4 @@ scale2 = 1.0 shader3 = shaders/checkerboard-dedither/checkerboard-dedither-pass3.slang filter_linear3 = false +scale_type3 = source diff --git a/dithering/gendither.slangp b/dithering/gendither.slangp index 6ced28df..0e542d84 100644 --- a/dithering/gendither.slangp +++ b/dithering/gendither.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/gendither.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = source diff --git a/dithering/sgenpt-mix-multipass.slangp b/dithering/sgenpt-mix-multipass.slangp index e2acd9f3..f04bc243 100644 --- a/dithering/sgenpt-mix-multipass.slangp +++ b/dithering/sgenpt-mix-multipass.slangp @@ -30,4 +30,5 @@ scale4 = 1.0 shader5 = shaders/sgenpt-mix/sgenpt-mix-pass5.slang filter_linear5 = false +scale_type5 = source diff --git a/eagle/2xsai-fix-pixel-shift.slangp b/eagle/2xsai-fix-pixel-shift.slangp index 73ae433e..90cefa5c 100644 --- a/eagle/2xsai-fix-pixel-shift.slangp +++ b/eagle/2xsai-fix-pixel-shift.slangp @@ -14,6 +14,7 @@ shader1 = "../nnedi3/shaders/jinc2-cshift-rgb.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_border" mipmap_input1 = "false" +scale_type1 = viewport alias1 = "" float_framebuffer1 = "false" srgb_framebuffer1 = "false" diff --git a/eagle/2xsai.slangp b/eagle/2xsai.slangp index aab760d5..6178b6ce 100644 --- a/eagle/2xsai.slangp +++ b/eagle/2xsai.slangp @@ -14,4 +14,5 @@ scale1 = 1.0 shader2 = ../cubic/shaders/bicubic-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/eagle/super-2xsai-fix-pixel-shift.slangp b/eagle/super-2xsai-fix-pixel-shift.slangp index e2eefd72..8a4a9017 100644 --- a/eagle/super-2xsai-fix-pixel-shift.slangp +++ b/eagle/super-2xsai-fix-pixel-shift.slangp @@ -17,6 +17,7 @@ mipmap_input1 = "false" alias1 = "" float_framebuffer1 = "false" srgb_framebuffer1 = "false" +scale_type1 = viewport JINC2_WINDOW_SINC = "0.500000" JINC2_SINC = "0.880000" JINC2_AR_STRENGTH = "0.000000" diff --git a/eagle/super-2xsai.slangp b/eagle/super-2xsai.slangp index 81999a31..6c857e7e 100644 --- a/eagle/super-2xsai.slangp +++ b/eagle/super-2xsai.slangp @@ -14,3 +14,4 @@ scale1 = 1.0 shader2 = ../cubic/shaders/bicubic-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/eagle/supereagle.slangp b/eagle/supereagle.slangp index 9058203a..de1dbb08 100644 --- a/eagle/supereagle.slangp +++ b/eagle/supereagle.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "shaders/supereagle.slang" filter_linear0 = false +scale_type0 = viewport diff --git a/film/technicolor.slangp b/film/technicolor.slangp index 633cd5af..5f1f33e6 100644 --- a/film/technicolor.slangp +++ b/film/technicolor.slangp @@ -2,6 +2,7 @@ shaders = 2 shader0 = ../reshade/shaders/LUT/LUT.slang shader1 = shaders/film_noise.slang +scale_type1 = viewport textures = "SamplerLUT;noise1; diff --git a/handheld/bevel.slangp b/handheld/bevel.slangp index 92f462c8..e9798896 100644 --- a/handheld/bevel.slangp +++ b/handheld/bevel.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/bevel.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/dot.slangp b/handheld/dot.slangp index 8ebd5ca6..2f6528ab 100644 --- a/handheld/dot.slangp +++ b/handheld/dot.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/dot.slang filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/ds-hybrid-sabr.slangp b/handheld/ds-hybrid-sabr.slangp index 579889ac..30bbc977 100644 --- a/handheld/ds-hybrid-sabr.slangp +++ b/handheld/ds-hybrid-sabr.slangp @@ -14,3 +14,4 @@ alias1 = Ref shader2 = shaders/ds-hybrid-view.slang filter_linear2 = true +scale_type0 = viewport diff --git a/handheld/ds-hybrid-scalefx.slangp b/handheld/ds-hybrid-scalefx.slangp index 266591d8..c672253c 100644 --- a/handheld/ds-hybrid-scalefx.slangp +++ b/handheld/ds-hybrid-scalefx.slangp @@ -38,3 +38,4 @@ alias5 = ds_hybrid_view_refpass shader6 = shaders/ds-hybrid-view.slang filter_linear6 = true +scale_type0 = viewport diff --git a/handheld/lcd-grid-v2-gba-color-motionblur.slangp b/handheld/lcd-grid-v2-gba-color-motionblur.slangp index 08635ecb..eb256305 100644 --- a/handheld/lcd-grid-v2-gba-color-motionblur.slangp +++ b/handheld/lcd-grid-v2-gba-color-motionblur.slangp @@ -5,14 +5,14 @@ filter_linear0 = "false" scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader1 = "shaders/color/gba-color.slang" filter_linear1 = "false" -scale_type1 = "viewport" +scale_type1 = "source" scale1 = "1.0" -shader2 = "shaders/color/gba-color.slang" +shader2 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear2 = "false" -scale_type2 = "source" +scale_type2 = "viewport" scale2 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-gba-color.slangp b/handheld/lcd-grid-v2-gba-color.slangp index dd2cd8a0..78d2956d 100644 --- a/handheld/lcd-grid-v2-gba-color.slangp +++ b/handheld/lcd-grid-v2-gba-color.slangp @@ -1,13 +1,13 @@ shaders = "2" -shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader0 = "shaders/color/gba-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" +scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/color/gba-color.slang" +shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear1 = "false" -scale_type1 = "source" +scale_type1 = "viewport" scale1 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-gbc-color-motionblur.slangp b/handheld/lcd-grid-v2-gbc-color-motionblur.slangp index 61e9a007..e2599829 100644 --- a/handheld/lcd-grid-v2-gbc-color-motionblur.slangp +++ b/handheld/lcd-grid-v2-gbc-color-motionblur.slangp @@ -5,14 +5,14 @@ filter_linear0 = "false" scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader1 = "shaders/color/gbc-color.slang" filter_linear1 = "false" -scale_type1 = "viewport" +scale_type1 = "source" scale1 = "1.0" -shader2 = "shaders/color/gbc-color.slang" +shader2 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear2 = "false" -scale_type2 = "source" +scale_type2 = "viewport" scale2 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-gbc-color.slangp b/handheld/lcd-grid-v2-gbc-color.slangp index 9ee9e667..9b093396 100644 --- a/handheld/lcd-grid-v2-gbc-color.slangp +++ b/handheld/lcd-grid-v2-gbc-color.slangp @@ -1,13 +1,13 @@ shaders = "2" -shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader0 = "shaders/color/gbc-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" +scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/color/gbc-color.slang" +shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear1 = "false" -scale_type1 = "source" +scale_type1 = "viewport" scale1 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-nds-color-motionblur.slangp b/handheld/lcd-grid-v2-nds-color-motionblur.slangp index 14f2ba19..9f46c7c2 100644 --- a/handheld/lcd-grid-v2-nds-color-motionblur.slangp +++ b/handheld/lcd-grid-v2-nds-color-motionblur.slangp @@ -5,14 +5,14 @@ filter_linear0 = "false" scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader1 = "shaders/color/nds-color.slang" filter_linear1 = "false" -scale_type1 = "viewport" +scale_type1 = "source" scale1 = "1.0" -shader2 = "shaders/color/nds-color.slang" +shader2 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear2 = "false" -scale_type2 = "source" +scale_type2 = "viewport" scale2 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-nds-color.slangp b/handheld/lcd-grid-v2-nds-color.slangp index 403b2bb9..ecb31847 100644 --- a/handheld/lcd-grid-v2-nds-color.slangp +++ b/handheld/lcd-grid-v2-nds-color.slangp @@ -1,13 +1,13 @@ shaders = "2" -shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader0 = "shaders/color/nds-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" +scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/color/nds-color.slang" +shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear1 = "false" -scale_type1 = "source" +scale_type1 = "viewport" scale1 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-palm-color-motionblur.slangp b/handheld/lcd-grid-v2-palm-color-motionblur.slangp index 66ed945d..c97a12ba 100644 --- a/handheld/lcd-grid-v2-palm-color-motionblur.slangp +++ b/handheld/lcd-grid-v2-palm-color-motionblur.slangp @@ -5,14 +5,14 @@ filter_linear0 = "false" scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader1 = "shaders/color/palm-color.slang" filter_linear1 = "false" -scale_type1 = "viewport" +scale_type1 = "source" scale1 = "1.0" -shader2 = "shaders/color/palm-color.slang" +shader2 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear2 = "false" -scale_type2 = "source" +scale_type2 = "viewport" scale2 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-palm-color.slangp b/handheld/lcd-grid-v2-palm-color.slangp index 901d9e90..ed2e20e9 100644 --- a/handheld/lcd-grid-v2-palm-color.slangp +++ b/handheld/lcd-grid-v2-palm-color.slangp @@ -1,13 +1,13 @@ shaders = "2" -shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader0 = "shaders/color/palm-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" +scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/color/palm-color.slang" +shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear1 = "false" -scale_type1 = "source" +scale_type1 = "viewport" scale1 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-psp-color-motionblur.slangp b/handheld/lcd-grid-v2-psp-color-motionblur.slangp index 1ba9cb87..e159209e 100644 --- a/handheld/lcd-grid-v2-psp-color-motionblur.slangp +++ b/handheld/lcd-grid-v2-psp-color-motionblur.slangp @@ -5,14 +5,14 @@ filter_linear0 = "false" scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader1 = "shaders/color/psp-color.slang" filter_linear1 = "false" -scale_type1 = "viewport" +scale_type1 = "source" scale1 = "1.0" -shader2 = "shaders/color/psp-color.slang" +shader2 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear2 = "false" -scale_type2 = "source" +scale_type2 = "viewport" scale2 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-psp-color.slangp b/handheld/lcd-grid-v2-psp-color.slangp index 0495cc18..f9bfb6f3 100644 --- a/handheld/lcd-grid-v2-psp-color.slangp +++ b/handheld/lcd-grid-v2-psp-color.slangp @@ -1,13 +1,13 @@ shaders = "2" -shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader0 = "shaders/color/psp-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" +scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/color/psp-color.slang" +shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear1 = "false" -scale_type1 = "source" +scale_type1 = "viewport" scale1 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-vba-color-motionblur.slangp b/handheld/lcd-grid-v2-vba-color-motionblur.slangp index 552b4fda..916c885a 100644 --- a/handheld/lcd-grid-v2-vba-color-motionblur.slangp +++ b/handheld/lcd-grid-v2-vba-color-motionblur.slangp @@ -5,14 +5,14 @@ filter_linear0 = "false" scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader1 = "shaders/color/vba-color.slang" filter_linear1 = "false" -scale_type1 = "viewport" +scale_type1 = "source" scale1 = "1.0" -shader2 = "shaders/color/vba-color.slang" +shader2 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear2 = "false" -scale_type2 = "source" +scale_type2 = "viewport" scale2 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid-v2-vba-color.slangp b/handheld/lcd-grid-v2-vba-color.slangp index 357b6425..fd4f0497 100644 --- a/handheld/lcd-grid-v2-vba-color.slangp +++ b/handheld/lcd-grid-v2-vba-color.slangp @@ -1,13 +1,13 @@ shaders = "2" -shader0 = "shaders/lcd-cgwg/lcd-grid-v2.slang" +shader0 = "shaders/color/vba-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" +scale_type0 = "source" scale0 = "1.0" -shader1 = "shaders/color/vba-color.slang" +shader1 = "shaders/lcd-cgwg/lcd-grid-v2.slang" filter_linear1 = "false" -scale_type1 = "source" +scale_type1 = "viewport" scale1 = "1.0" parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" diff --git a/handheld/lcd-grid.slangp b/handheld/lcd-grid.slangp index 959e4947..92a58e45 100644 --- a/handheld/lcd-grid.slangp +++ b/handheld/lcd-grid.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/lcd-cgwg/lcd-grid.slang filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/lcd1x.slangp b/handheld/lcd1x.slangp index 68ab4c7d..0abf7e95 100644 --- a/handheld/lcd1x.slangp +++ b/handheld/lcd1x.slangp @@ -8,3 +8,4 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport diff --git a/handheld/lcd1x_nds.slangp b/handheld/lcd1x_nds.slangp index e5e025f7..a91a2ac8 100644 --- a/handheld/lcd1x_nds.slangp +++ b/handheld/lcd1x_nds.slangp @@ -8,3 +8,4 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport diff --git a/handheld/lcd1x_psp.slangp b/handheld/lcd1x_psp.slangp index 531e50bc..984f043f 100644 --- a/handheld/lcd1x_psp.slangp +++ b/handheld/lcd1x_psp.slangp @@ -8,3 +8,4 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport diff --git a/handheld/lcd3x.slangp b/handheld/lcd3x.slangp index ad2fd45f..91a71e43 100644 --- a/handheld/lcd3x.slangp +++ b/handheld/lcd3x.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/lcd3x.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/retro-tiles.slangp b/handheld/retro-tiles.slangp index 63d829b2..9c4bac66 100644 --- a/handheld/retro-tiles.slangp +++ b/handheld/retro-tiles.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/retro-tiles.slang filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/retro-v2-nds-color.slangp b/handheld/retro-v2-nds-color.slangp index 56b69f3e..13482947 100644 --- a/handheld/retro-v2-nds-color.slangp +++ b/handheld/retro-v2-nds-color.slangp @@ -1,9 +1,9 @@ shaders = 2 -shader0 = "shaders/retro-v2.slang" +shader0 = "shaders/color/nds-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" -shader1 = "shaders/color/nds-color.slang" +shader1 = "shaders/retro-v2.slang" filter_linear1 = "false" +scale_type1 = "viewport" diff --git a/handheld/retro-v2.slangp b/handheld/retro-v2.slangp index 936f219b..c462d89e 100644 --- a/handheld/retro-v2.slangp +++ b/handheld/retro-v2.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/retro-v2.slang filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/retro-v3-nds-color.slangp b/handheld/retro-v3-nds-color.slangp index 685d7a2f..777f4f24 100644 --- a/handheld/retro-v3-nds-color.slangp +++ b/handheld/retro-v3-nds-color.slangp @@ -1,9 +1,9 @@ shaders = 2 -shader0 = "shaders/retro-v3.slang" +shader0 = "shaders/color/nds-color.slang" filter_linear0 = "false" -scale_type0 = "viewport" -shader1 = "shaders/color/nds-color.slang" +shader1 = "shaders/retro-v3.slang" filter_linear1 = "false" +scale_type1 = "viewport" diff --git a/handheld/retro-v3.slangp b/handheld/retro-v3.slangp index 80c3cc33..b978b78d 100644 --- a/handheld/retro-v3.slangp +++ b/handheld/retro-v3.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/retro-v3.slang filter_linear0 = false +scale_type0 = viewport diff --git a/handheld/sameboy-lcd-gbc-color-motionblur.slangp b/handheld/sameboy-lcd-gbc-color-motionblur.slangp index c1fbae89..9c88be10 100644 --- a/handheld/sameboy-lcd-gbc-color-motionblur.slangp +++ b/handheld/sameboy-lcd-gbc-color-motionblur.slangp @@ -5,11 +5,11 @@ filter_linear0 = false scale_type0 = source scale0 = 1.0 -shader1 = shaders/sameboy-lcd.slang +shader1 = shaders/color/gbc-color.slang filter_linear1 = false scale_type1 = viewport -scale1 = "1.0" -shader2 = shaders/color/gbc-color.slang +shader2 = shaders/sameboy-lcd.slang filter_linear2 = false scale_type2 = viewport +scale2 = "1.0" diff --git a/handheld/simpletex_lcd+gba-color-4k.slangp b/handheld/simpletex_lcd+gba-color-4k.slangp index 462f3317..c10bd8b9 100644 --- a/handheld/simpletex_lcd+gba-color-4k.slangp +++ b/handheld/simpletex_lcd+gba-color-4k.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/4k/textured_paper.png" diff --git a/handheld/simpletex_lcd+gba-color.slangp b/handheld/simpletex_lcd+gba-color.slangp index efd20bb7..f117083e 100644 --- a/handheld/simpletex_lcd+gba-color.slangp +++ b/handheld/simpletex_lcd+gba-color.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/2k/textured_paper.png" diff --git a/handheld/simpletex_lcd+gbc-color-4k.slangp b/handheld/simpletex_lcd+gbc-color-4k.slangp index 4bc765f2..4ab323cc 100644 --- a/handheld/simpletex_lcd+gbc-color-4k.slangp +++ b/handheld/simpletex_lcd+gbc-color-4k.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/4k/textured_paper.png" diff --git a/handheld/simpletex_lcd+gbc-color.slangp b/handheld/simpletex_lcd+gbc-color.slangp index 08b86674..6a859c3b 100644 --- a/handheld/simpletex_lcd+gbc-color.slangp +++ b/handheld/simpletex_lcd+gbc-color.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/2k/textured_paper.png" diff --git a/handheld/simpletex_lcd-4k.slangp b/handheld/simpletex_lcd-4k.slangp index 48be5b21..aba9b660 100644 --- a/handheld/simpletex_lcd-4k.slangp +++ b/handheld/simpletex_lcd-4k.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/4k/textured_paper.png" diff --git a/handheld/simpletex_lcd.slangp b/handheld/simpletex_lcd.slangp index d58dcab8..6aa56ad8 100644 --- a/handheld/simpletex_lcd.slangp +++ b/handheld/simpletex_lcd.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/2k/textured_paper.png" diff --git a/handheld/simpletex_lcd_720p+gba-color.slangp b/handheld/simpletex_lcd_720p+gba-color.slangp index 10848265..1e291503 100644 --- a/handheld/simpletex_lcd_720p+gba-color.slangp +++ b/handheld/simpletex_lcd_720p+gba-color.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/2k/textured_paper.png" diff --git a/handheld/simpletex_lcd_720p+gbc-color.slangp b/handheld/simpletex_lcd_720p+gbc-color.slangp index 87683b05..e4bc2fcb 100644 --- a/handheld/simpletex_lcd_720p+gbc-color.slangp +++ b/handheld/simpletex_lcd_720p+gbc-color.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/2k/textured_paper.png" diff --git a/handheld/simpletex_lcd_720p.slangp b/handheld/simpletex_lcd_720p.slangp index a60002a7..a94f60fb 100644 --- a/handheld/simpletex_lcd_720p.slangp +++ b/handheld/simpletex_lcd_720p.slangp @@ -8,6 +8,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" +scale_type0 = viewport textures = "BACKGROUND" BACKGROUND = "shaders/simpletex_lcd/png/2k/textured_paper.png" diff --git a/handheld/zfast-lcd.slangp b/handheld/zfast-lcd.slangp index ca4f5e79..cec98666 100644 --- a/handheld/zfast-lcd.slangp +++ b/handheld/zfast-lcd.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/zfast_lcd.slang filter_linear0 = true +scale_type0 = viewport diff --git a/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp b/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp index 33a05c05..27adac0e 100644 --- a/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp +++ b/hdr/crt-sony-megatron-aeg-CTV-4800-VT-hdr.slangp @@ -37,6 +37,7 @@ mipmap_input4 = "false" alias4 = "" float_framebuffer4 = "false" srgb_framebuffer4 = "false" +scale_type4 = viewport hcrt_hdr = "1.000000" hcrt_crt_screen_type = "2.000000" diff --git a/hdr/shaders/crt-sony-megatron.slangp b/hdr/shaders/crt-sony-megatron.slangp index d0bd75e5..10476b9d 100644 --- a/hdr/shaders/crt-sony-megatron.slangp +++ b/hdr/shaders/crt-sony-megatron.slangp @@ -1,30 +1,29 @@ -/* -Sony Megatron Colour Video Monitor -Author: Major Pain The Cactus +#Sony Megatron Colour Video Monitor +#Author: Major Pain The Cactus +# +#A shader that specifically tries to emulate arcade monitor's with an shadow mask screen but with full brightness. +# +#The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies +#an shadow mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). +# +#My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close. I think DisplayHDR 1000 and above will be able to match. +# +#To use: +#Please Enable HDR in RetroArch 1.10+ +#[UPDATE] This shader supports SDR as well - just enable it in the shader parameters +# +#NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters +# +#For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor. +# +#Also try to use a integer scaling - its just better - overscaling is fine/great. +# +#This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them +# +#Works only with the D3D11/D3D12/Vulkan drivers currently +# +#DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory -A shader that specifically tries to emulate arcade monitor's with an shadow mask screen but with full brightness. - -The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies -an shadow mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). - -My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close. I think DisplayHDR 1000 and above will be able to match. - -To use: -Please Enable HDR in RetroArch 1.10+ -[UPDATE] This shader supports SDR as well - just enable it in the shader parameters - -NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters - -For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor. - -Also try to use a integer scaling - its just better - overscaling is fine/great. - -This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them - -Works only with the D3D11/D3D12/Vulkan drivers currently - -DONT USE THIS PRESET DIRECTLY - Use any of the others in this directory -*/ shaders = "3" feedback_pass = "0" @@ -54,3 +53,4 @@ mipmap_input2 = "false" alias2 = "" float_framebuffer2 = "false" srgb_framebuffer2 = "false" +scale_type2 = viewport diff --git a/interpolation/aann.slangp b/interpolation/aann.slangp index e70f9fc7..ad053534 100644 --- a/interpolation/aann.slangp +++ b/interpolation/aann.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "shaders/aann.slang" filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/bandlimit-pixel.slangp b/interpolation/bandlimit-pixel.slangp index cf1376fe..99f6e282 100644 --- a/interpolation/bandlimit-pixel.slangp +++ b/interpolation/bandlimit-pixel.slangp @@ -8,3 +8,4 @@ scale0 = 1.0 srgb_framebuffer0 = true filter_linear1 = true +scale_type1 = viewport diff --git a/interpolation/controlled_sharpness.slangp b/interpolation/controlled_sharpness.slangp index f8ef628f..1dee29bc 100644 --- a/interpolation/controlled_sharpness.slangp +++ b/interpolation/controlled_sharpness.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/ControlledSharpness.slang filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/grid-blend-hybrid.slangp b/interpolation/grid-blend-hybrid.slangp index 63e7cdd9..6e3f949c 100644 --- a/interpolation/grid-blend-hybrid.slangp +++ b/interpolation/grid-blend-hybrid.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/grid-blend-hybrid.slang -filter_linear0 = true \ No newline at end of file +filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/pixellate.slangp b/interpolation/pixellate.slangp index f2be4d8c..69bd31d3 100644 --- a/interpolation/pixellate.slangp +++ b/interpolation/pixellate.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/pixellate.slang filter_linear0 = false +scale_type0 = viewport diff --git a/interpolation/quilez.slangp b/interpolation/quilez.slangp index 06211e7b..79220469 100644 --- a/interpolation/quilez.slangp +++ b/interpolation/quilez.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/quilez.slang -filter_linear0 = true \ No newline at end of file +filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/sharp-bilinear-2x-prescale.slangp b/interpolation/sharp-bilinear-2x-prescale.slangp index 54cf3a89..e17e40a5 100644 --- a/interpolation/sharp-bilinear-2x-prescale.slangp +++ b/interpolation/sharp-bilinear-2x-prescale.slangp @@ -4,4 +4,5 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 shader1 = "../stock.slang" -filter_linear1 = true \ No newline at end of file +filter_linear1 = true +scale_type1 = viewport diff --git a/interpolation/sharp-bilinear-scanlines.slangp b/interpolation/sharp-bilinear-scanlines.slangp index dc8bc5f4..dcbb4469 100644 --- a/interpolation/sharp-bilinear-scanlines.slangp +++ b/interpolation/sharp-bilinear-scanlines.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "shaders/sharp-bilinear-scanlines.slang" filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/sharp-bilinear-simple.slangp b/interpolation/sharp-bilinear-simple.slangp index c78dfdba..f2528a5c 100644 --- a/interpolation/sharp-bilinear-simple.slangp +++ b/interpolation/sharp-bilinear-simple.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "shaders/sharp-bilinear-simple.slang" filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/sharp-bilinear.slangp b/interpolation/sharp-bilinear.slangp index 455f098c..ca109f5e 100644 --- a/interpolation/sharp-bilinear.slangp +++ b/interpolation/sharp-bilinear.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "shaders/sharp-bilinear.slang" filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/smootheststep.slangp b/interpolation/smootheststep.slangp index dc63c8a4..91bd97d8 100644 --- a/interpolation/smootheststep.slangp +++ b/interpolation/smootheststep.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/smootheststep.slang -filter_linear0 = true \ No newline at end of file +filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/smuberstep.slangp b/interpolation/smuberstep.slangp index f41bfb9e..9d24620e 100644 --- a/interpolation/smuberstep.slangp +++ b/interpolation/smuberstep.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/SmuberStep.slang filter_linear0 = true +scale_type0 = viewport diff --git a/misc/accessibility_mods.slangp b/misc/accessibility_mods.slangp index 46adea31..e37f3cbd 100644 --- a/misc/accessibility_mods.slangp +++ b/misc/accessibility_mods.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/accessibility_mods.slang +scale_type0 = source diff --git a/misc/anti-flicker.slangp b/misc/anti-flicker.slangp index 4184db9a..3cd40872 100644 --- a/misc/anti-flicker.slangp +++ b/misc/anti-flicker.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/anti-flicker.slang +scale_type0 = source diff --git a/misc/ascii.slangp b/misc/ascii.slangp index 2c95b11e..5751b94f 100644 --- a/misc/ascii.slangp +++ b/misc/ascii.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/ascii.slang +scale_type0 = viewport diff --git a/misc/bead.slangp b/misc/bead.slangp index b9d44cbb..65270c7f 100644 --- a/misc/bead.slangp +++ b/misc/bead.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/bead.slang filter_linear0 = false +scale_type0 = viewport diff --git a/misc/bob-deinterlacing.slangp b/misc/bob-deinterlacing.slangp index 58e59b38..2617480b 100644 --- a/misc/bob-deinterlacing.slangp +++ b/misc/bob-deinterlacing.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/bob-deinterlacing.slang +scale_type0 = source diff --git a/misc/chroma.slangp b/misc/chroma.slangp index 6eb115a6..ab7b0173 100644 --- a/misc/chroma.slangp +++ b/misc/chroma.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/chroma.slang +scale_type0 = source diff --git a/misc/cmyk-halftone-dot.slangp b/misc/cmyk-halftone-dot.slangp index 423c3bba..6ec902e1 100644 --- a/misc/cmyk-halftone-dot.slangp +++ b/misc/cmyk-halftone-dot.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/cmyk-halftone-dot.slang +scale_type0 = viewport diff --git a/misc/cocktail-cabinet.slangp b/misc/cocktail-cabinet.slangp index 6a6f1858..90f11136 100644 --- a/misc/cocktail-cabinet.slangp +++ b/misc/cocktail-cabinet.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/cocktail-cabinet.slang +scale_type0 = source diff --git a/misc/color-mangler.slangp b/misc/color-mangler.slangp index b499b2df..e1291690 100644 --- a/misc/color-mangler.slangp +++ b/misc/color-mangler.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/color-mangler.slang +scale_type0 = source diff --git a/misc/colorimetry.slangp b/misc/colorimetry.slangp index f87c301c..ad9403a4 100644 --- a/misc/colorimetry.slangp +++ b/misc/colorimetry.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/colorimetry.slang +scale_type0 = source diff --git a/misc/deband.slangp b/misc/deband.slangp index 9833fba5..664ab6f0 100644 --- a/misc/deband.slangp +++ b/misc/deband.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/deband.slang +scale_type0 = source diff --git a/misc/deinterlace.slangp b/misc/deinterlace.slangp index 8d1808b3..ace2ced9 100644 --- a/misc/deinterlace.slangp +++ b/misc/deinterlace.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/deinterlace.slang +scale_type0 = source diff --git a/misc/edge-detect.slangp b/misc/edge-detect.slangp index 4a36614d..93eb6724 100644 --- a/misc/edge-detect.slangp +++ b/misc/edge-detect.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/edge-detect.slang +scale_type0 = source diff --git a/misc/glass.slangp b/misc/glass.slangp index 7b0b180f..30716a6e 100644 --- a/misc/glass.slangp +++ b/misc/glass.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/glass.slang +scale_type0 = viewport diff --git a/misc/grade.slangp b/misc/grade.slangp index ee57558a..6fdd2a85 100644 --- a/misc/grade.slangp +++ b/misc/grade.slangp @@ -1,6 +1,7 @@ shaders = 1 shader0 = shaders/grade.slang +scale_type0 = source textures = "SamplerLUT1;SamplerLUT2" SamplerLUT1 = "../crt/shaders/guest/advanced/lut/trinitron-lut.png" diff --git a/misc/image-adjustment.slangp b/misc/image-adjustment.slangp index 831bda94..3894cc93 100644 --- a/misc/image-adjustment.slangp +++ b/misc/image-adjustment.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/image-adjustment.slang +scale_type0 = source diff --git a/misc/img_mod.slangp b/misc/img_mod.slangp index 3ac88863..5a756ee2 100644 --- a/misc/img_mod.slangp +++ b/misc/img_mod.slangp @@ -1,6 +1,7 @@ shaders = 1 shader0 = shaders/img_mod.slang +scale_type0 = viewport textures = "SamplerLUT1;SamplerLUT2" SamplerLUT1 = ../reshade/shaders/LUT/16.png diff --git a/misc/interlacing.slangp b/misc/interlacing.slangp index 1a79f2dd..3467b4d9 100644 --- a/misc/interlacing.slangp +++ b/misc/interlacing.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/interlacing.slang +scale_type0 = source diff --git a/misc/natural-vision.slangp b/misc/natural-vision.slangp index ca37e6bc..b92c0011 100644 --- a/misc/natural-vision.slangp +++ b/misc/natural-vision.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/natural-vision.slang +scale_type0 = source diff --git a/misc/ntsc-colors.slangp b/misc/ntsc-colors.slangp index ff2fa8c3..c785ff64 100644 --- a/misc/ntsc-colors.slangp +++ b/misc/ntsc-colors.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/ntsc-colors.slang +scale_type0 = source diff --git a/misc/ss-gamma-ramp.slangp b/misc/ss-gamma-ramp.slangp index d0da3047..9a140df1 100644 --- a/misc/ss-gamma-ramp.slangp +++ b/misc/ss-gamma-ramp.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/ss-gamma-ramp.slang +scale_type0 = source diff --git a/misc/tonemapping.slangp b/misc/tonemapping.slangp index 0e61b0ca..e4c1d9e5 100644 --- a/misc/tonemapping.slangp +++ b/misc/tonemapping.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/tonemapping.slang +scale_type0 = source diff --git a/misc/white_point.slangp b/misc/white_point.slangp index 7dbf146c..887d09bf 100644 --- a/misc/white_point.slangp +++ b/misc/white_point.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/white_point.slang +scale_type0 = source diff --git a/misc/yiq-hue-adjustment.slangp b/misc/yiq-hue-adjustment.slangp index 03b1e33e..26e3d7bb 100644 --- a/misc/yiq-hue-adjustment.slangp +++ b/misc/yiq-hue-adjustment.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/yiq-hue-adjustment.slang +scale_type0 = source diff --git a/motion-interpolation/motion_interpolation.slangp b/motion-interpolation/motion_interpolation.slangp index 7f34af3c..17948470 100644 --- a/motion-interpolation/motion_interpolation.slangp +++ b/motion-interpolation/motion_interpolation.slangp @@ -3,6 +3,7 @@ shaders = 2 shader0 = shaders/motion_interpolation/motion_interpolation_pass0.slang alias0 = Pass0 filter_linear0 = true +scale_type0 = viewport shader1 = shaders/motion_interpolation/motion_interpolation_pass3.slang filter_linear1 = true diff --git a/motionblur/braid-rewind.slangp b/motionblur/braid-rewind.slangp index 9e2f9348..fb10aefe 100644 --- a/motionblur/braid-rewind.slangp +++ b/motionblur/braid-rewind.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/braid-rewind.slang filter_linear0 = false +scale_type0 = source diff --git a/motionblur/mix_frames.slangp b/motionblur/mix_frames.slangp index d23da437..da4bfb74 100644 --- a/motionblur/mix_frames.slangp +++ b/motionblur/mix_frames.slangp @@ -3,3 +3,4 @@ shaders = "1" shader0 = "shaders/mix_frames.slang" filter_linear0 = "false" +scale_type0 = source diff --git a/motionblur/mix_frames_smart.slangp b/motionblur/mix_frames_smart.slangp index 0487327b..0aada18a 100644 --- a/motionblur/mix_frames_smart.slangp +++ b/motionblur/mix_frames_smart.slangp @@ -2,3 +2,4 @@ shaders = "1" shader0 = "shaders/mix_frames_smart.slang" filter_linear0 = "false" +scale_type0 = source diff --git a/motionblur/motionblur-blue.slangp b/motionblur/motionblur-blue.slangp index 6ad98847..5603d4ac 100644 --- a/motionblur/motionblur-blue.slangp +++ b/motionblur/motionblur-blue.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/motionblur-blue.slang filter_linear0 = false +scale_type0 = source diff --git a/motionblur/motionblur-color.slangp b/motionblur/motionblur-color.slangp index 9c87180d..9a70dd2f 100644 --- a/motionblur/motionblur-color.slangp +++ b/motionblur/motionblur-color.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/motionblur-color.slang filter_linear0 = false +scale_type0 = source diff --git a/motionblur/motionblur-simple.slangp b/motionblur/motionblur-simple.slangp index 45510872..b101e5a4 100644 --- a/motionblur/motionblur-simple.slangp +++ b/motionblur/motionblur-simple.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/motionblur-simple.slang filter_linear0 = false +scale_type0 = source diff --git a/motionblur/response-time.slangp b/motionblur/response-time.slangp index 47ab0cf8..34af752f 100644 --- a/motionblur/response-time.slangp +++ b/motionblur/response-time.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/response-time.slang filter_linear0 = false +scale_type0 = source diff --git a/nedi/fast-bilateral-nedi.slangp b/nedi/fast-bilateral-nedi.slangp index afee3891..b662bf0c 100644 --- a/nedi/fast-bilateral-nedi.slangp +++ b/nedi/fast-bilateral-nedi.slangp @@ -29,4 +29,5 @@ scale_y3 = "1.000000" shader4 = "shaders/nedi-jinc.slang" filter_linear4 = false wrap_mode4 = "clamp_to_border" -float_framebuffer4 = "false" \ No newline at end of file +float_framebuffer4 = "false" +scale_type4 = viewport diff --git a/nedi/nedi.slangp b/nedi/nedi.slangp index 9d94c797..c9f09c68 100644 --- a/nedi/nedi.slangp +++ b/nedi/nedi.slangp @@ -26,4 +26,5 @@ scale_y2 = "1.000000" shader3 = "shaders/nedi-jinc.slang" filter_linear3 = false wrap_mode3 = "clamp_to_border" -float_framebuffer3 = "false" \ No newline at end of file +float_framebuffer3 = "false" +scale_type3 = viewport diff --git a/nes_raw_palette/cgwg-famicom-geom.slangp b/nes_raw_palette/cgwg-famicom-geom.slangp index 020e1dc8..66325330 100644 --- a/nes_raw_palette/cgwg-famicom-geom.slangp +++ b/nes_raw_palette/cgwg-famicom-geom.slangp @@ -23,3 +23,4 @@ filter_linear3 = false float_framebuffer3 = true shader4 = shaders/cgwg-famicom-geom/crt-geom-famicom.slang +scale_type4 = viewport diff --git a/nnedi3/nnedi3-nns16-2x-luma.slangp b/nnedi3/nnedi3-nns16-2x-luma.slangp index 6392e16c..bfe5d689 100644 --- a/nnedi3/nnedi3-nns16-2x-luma.slangp +++ b/nnedi3/nnedi3-nns16-2x-luma.slangp @@ -42,4 +42,5 @@ scale_x5 = 1.0 scale_y5 = 1.0 shader6 = ../windowed/shaders/jinc2.slang -filter_linear6 = false \ No newline at end of file +filter_linear6 = false +scale_type6 = viewport diff --git a/nnedi3/nnedi3-nns16-2x-rgb.slangp b/nnedi3/nnedi3-nns16-2x-rgb.slangp index 7b226716..6f3aea67 100644 --- a/nnedi3/nnedi3-nns16-2x-rgb.slangp +++ b/nnedi3/nnedi3-nns16-2x-rgb.slangp @@ -19,4 +19,5 @@ scale_x2 = 1.0 scale_y2 = 1.0 shader3 = ../windowed/shaders/jinc2.slang -filter_linear3 = false \ No newline at end of file +filter_linear3 = false +scale_type3 = viewport diff --git a/nnedi3/nnedi3-nns16-4x-luma.slangp b/nnedi3/nnedi3-nns16-4x-luma.slangp index cea7d178..eae0c3eb 100644 --- a/nnedi3/nnedi3-nns16-4x-luma.slangp +++ b/nnedi3/nnedi3-nns16-4x-luma.slangp @@ -63,4 +63,5 @@ scale_x8 = 1.0 scale_y8 = 1.0 shader9 = ../windowed/shaders/jinc2.slang -filter_linear9 = false \ No newline at end of file +filter_linear9 = false +scale_type9 = viewport diff --git a/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp b/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp index 13200752..d851776f 100644 --- a/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp +++ b/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp @@ -63,4 +63,5 @@ scale_x8 = 1.0 scale_y8 = 1.0 shader9 = ../windowed/shaders/jinc2.slang -filter_linear9 = false \ No newline at end of file +filter_linear9 = false +scale_type9 = viewport diff --git a/nnedi3/nnedi3-nns32-4x-rgb.slangp b/nnedi3/nnedi3-nns32-4x-rgb.slangp index 84bab60e..d54eb78e 100644 --- a/nnedi3/nnedi3-nns32-4x-rgb.slangp +++ b/nnedi3/nnedi3-nns32-4x-rgb.slangp @@ -37,4 +37,5 @@ scale_x5 = 1.0 scale_y5 = 1.0 shader6 = ../windowed/shaders/jinc2.slang -filter_linear6 = false \ No newline at end of file +filter_linear6 = false +scale_type6 = viewport diff --git a/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp b/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp index 5dec2551..023f6b98 100644 --- a/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp +++ b/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp @@ -55,4 +55,5 @@ scale_x8 = 1.0 scale_y8 = 1.0 shader9 = ../windowed/shaders/jinc2.slang -filter_linear9 = false \ No newline at end of file +filter_linear9 = false +scale_type9 = viewport diff --git a/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp b/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp index 9850a3b9..55e145ac 100644 --- a/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp +++ b/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp @@ -37,4 +37,5 @@ scale_x5 = 1.0 scale_y5 = 1.0 shader6 = ../windowed/shaders/jinc2.slang -filter_linear6 = false \ No newline at end of file +filter_linear6 = false +scale_type6 = viewport diff --git a/ntsc/mame-ntsc.slangp b/ntsc/mame-ntsc.slangp index e3572010..0f22fba3 100644 --- a/ntsc/mame-ntsc.slangp +++ b/ntsc/mame-ntsc.slangp @@ -6,4 +6,5 @@ filter_linear0 = true scale0 = 1.0 shader1 = shaders/mame-ntsc/mame-postproc.slang -filter_linear1 = true \ No newline at end of file +filter_linear1 = true +scale_type1 = viewport diff --git a/omniscale/omniscale-legacy.slangp b/omniscale/omniscale-legacy.slangp index 5804a70b..9efac209 100644 --- a/omniscale/omniscale-legacy.slangp +++ b/omniscale/omniscale-legacy.slangp @@ -1,6 +1,5 @@ shaders = 1 shader0 = shaders/omniscale-legacy.slang -scale_type0 = source +scale_type0 = viewport filter_linear0 = false -scale0 = 5.0 \ No newline at end of file diff --git a/omniscale/omniscale.slangp b/omniscale/omniscale.slangp index 2f3a16d6..df637d6a 100644 --- a/omniscale/omniscale.slangp +++ b/omniscale/omniscale.slangp @@ -1,6 +1,5 @@ shaders = 1 shader0 = shaders/omniscale.slang -scale_type0 = source +scale_type0 = viewport filter_linear0 = false -scale0 = 10.0 \ No newline at end of file diff --git a/pal/pal-r57shell-moire-only.slangp b/pal/pal-r57shell-moire-only.slangp index d6e5dce2..1ee7e620 100644 --- a/pal/pal-r57shell-moire-only.slangp +++ b/pal/pal-r57shell-moire-only.slangp @@ -1,3 +1,4 @@ shaders = 1 -shader0 = shaders/pal-r57shell-moire-only.slang \ No newline at end of file +shader0 = shaders/pal-r57shell-moire-only.slang +scale_type0 = source diff --git a/pal/pal-singlepass.slangp b/pal/pal-singlepass.slangp index 413b1c90..f910ab4f 100644 --- a/pal/pal-singlepass.slangp +++ b/pal/pal-singlepass.slangp @@ -1,3 +1,4 @@ shaders = 1 -shader0 = shaders/pal-singlepass.slang \ No newline at end of file +shader0 = shaders/pal-singlepass.slang +scale_type0 = source diff --git a/reshade/NormalsDisplacement.slangp b/reshade/NormalsDisplacement.slangp index 9f3301b2..1b484258 100644 --- a/reshade/NormalsDisplacement.slangp +++ b/reshade/NormalsDisplacement.slangp @@ -1,6 +1,7 @@ shaders = 1 shader0 = shaders/NormalsDisplacement/NormalsDisplacement.slang +scale_type0 = viewport textures = "displacementMap" displacementMap = shaders/NormalsDisplacement/CurveNormals.png diff --git a/reshade/blendoverlay.slangp b/reshade/blendoverlay.slangp index 089918fe..344ebe67 100644 --- a/reshade/blendoverlay.slangp +++ b/reshade/blendoverlay.slangp @@ -1,5 +1,6 @@ shaders = 1 shader0 = shaders/blendoverlay/blendoverlay.slang +scale_type0 = viewport textures = "overlay" # change this path to point to your overlay image diff --git a/reshade/halftone-print.slangp b/reshade/halftone-print.slangp index 439d82ea..d1a3021b 100644 --- a/reshade/halftone-print.slangp +++ b/reshade/halftone-print.slangp @@ -3,6 +3,7 @@ shaders = 2 shader0 = shaders/LUT/LUT.slang shader1 = ../misc/shaders/cmyk-halftone-dot.slang filter_linear1 = true +scale_type0 = viewport textures = SamplerLUT diff --git a/reshade/lut.slangp b/reshade/lut.slangp index cc0de845..a4ee9ef2 100644 --- a/reshade/lut.slangp +++ b/reshade/lut.slangp @@ -1,6 +1,7 @@ shaders = 1 shader0 = shaders/LUT/LUT.slang +scale_type0 = source textures = SamplerLUT diff --git a/sabr/sabr-hybrid-deposterize.slangp b/sabr/sabr-hybrid-deposterize.slangp index de4b8384..101698e5 100644 --- a/sabr/sabr-hybrid-deposterize.slangp +++ b/sabr/sabr-hybrid-deposterize.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/sabr-hybrid-deposterize.slang filter_linear0 = false +scale_type0 = viewport diff --git a/sabr/sabr.slangp b/sabr/sabr.slangp index 9d3a6dca..7c879b9f 100644 --- a/sabr/sabr.slangp +++ b/sabr/sabr.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/sabr-v3.0.slang filter_linear0 = false +scale_type0 = viewport diff --git a/scalefx/scalefx+rAA.slangp b/scalefx/scalefx+rAA.slangp index 28cf8e04..488f265e 100644 --- a/scalefx/scalefx+rAA.slangp +++ b/scalefx/scalefx+rAA.slangp @@ -42,5 +42,6 @@ filter_linear7 = false scale_type7 = source scale7 = 1.0 -shader8 = ../stock.slang -filter_linear8 = true +shader8 = ../bicubic/bicubic.slang +filter_linear8 = false +scale_type0 = viewport diff --git a/scalehq/2xScaleHQ.slangp b/scalehq/2xScaleHQ.slangp index 998cfe05..e9e62e36 100644 --- a/scalehq/2xScaleHQ.slangp +++ b/scalehq/2xScaleHQ.slangp @@ -14,4 +14,5 @@ scale1 = 1.0 shader2 = ../cubic/shaders/bicubic-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/scalehq/4xScaleHQ.slangp b/scalehq/4xScaleHQ.slangp index 668f117a..0e994ca7 100644 --- a/scalehq/4xScaleHQ.slangp +++ b/scalehq/4xScaleHQ.slangp @@ -14,4 +14,5 @@ scale1 = 1.0 shader2 = ../cubic/shaders/bicubic-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/scalenx/epx.slangp b/scalenx/epx.slangp index e746a24f..0d2e91f1 100644 --- a/scalenx/epx.slangp +++ b/scalenx/epx.slangp @@ -1,6 +1,10 @@ -shaders = 1 +shaders = 2 shader0 = shaders/epx.slang filter_linear0 = false scale_type0 = source scale0 = 2.0 + +shader1 = ../cubic/bicubic.slang +filter_linear1 = false +scale_type1 = viewport diff --git a/scalenx/mmpx.slangp b/scalenx/mmpx.slangp index ef440685..a4325ae1 100644 --- a/scalenx/mmpx.slangp +++ b/scalenx/mmpx.slangp @@ -1,6 +1,10 @@ -shaders = 1 +shaders = 2 shader0 = shaders/mmpx.slang filter_linear0 = false scale_type0 = source scale0 = 2.0 + +shader1 = ../cubic/bicubic.slang +filter_linear1 = false +scale_type1 = viewport diff --git a/scalenx/scale2x.slangp b/scalenx/scale2x.slangp index 6d1110c1..f77d85e3 100644 --- a/scalenx/scale2x.slangp +++ b/scalenx/scale2x.slangp @@ -6,5 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/bicubic.slang +filter_linear1 = false +scale_type1 = viewport diff --git a/scalenx/scale2xSFX.slangp b/scalenx/scale2xSFX.slangp index 3bb80dc8..b0307367 100644 --- a/scalenx/scale2xSFX.slangp +++ b/scalenx/scale2xSFX.slangp @@ -6,5 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/bicubic.slang +filter_linear1 = false +scale_type1 = viewport diff --git a/scalenx/scale2xplus.slangp b/scalenx/scale2xplus.slangp index e0c3b353..0851ca51 100644 --- a/scalenx/scale2xplus.slangp +++ b/scalenx/scale2xplus.slangp @@ -6,5 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/bicubic.slang +filter_linear1 = false +scale_type1 = viewport diff --git a/scalenx/scale3x.slangp b/scalenx/scale3x.slangp index ee414116..149c4ab5 100644 --- a/scalenx/scale3x.slangp +++ b/scalenx/scale3x.slangp @@ -6,5 +6,6 @@ scale_type0 = source scale_x0 = 3.0 scale_y0 = 3.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/bicubic.slang +filter_linear1 = false +scale_type1 = viewport diff --git a/scanlines/integer-scaling-scanlines.slangp b/scanlines/integer-scaling-scanlines.slangp index 1ccd9dbe..61c2713c 100644 --- a/scanlines/integer-scaling-scanlines.slangp +++ b/scanlines/integer-scaling-scanlines.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/integer-scaling-scanlines.slang filter_linear0 = false +scale_type0 = viewport diff --git a/scanlines/res-independent-scanlines.slangp b/scanlines/res-independent-scanlines.slangp index 5eb70ef3..3431eea1 100644 --- a/scanlines/res-independent-scanlines.slangp +++ b/scanlines/res-independent-scanlines.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/res-independent-scanlines.slang +scale_type0 = viewport diff --git a/scanlines/scanline-fract.slangp b/scanlines/scanline-fract.slangp index 884202ec..b3417f0b 100644 --- a/scanlines/scanline-fract.slangp +++ b/scanlines/scanline-fract.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/scanline-fract.slang +scale_type0 = viewport diff --git a/scanlines/scanline.slangp b/scanlines/scanline.slangp index a64041ce..06931bb3 100644 --- a/scanlines/scanline.slangp +++ b/scanlines/scanline.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/scanline.slang +scale_type0 = viewport diff --git a/scanlines/scanlines-rere.slangp b/scanlines/scanlines-rere.slangp index a448987b..00a4b026 100644 --- a/scanlines/scanlines-rere.slangp +++ b/scanlines/scanlines-rere.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/scanlines-rere.slang filter_linear0 = true +scale_type0 = viewport diff --git a/scanlines/scanlines-sine-abs.slangp b/scanlines/scanlines-sine-abs.slangp index 10058763..84bb1d95 100644 --- a/scanlines/scanlines-sine-abs.slangp +++ b/scanlines/scanlines-sine-abs.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/scanlines-sine-abs.slang +scale_type0 = viewport diff --git a/sharpen/adaptive-sharpen-multipass.slangp b/sharpen/adaptive-sharpen-multipass.slangp index ff8ed65c..fbc2180e 100644 --- a/sharpen/adaptive-sharpen-multipass.slangp +++ b/sharpen/adaptive-sharpen-multipass.slangp @@ -5,3 +5,4 @@ filter_linear0 = false scale_type0 = source shader1 = shaders/adaptive-sharpen-pass2.slang filter_linear1 = false +scale_type0 = source diff --git a/sharpen/adaptive-sharpen.slangp b/sharpen/adaptive-sharpen.slangp index 34ba8923..04385b86 100644 --- a/sharpen/adaptive-sharpen.slangp +++ b/sharpen/adaptive-sharpen.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/adaptive-sharpen.slang filter_linear0 = false +scale_type0 = source diff --git a/sharpen/super-xbr-super-res.slangp b/sharpen/super-xbr-super-res.slangp index 110bcc72..a7a9453e 100644 --- a/sharpen/super-xbr-super-res.slangp +++ b/sharpen/super-xbr-super-res.slangp @@ -49,4 +49,4 @@ scale9 = "1.000000" shader10 = "../xbr/shaders/super-xbr/custom-jinc2-sharper.slang" filter_linear10 = "false" - +scale_type10 = viewport diff --git a/stereoscopic-3d/anaglyph-to-side-by-side.slangp b/stereoscopic-3d/anaglyph-to-side-by-side.slangp index fb59d433..15b22911 100644 --- a/stereoscopic-3d/anaglyph-to-side-by-side.slangp +++ b/stereoscopic-3d/anaglyph-to-side-by-side.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/anaglyph-to-side-by-side.slang +scale_type0 = source diff --git a/stereoscopic-3d/shutter-to-anaglyph.slangp b/stereoscopic-3d/shutter-to-anaglyph.slangp index 045ad504..059682d2 100644 --- a/stereoscopic-3d/shutter-to-anaglyph.slangp +++ b/stereoscopic-3d/shutter-to-anaglyph.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/shutter-to-anaglyph.slang +scale_type0 = source diff --git a/stereoscopic-3d/shutter-to-side-by-side.slangp b/stereoscopic-3d/shutter-to-side-by-side.slangp index d7516922..655aa05a 100644 --- a/stereoscopic-3d/shutter-to-side-by-side.slangp +++ b/stereoscopic-3d/shutter-to-side-by-side.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/shutter-to-side-by-side.slang +scale_type0 = source diff --git a/stereoscopic-3d/side-by-side-simple.slangp b/stereoscopic-3d/side-by-side-simple.slangp index fb44af29..b766dd34 100644 --- a/stereoscopic-3d/side-by-side-simple.slangp +++ b/stereoscopic-3d/side-by-side-simple.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/side-by-side-simple.slang +scale_type0 = viewport diff --git a/stereoscopic-3d/side-by-side-to-interlaced.slangp b/stereoscopic-3d/side-by-side-to-interlaced.slangp index e3f9cc47..f18dd710 100644 --- a/stereoscopic-3d/side-by-side-to-interlaced.slangp +++ b/stereoscopic-3d/side-by-side-to-interlaced.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/sbs-to-interlaced.slang +scale_type0 = source diff --git a/stereoscopic-3d/side-by-side-to-shutter.slangp b/stereoscopic-3d/side-by-side-to-shutter.slangp index 645dce3b..a6b5d0a9 100644 --- a/stereoscopic-3d/side-by-side-to-shutter.slangp +++ b/stereoscopic-3d/side-by-side-to-shutter.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/sbs-to-shutter.slang +scale_type0 = source diff --git a/vhs/gristleVHS.slangp b/vhs/gristleVHS.slangp index 855426ea..30eacc3d 100644 --- a/vhs/gristleVHS.slangp +++ b/vhs/gristleVHS.slangp @@ -25,3 +25,4 @@ filter_linear3 = true shader4 = ../stock.slang filter_linear4 = true +scale_type4 = viewport diff --git a/vhs/mudlord-pal-vhs.slangp b/vhs/mudlord-pal-vhs.slangp index 592f1fe6..4ea791ef 100644 --- a/vhs/mudlord-pal-vhs.slangp +++ b/vhs/mudlord-pal-vhs.slangp @@ -1,3 +1,4 @@ shaders = 1 shader0 = shaders/mudlord-pal-vhs.slang +scale_type0 = viewport diff --git a/vhs/ntsc-vcr.slangp b/vhs/ntsc-vcr.slangp index f849242b..b6d9c5d8 100644 --- a/vhs/ntsc-vcr.slangp +++ b/vhs/ntsc-vcr.slangp @@ -24,7 +24,7 @@ scale_type_y2 = viewport scale2 = 1.0 scale_type3 = source -scale4 = 1.0 +scale_type4 = source parameters = "GRAIN_STR;luminance;bright_boost;target_gamma;saturation" GRAIN_STR = 6.0 diff --git a/vhs/vhs.slangp b/vhs/vhs.slangp index 0f86a6a1..b5d207c2 100644 --- a/vhs/vhs.slangp +++ b/vhs/vhs.slangp @@ -5,7 +5,8 @@ filter_linear0 = true shader1 = shaders/rewind.slang filter_linear1 = true +scale_type1 = source textures = "rew;play" play = resources/play.png -rew = resources/rew.png \ No newline at end of file +rew = resources/rew.png diff --git a/vhs/vhs_mpalko.slangp b/vhs/vhs_mpalko.slangp index 44312a5c..caba550c 100644 --- a/vhs/vhs_mpalko.slangp +++ b/vhs/vhs_mpalko.slangp @@ -12,7 +12,8 @@ filter_linear1 = true shader2 = shaders/rewind.slang filter_linear2 = true +scale_type2 = viewport textures = "rew;play" play = resources/play.png -rew = resources/rew.png \ No newline at end of file +rew = resources/rew.png diff --git a/windowed/jinc2-sharp.slangp b/windowed/jinc2-sharp.slangp index 7bab4d3c..8f53dba2 100644 --- a/windowed/jinc2-sharp.slangp +++ b/windowed/jinc2-sharp.slangp @@ -2,8 +2,9 @@ shaders = 1 shader0 = shaders/jinc2.slang filter_linear0 = false +scale_type0 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.39 JINC2_SINC = 0.82 -JINC2_AR_STRENGTH = 0.8 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/windowed/jinc2-sharper.slangp b/windowed/jinc2-sharper.slangp index d7501a8d..0d195116 100644 --- a/windowed/jinc2-sharper.slangp +++ b/windowed/jinc2-sharper.slangp @@ -2,8 +2,9 @@ shaders = 1 shader0 = shaders/jinc2.slang filter_linear0 = false +scale_type0 = viewport parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.42 JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/windowed/jinc2.slangp b/windowed/jinc2.slangp index c2240a39..5bcf020d 100644 --- a/windowed/jinc2.slangp +++ b/windowed/jinc2.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/jinc2.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = viewport diff --git a/windowed/lanczos16.slangp b/windowed/lanczos16.slangp index b2475449..87bf1ea2 100644 --- a/windowed/lanczos16.slangp +++ b/windowed/lanczos16.slangp @@ -1,4 +1,5 @@ shaders = 1 shader0 = shaders/lanczos16.slang -filter_linear0 = false \ No newline at end of file +filter_linear0 = false +scale_type0 = viewport diff --git a/xbr/other presets/2xBR-lv1-multipass.slangp b/xbr/other presets/2xBR-lv1-multipass.slangp index 517d5bab..6553a702 100644 --- a/xbr/other presets/2xBR-lv1-multipass.slangp +++ b/xbr/other presets/2xBR-lv1-multipass.slangp @@ -1,4 +1,4 @@ -shaders = 3 +shaders = 4 shader0 = ../../stock.slang alias0 = xBR_lv1_mp_refpass @@ -9,3 +9,9 @@ scale_type1 = source shader2 = "shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang" filter_linear2 = false +scale_type2 = source +scale2 = 2.0 + +shader3 = ../../cubic/shaders/bicubic.slang +filter_linear3 = false +scale_type3 = viewport diff --git a/xbr/other presets/4xbr-hybrid-crt.slangp b/xbr/other presets/4xbr-hybrid-crt.slangp index c054807b..05309bad 100644 --- a/xbr/other presets/4xbr-hybrid-crt.slangp +++ b/xbr/other presets/4xbr-hybrid-crt.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = shaders/4xbr-hybrid-crt.slang filter_linear0 = false +scale_type0 = viewport diff --git a/xbr/other presets/super-2xbr-3d-2p.slangp b/xbr/other presets/super-2xbr-3d-2p.slangp index 1f512209..de510759 100644 --- a/xbr/other presets/super-2xbr-3d-2p.slangp +++ b/xbr/other presets/super-2xbr-3d-2p.slangp @@ -19,4 +19,5 @@ scale_y2 = "1.000000" shader3 = "shaders/super-xbr/custom-jinc2-sharper.slang" filter_linear3 = false +scale_type3 = viewport diff --git a/xbr/other presets/super-2xbr-3d-3p-smoother.slangp b/xbr/other presets/super-2xbr-3d-3p-smoother.slangp index 77e5919e..805498cc 100644 --- a/xbr/other presets/super-2xbr-3d-3p-smoother.slangp +++ b/xbr/other presets/super-2xbr-3d-3p-smoother.slangp @@ -26,4 +26,5 @@ scale_y3 = "1.000000" shader4 = "shaders/super-xbr/custom-jinc2-sharper.slang" filter_linear4 = false +scale_type4 = viewport diff --git a/xbr/other presets/super-4xbr-3d-4p.slangp b/xbr/other presets/super-4xbr-3d-4p.slangp index 0e453fcb..f4040199 100644 --- a/xbr/other presets/super-4xbr-3d-4p.slangp +++ b/xbr/other presets/super-4xbr-3d-4p.slangp @@ -33,4 +33,5 @@ scale_y4 = "1.000000" shader5 = "shaders/super-xbr/custom-jinc2-sharper.slang" filter_linear5 = false +scale_type5 = viewport diff --git a/xbr/other presets/super-4xbr-3d-6p-smoother.slangp b/xbr/other presets/super-4xbr-3d-6p-smoother.slangp index ab57bace..71ddd540 100644 --- a/xbr/other presets/super-4xbr-3d-6p-smoother.slangp +++ b/xbr/other presets/super-4xbr-3d-6p-smoother.slangp @@ -47,4 +47,5 @@ scale_y6 = "1.000000" shader7 = "../shaders/support/stock.slang" filter_linear7 = true +scale_type7 = viewport diff --git a/xbr/other presets/super-8xbr-3d-6p.slangp b/xbr/other presets/super-8xbr-3d-6p.slangp index 71f8cd32..f908e4dd 100644 --- a/xbr/other presets/super-8xbr-3d-6p.slangp +++ b/xbr/other presets/super-8xbr-3d-6p.slangp @@ -47,4 +47,5 @@ scale_y6 = "1.000000" shader7 = "shaders/super-xbr/custom-jinc2-sharper.slang" filter_linear7 = false +scale_type7 = viewport diff --git a/xbr/other presets/xbr-hybrid.slangp b/xbr/other presets/xbr-hybrid.slangp index efb6b188..01d7e600 100644 --- a/xbr/other presets/xbr-hybrid.slangp +++ b/xbr/other presets/xbr-hybrid.slangp @@ -8,6 +8,7 @@ filter_linear1 = false filter_linear2 = true scale_type0 = source scale_type1 = source +scale_type2 = viewport scale0 = 2.0 scale1 = 2.0 diff --git a/xbr/other presets/xbr-lv1-standalone.slangp b/xbr/other presets/xbr-lv1-standalone.slangp index d9bc0ec2..d80d6e57 100644 --- a/xbr/other presets/xbr-lv1-standalone.slangp +++ b/xbr/other presets/xbr-lv1-standalone.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "../shaders/xbr-lv1-standalone.slang" filter_linear0 = false +scale_type0 = viewport diff --git a/xbr/other presets/xbr-lv2-hd.slangp b/xbr/other presets/xbr-lv2-hd.slangp index 2c818910..e0a45c59 100644 --- a/xbr/other presets/xbr-lv2-hd.slangp +++ b/xbr/other presets/xbr-lv2-hd.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = ../shaders/xbr-lv2-hd.slang filter_linear0 = false +scale_type0 = viewport diff --git a/xbr/other presets/xbr-lv2-multipass.slangp b/xbr/other presets/xbr-lv2-multipass.slangp index 2b2e6e98..0b9d25d2 100644 --- a/xbr/other presets/xbr-lv2-multipass.slangp +++ b/xbr/other presets/xbr-lv2-multipass.slangp @@ -10,6 +10,7 @@ scale_type1 = "source" scale1 = "1.000000" shader2 = ../shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang +scale_type2 = viewport filter_linear0 = "false" filter_linear1 = "false" diff --git a/xbr/other presets/xbr-lv2-standalone.slangp b/xbr/other presets/xbr-lv2-standalone.slangp index 5920ffd4..dd0818b8 100644 --- a/xbr/other presets/xbr-lv2-standalone.slangp +++ b/xbr/other presets/xbr-lv2-standalone.slangp @@ -2,3 +2,4 @@ shaders = 1 shader0 = "../shaders/xbr-lv2-standalone.slang" filter_linear0 = false +scale_type0 = viewport diff --git a/xbr/other presets/xbr-mlv4-multipass.slangp b/xbr/other presets/xbr-mlv4-multipass.slangp index 0c75b39e..80c704c8 100644 --- a/xbr/other presets/xbr-mlv4-multipass.slangp +++ b/xbr/other presets/xbr-mlv4-multipass.slangp @@ -35,3 +35,4 @@ alias3 = "PASS3" shader4 = ../shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang filter_linear4 = "false" float_framebuffer4 = "false" +scale_type4 = viewport diff --git a/xbrz/2xbrz-linear.slangp b/xbrz/2xbrz-linear.slangp index 217d2bb0..a4178057 100644 --- a/xbrz/2xbrz-linear.slangp +++ b/xbrz/2xbrz-linear.slangp @@ -13,3 +13,4 @@ scale1 = 1.0 shader2 = ../cubic/shaders/bicubic-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/xbrz/4xbrz-linear.slangp b/xbrz/4xbrz-linear.slangp index 2455e42d..89515e01 100644 --- a/xbrz/4xbrz-linear.slangp +++ b/xbrz/4xbrz-linear.slangp @@ -7,3 +7,4 @@ scale0 = 4.0 shader1 = ../stock.slang filter_linear1 = true +scale_type1 = viewport diff --git a/xbrz/5xbrz-linear.slangp b/xbrz/5xbrz-linear.slangp index d2739a86..2e83831f 100644 --- a/xbrz/5xbrz-linear.slangp +++ b/xbrz/5xbrz-linear.slangp @@ -7,3 +7,4 @@ scale0 = 5.0 shader1 = ../stock.slang filter_linear1 = true +scale_type1 = viewport diff --git a/xbrz/6xbrz-linear.slangp b/xbrz/6xbrz-linear.slangp index 8c7cb9ee..bc73282a 100644 --- a/xbrz/6xbrz-linear.slangp +++ b/xbrz/6xbrz-linear.slangp @@ -7,3 +7,4 @@ scale0 = 6.0 shader1 = ../stock.slang filter_linear1 = true +scale_type1 = viewport diff --git a/xsal/2xsal.slangp b/xsal/2xsal.slangp index 278c02b8..ba1fbd73 100644 --- a/xsal/2xsal.slangp +++ b/xsal/2xsal.slangp @@ -14,3 +14,4 @@ scale1 = 1.0 shader2 = ../cubic/shaders/spline16-y.slang filter_linear2 = false +scale_type2 = viewport diff --git a/xsal/4xsal-level2-hq.slangp b/xsal/4xsal-level2-hq.slangp index 84d113d9..2f2ae9a5 100644 --- a/xsal/4xsal-level2-hq.slangp +++ b/xsal/4xsal-level2-hq.slangp @@ -12,3 +12,4 @@ scale1 = 1.0 shader2 = ../stock.slang filter_linear2 = true +scale_type2 = viewport diff --git a/xsal/4xsal-level2.slangp b/xsal/4xsal-level2.slangp index a4538fd4..f9533134 100644 --- a/xsal/4xsal-level2.slangp +++ b/xsal/4xsal-level2.slangp @@ -12,3 +12,4 @@ scale1 = 1.0 shader2 = ../stock.slang filter_linear2 = true +scale_type2 = viewport diff --git a/xsoft/4xsoft.slangp b/xsoft/4xsoft.slangp index 2aac6120..a7b9d3e5 100644 --- a/xsoft/4xsoft.slangp +++ b/xsoft/4xsoft.slangp @@ -20,3 +20,4 @@ scale2 = 1.0 shader3 = ../cubic/shaders/b-spline-y.slang filter_linear3 = false +scale_type3 = viewport diff --git a/xsoft/4xsoftSdB.slangp b/xsoft/4xsoftSdB.slangp index 2bfa4dd2..787659fc 100644 --- a/xsoft/4xsoftSdB.slangp +++ b/xsoft/4xsoftSdB.slangp @@ -20,3 +20,4 @@ scale2 = 1.0 shader3 = ../cubic/shaders/b-spline-y.slang filter_linear3 = false +scale_type3 = viewport