fix malformed presets (#370)

* fix preset parsing issues from https://github.com/libretro/slang-shaders/issues/369

* one more preset fixed

* fix some malformed preset directives

* fix preset lines erroneously ending in semicolons

* fix another malformed preset directive

* make sure grade and glass at least load properly

* comment one more bad path

bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp

@@ -1,7 +1,7 @@
 shaders = "11"
 
 
-shader0 = "shaders/linearize.slang"
+shader0 = "linearize.slang"
 filter_linear0 = "false"
 wrap_mode0 = "clamp_to_border"
 mipmap_input0 = "false"
@@ -13,7 +13,7 @@ scale_x0 = "1.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "shaders/super-xbr-pass0.slang"
+shader1 = "super-xbr-pass0.slang"
 filter_linear1 = "false"
 wrap_mode1 = "clamp_to_border"
 mipmap_input1 = "false"
@@ -25,7 +25,7 @@ scale_x1 = "1.000000"
 scale_type_y1 = "source"
 scale_y1 = "1.000000"
 
-shader2 = "shaders/super-xbr-pass1.slang"
+shader2 = "super-xbr-pass1.slang"
 filter_linear2 = "false"
 wrap_mode2 = "clamp_to_border"
 mipmap_input2 = "false"
@@ -37,7 +37,7 @@ scale_x2 = "2.000000"
 scale_type_y2 = "source"
 scale_y2 = "2.000000"
 
-shader3 = "shaders/super-xbr-pass2.slang"
+shader3 = "super-xbr-pass2.slang"
 filter_linear3 = "false"
 wrap_mode3 = "clamp_to_border"
 mipmap_input3 = "false"
@@ -49,7 +49,7 @@ scale_x3 = "1.000000"
 scale_type_y3 = "source"
 scale_y3 = "1.000000"
 
-shader4 = "shaders/custom-bicubic-x.slang"
+shader4 = "custom-bicubic-x.slang"
 filter_linear4 = "false"
 wrap_mode4 = "clamp_to_border"
 mipmap_input4 = "false"
@@ -61,7 +61,7 @@ scale_x4 = "1.000000"
 scale_type_y4 = "source"
 scale_y4 = "1.000000"
 
-shader5 = "shaders/custom-bicubic-y.slang"
+shader5 = "custom-bicubic-y.slang"
 filter_linear5 = "false"
 wrap_mode5 = "clamp_to_border"
 mipmap_input5 = "false"
@@ -73,7 +73,7 @@ scale_x5 = "1.000000"
 scale_type_y5 = "source"
 scale_y5 = "0.500000"
 
-shader6 = "shaders/crt-hyllian-sinc-curvature.slang"
+shader6 = "crt-hyllian-sinc-curvature.slang"
 filter_linear6 = "true"
 wrap_mode6 = "clamp_to_border"
 mipmap_input6 = "false"
@@ -85,7 +85,7 @@ scale_x6 = "1.000000"
 scale_type_y6 = "viewport"
 scale_y6 = "1.000000"
 
-shader7 = "shaders/threshold.slang"
+shader7 = "threshold.slang"
 filter_linear7 = "false"
 wrap_mode7 = "clamp_to_border"
 mipmap_input7 = "false"
@@ -97,7 +97,7 @@ scale_x7 = "1.000000"
 scale_type_y7 = "source"
 scale_y7 = "1.000000"
 
-shader8 = "shaders/blur_horiz.slang"
+shader8 = "blur_horiz.slang"
 filter_linear8 = "true"
 wrap_mode8 = "clamp_to_border"
 mipmap_input8 = "true"
@@ -109,7 +109,7 @@ scale_x8 = "0.200000"
 scale_type_y8 = "source"
 scale_y8 = "0.200000"
 
-shader9 = "shaders/blur_vert.slang"
+shader9 = "blur_vert.slang"
 filter_linear9 = "true"
 wrap_mode9 = "clamp_to_border"
 mipmap_input9 = "false"
@@ -117,7 +117,7 @@ alias9 = ""
 float_framebuffer9 = "false"
 srgb_framebuffer9 = "true"
 
-shader10 = "shaders/custom-resolve.slang"
+shader10 = "custom-resolve.slang"
 filter_linear10 = "true"
 wrap_mode10 = "clamp_to_border"
 mipmap_input10 = "false"

crt/crt-geom-deluxe.slangp

@@ -21,10 +21,10 @@ mipmap_input4 = true
 textures = "aperture;slot;delta"
 delta = shaders/geom-deluxe/masks/delta_2_4x1_rgb.png
 delta_filter_linear = true
-delta_repeat_mode = repeat
+delta_wrap_mode = repeat
 slot = shaders/geom-deluxe/masks/slot_2_5x4_bgr.png
 slot_filter_linear = true
-slot_repeat_mode = repeat
+slot_wrap_mode = repeat
 aperture = shaders/geom-deluxe/masks/aperture_2_4_rgb.png
 aperture_filter_linear = true
-aperture_repeat_mode = repeat
+aperture_wrap_mode = repeat

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

@@ -209,7 +209,7 @@ MONITORBORDER = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png
 MONITORLIGHTS = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png"
 SHAPE1 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png"
 SHAPE2 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png"
-DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
+#DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
 
 mask_grille_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png"
 mask_grille_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png"

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

@@ -209,7 +209,7 @@ MONITORBORDER = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png
 MONITORLIGHTS = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png"
 SHAPE1 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png"
 SHAPE2 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png"
-DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
+#DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
 
 mask_grille_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128px.png"
 mask_grille_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512px.png"

crt/crt-maximus-royale.slangp

@@ -235,7 +235,7 @@ MONITORBORDER = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame.png
 MONITORLIGHTS = "shaders/crt-maximus-royale/FrameTextures/16_9/MONITOR_frame_lights_alpha.png"
 SHAPE1 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_1_shape.png"
 SHAPE2 = "shaders/crt-maximus-royale/FrameTextures/16_9/frame_2_shape.png"
-DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
+#DECOR1 = "shaders/crt-maximus-royale/FrameTextures/16_9/TV_decor_1.png"
 
 mask_grille_texture_small = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor128pxH.png"
 mask_grille_texture_large = "shaders/crt-maximus-royale/TilePhosphorTextures/TilePhosphor512pxH.png"

crt/crt-royale-fake-bloom-intel.slangp

@@ -128,7 +128,7 @@ shader6 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang"
 filter_linear6 = "true"
 scale_type6 = "viewport"
 mipmap_input6 = "true"
-texture_wrap_mode6 = "clamp_to_edge"
+wrap_mode6 = "clamp_to_edge"
 
 
 

crt/crt-royale-fake-bloom.slangp

@@ -180,4 +180,4 @@ shader8 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
 filter_linear8 = "true"
 scale_type8 = "viewport"
 mipmap_input8 = "true"
-texture_wrap_mode8 = "clamp_to_edge"
+wrap_mode8 = "clamp_to_edge"

crt/crt-royale-intel.slangp

@@ -150,5 +150,5 @@ shader9 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-intel.slang"
 filter_linear9 = "true"
 scale_type9 = "viewport"
 mipmap_input9 = "true"
-texture_wrap_mode9 = "clamp_to_edge"
+wrap_mode9 = "clamp_to_edge"
 

crt/crt-royale.slangp

@@ -200,4 +200,4 @@ shader11 = "shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang"
 filter_linear11 = "true"
 scale_type11 = "viewport"
 mipmap_input11 = "true"
-texture_wrap_mode11 = "clamp_to_edge"
+wrap_mode11 = "clamp_to_edge"

crt/crt-torridgristle.slangp

@@ -30,15 +30,15 @@ filter_linear6 = true
 
 textures = "overlay"
 overlay = ../reshade/shaders/blendoverlay/shadowmask-4x4.png
-filter_overlay = linear
+overlay_linear = true
 
 parameters = "ScanlineSize;YIQAmount;BrightenLevel;BrightenAmount;GlowLevel;GlowTightness;LUTHeight;LUTWidth;OverlayMix"
-ScanlineSize = 3.0;
+ScanlineSize = 3.0
-YIQAmount = 0.35;
+YIQAmount = 0.35
-BrightenLevel = 2.0;
+BrightenLevel = 2.0
-BrightenAmount = 0.1;
+BrightenAmount = 0.1
-GlowLevel = 1.0;
+GlowLevel = 1.0
-GlowTightness = 0.8;
+GlowTightness = 0.8
 LUTWidth = 4.0
 LUTHeight = 4.0
-OverlayMix = 0.5
+OverlayMix = 0.5

crt/mame_hlsl.slangp

@@ -67,8 +67,8 @@ filter_linear10 = true
 scale_type10 = viewport
 scale10 = 1.0
 
-shader11 = shaders/mame_hlsl/shaders/lut.slang
+#shader11 = shaders/mame_hlsl/shaders/lut.slang
-filter_linear11 = true
+#filter_linear11 = true
 
 # mame's textures are available here: https://github.com/mamedev/mame/tree/master/artwork
 textures = "MaskTexture"

crt/vector-glow-alt-render.slangp

@@ -7,7 +7,7 @@ shader1 = "../blurs/shaders/royale/blur11fast-vertical.slang"
 filter_linear1 = "true"
 scale_type1 = "source"
 scale1 = "0.5"
-mipmap1 = "true"
+mipmap_input1 = "true"
 
 shader2 = "../blurs/shaders/royale/blur11fast-horizontal.slang"
 filter_linear2 = "true"
@@ -26,4 +26,4 @@ trail_bright = "0.30"
 glowFactor = "0.10"
 haze_strength = "0.75"
 luminance = "1.50"
-screen_combine = "1.0"
+screen_combine = "1.0"

denoisers/fast-bilateral-super-2xbr-3d-3p.slangp

@@ -1,37 +1,39 @@
-shaders = "5"
+shaders = "6"
-shader0 = "shaders/fast-bilateral-3d.slang"
+shader0 = ../stock.slang
-filter_linear0 = "false"
+alias0 = super2xbr3d_refpass
-wrap_mode0 = "clamp_to_edge"
+shader1 = "shaders/fast-bilateral-3d.slang"
-scale_type_x0 = "source"
-scale_x0 = "1.000000"
-scale_type_y0 = "source"
-scale_y0 = "1.000000"
-shader1 = "../xbr/shaders/super-xbr/super-2xbr-3d-pass0.slang"
 filter_linear1 = "false"
 wrap_mode1 = "clamp_to_edge"
 scale_type_x1 = "source"
 scale_x1 = "1.000000"
 scale_type_y1 = "source"
 scale_y1 = "1.000000"
-shader2 = "../xbr/shaders/super-xbr/super-2xbr-3d-pass1.slang"
+shader2 = "../xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang"
 filter_linear2 = "false"
 wrap_mode2 = "clamp_to_edge"
 scale_type_x2 = "source"
 scale_x2 = "1.000000"
 scale_type_y2 = "source"
 scale_y2 = "1.000000"
-shader3 = "../xbr/shaders/super-xbr/super-2xbr-3d-pass2.slang"
+shader3 = "../xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang"
 filter_linear3 = "false"
 wrap_mode3 = "clamp_to_edge"
 scale_type_x3 = "source"
 scale_x3 = "1.000000"
 scale_type_y3 = "source"
 scale_y3 = "1.000000"
-shader4 = "../windowed/shaders/jinc2.slang"
+shader4 = "../xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang"
 filter_linear4 = "false"
 wrap_mode4 = "clamp_to_edge"
+scale_type_x4 = "source"
+scale_x4 = "1.000000"
+scale_type_y4 = "source"
+scale_y4 = "1.000000"
+shader5 = "../windowed/shaders/jinc2.slang"
+filter_linear5 = "false"
+wrap_mode5 = "clamp_to_edge"
 
 parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH"
 JINC2_WINDOW_SINC = 0.42
 JINC2_SINC = 0.92
-JINC2_AR_STRENGTH = 0.8
+JINC2_AR_STRENGTH = 0.8

misc/grade.slangp

@@ -1,3 +1,13 @@
 shaders = 1
 
 shader0 = shaders/grade.slang
+
+textures = "SamplerLUT1;SamplerLUT2"
+SamplerLUT1 = "../crt/shaders/guest/advanced/lut/trinitron-lut.png"
+SamplerLUT1_linear = "true"
+SamplerLUT1_wrap_mode = "clamp_to_border"
+SamplerLUT1_mipmap = "false"
+SamplerLUT2 = "../crt/shaders/guest/advanced/lut/inv-trinitron-lut.png"
+SamplerLUT2_linear = "true"
+SamplerLUT2_wrap_mode = "clamp_to_border"
+SamplerLUT2_mipmap = "false"

misc/shaders/glass.slang

@@ -90,11 +90,11 @@ layout(std140, set = 0, binding = 0) uniform UBO
     vec4 OriginalSize;
     vec4 SourceSize;
     uint FrameCount;
-#include "../include/img/param_floats.h"
+#include "../../include/img/param_floats.h"
 } global;
 
-#include "../include/img/helper_macros.h"
+#include "../../include/img/helper_macros.h"
-#include "../include/img/white_point.h"
+#include "../../include/img/white_point.h"
 #define temperature global.temperature
 
 #define reflblur params.g_reflblur

presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1024"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -45,4 +45,4 @@ bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
 B = "1.000000"
-percent = "0.000000"
+percent = "0.000000"

presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1536"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -45,4 +45,4 @@ bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
 B = "1.000000"
-percent = "0.000000"
+percent = "0.000000"

presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "4.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -45,4 +45,4 @@ bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
 B = "1.000000"
-percent = "0.000000"
+percent = "0.000000"

presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "6.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -45,4 +45,4 @@ bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
 B = "1.000000"
-percent = "0.000000"
+percent = "0.000000"

presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1280"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"

presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1920"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"

presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "4.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -45,4 +45,4 @@ bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
 B = "1.000000"
-percent = "0.000000"
+percent = "0.000000"

presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp

@@ -1,6 +1,6 @@
 shaders = "5"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "6.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -45,4 +45,4 @@ bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
 B = "1.000000"
-percent = "0.000000"
+percent = "0.000000"

presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp

@@ -1,7 +1,7 @@
 shaders = 6
 shader0 = ../../nes_raw_palette/shaders/nes-color-decoder.slang
-shader1 = ../../ntsc/shaders/ntsc-pass1-composite-3phase.slang
+shader1 = ../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang
+shader2 = ../../ntsc/shaders/maister/ntsc-pass2-3phase.slang
 shader3 = ../../crt/shaders/tvout-tweaks.slang
 shader4 = ../../misc/shaders/image-adjustment.slang
 shader5 = ../../misc/shaders/interlacing.slang

presets/tvout/tvout+ntsc-256px-composite.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1024"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -42,4 +42,4 @@ luminance = "1.000000"
 bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
-B = "1.000000"
+B = "1.000000"

presets/tvout/tvout+ntsc-256px-svideo.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1536"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -42,4 +42,4 @@ luminance = "1.000000"
 bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
-B = "1.000000"
+B = "1.000000"

presets/tvout/tvout+ntsc-2phase-composite.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "4.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -42,4 +42,4 @@ luminance = "1.000000"
 bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
-B = "1.000000"
+B = "1.000000"

presets/tvout/tvout+ntsc-2phase-svideo.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "6.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -42,4 +42,4 @@ luminance = "1.000000"
 bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
-B = "1.000000"
+B = "1.000000"

presets/tvout/tvout+ntsc-320px-composite.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1280"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"

presets/tvout/tvout+ntsc-320px-svideo.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-2phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "1920"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-2phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-2phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"

presets/tvout/tvout+ntsc-3phase-composite.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-composite-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "4.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -42,4 +42,4 @@ luminance = "1.000000"
 bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
-B = "1.000000"
+B = "1.000000"

presets/tvout/tvout+ntsc-3phase-svideo.slangp

@@ -1,6 +1,6 @@
 shaders = "4"
 
-shader0 = "../../ntsc/shaders/ntsc-pass1-svideo-3phase.slang"
+shader0 = "../../ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang"
 filter_linear0 = "false"
 frame_count_mod0 = "2"
 float_framebuffer0 = "true"
@@ -9,7 +9,7 @@ scale_x0 = "6.000000"
 scale_type_y0 = "source"
 scale_y0 = "1.000000"
 
-shader1 = "../../ntsc/shaders/ntsc-pass2-3phase.slang"
+shader1 = "../../ntsc/shaders/maister/ntsc-pass2-3phase.slang"
 filter_linear1 = "false"
 float_framebuffer1 = "false"
 scale_type_x1 = "source"
@@ -42,4 +42,4 @@ luminance = "1.000000"
 bright_boost = "0.000000"
 R = "1.000000"
 G = "1.000000"
-B = "1.000000"
+B = "1.000000"

presets/tvout/tvout+ntsc-nes.slangp

@@ -1,7 +1,7 @@
 shaders = 5
 shader0 = ../../nes_raw_palette/shaders/nes-color-decoder.slang
-shader1 = ../../ntsc/shaders/ntsc-pass1-composite-3phase.slang
+shader1 = ../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang
-shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang
+shader2 = ../../ntsc/shaders/maister/ntsc-pass2-3phase.slang
 shader3 = ../../crt/shaders/tvout-tweaks.slang
 shader4 = ../../misc/shaders/image-adjustment.slang
 

scalefx/shaders/old/scalefx-9x.slangp

@@ -1,6 +1,6 @@
 shaders = 9
 
-shader0 = ../../../../stock.slang
+shader0 = ../../../stock.slang
 alias0 = scalefx_old_refpass
 
 shader1 = scalefx-pass0.slang

scalefx/shaders/old/scalefx.slangp

@@ -1,6 +1,6 @@
 shaders = 5
 
-shader0 = ../../../../stock.slang
+shader0 = ../../../stock.slang
 alias0 = scalefx_old_refpass
 
 shader1 = scalefx-pass0.slang