From 37a46fd1029a6c017e319b75ae2a57004008cc88 Mon Sep 17 00:00:00 2001 From: hunterk Date: Fri, 24 Feb 2023 07:35:58 -0600 Subject: [PATCH] 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 --- .../crt-super-xbr/crt-super-xbr.slangp | 22 +++++++-------- crt/crt-geom-deluxe.slangp | 6 ++-- crt/crt-maximus-royale-fast-mode.slangp | 2 +- crt/crt-maximus-royale-half-res-mode.slangp | 2 +- crt/crt-maximus-royale.slangp | 2 +- crt/crt-royale-fake-bloom-intel.slangp | 2 +- crt/crt-royale-fake-bloom.slangp | 2 +- crt/crt-royale-intel.slangp | 2 +- crt/crt-royale.slangp | 2 +- crt/crt-torridgristle.slangp | 16 +++++------ crt/mame_hlsl.slangp | 4 +-- crt/vector-glow-alt-render.slangp | 4 +-- .../fast-bilateral-super-2xbr-3d-3p.slangp | 28 ++++++++++--------- misc/grade.slangp | 10 +++++++ misc/shaders/glass.slang | 6 ++-- ...ut+ntsc-256px-composite+interlacing.slangp | 6 ++-- ...tvout+ntsc-256px-svideo+interlacing.slangp | 6 ++-- ...t+ntsc-2phase-composite+interlacing.slangp | 6 ++-- ...vout+ntsc-2phase-svideo+interlacing.slangp | 6 ++-- ...ut+ntsc-320px-composite+interlacing.slangp | 4 +-- ...tvout+ntsc-320px-svideo+interlacing.slangp | 4 +-- ...t+ntsc-3phase-composite+interlacing.slangp | 6 ++-- ...vout+ntsc-3phase-svideo+interlacing.slangp | 6 ++-- .../tvout+ntsc-nes+interlacing.slangp | 4 +-- .../tvout/tvout+ntsc-256px-composite.slangp | 6 ++-- presets/tvout/tvout+ntsc-256px-svideo.slangp | 6 ++-- .../tvout/tvout+ntsc-2phase-composite.slangp | 6 ++-- presets/tvout/tvout+ntsc-2phase-svideo.slangp | 6 ++-- .../tvout/tvout+ntsc-320px-composite.slangp | 4 +-- presets/tvout/tvout+ntsc-320px-svideo.slangp | 4 +-- .../tvout/tvout+ntsc-3phase-composite.slangp | 6 ++-- presets/tvout/tvout+ntsc-3phase-svideo.slangp | 6 ++-- presets/tvout/tvout+ntsc-nes.slangp | 4 +-- scalefx/shaders/old/scalefx-9x.slangp | 2 +- scalefx/shaders/old/scalefx.slangp | 2 +- 35 files changed, 111 insertions(+), 99 deletions(-) diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp index 20a8816e..f51b1dd0 100644 --- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp +++ b/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" diff --git a/crt/crt-geom-deluxe.slangp b/crt/crt-geom-deluxe.slangp index 79e9abd3..4bfdef34 100644 --- a/crt/crt-geom-deluxe.slangp +++ b/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 diff --git a/crt/crt-maximus-royale-fast-mode.slangp b/crt/crt-maximus-royale-fast-mode.slangp index ab5fd127..2bbfbfbf 100644 --- a/crt/crt-maximus-royale-fast-mode.slangp +++ b/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" diff --git a/crt/crt-maximus-royale-half-res-mode.slangp b/crt/crt-maximus-royale-half-res-mode.slangp index e64ed3f4..421e885b 100644 --- a/crt/crt-maximus-royale-half-res-mode.slangp +++ b/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" diff --git a/crt/crt-maximus-royale.slangp b/crt/crt-maximus-royale.slangp index 44278cff..c4f974fe 100644 --- a/crt/crt-maximus-royale.slangp +++ b/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" diff --git a/crt/crt-royale-fake-bloom-intel.slangp b/crt/crt-royale-fake-bloom-intel.slangp index ad4022df..d3323e4f 100644 --- a/crt/crt-royale-fake-bloom-intel.slangp +++ b/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" diff --git a/crt/crt-royale-fake-bloom.slangp b/crt/crt-royale-fake-bloom.slangp index 153317ad..7a662ac4 100644 --- a/crt/crt-royale-fake-bloom.slangp +++ b/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" diff --git a/crt/crt-royale-intel.slangp b/crt/crt-royale-intel.slangp index 56e95c68..8cae15f5 100644 --- a/crt/crt-royale-intel.slangp +++ b/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" diff --git a/crt/crt-royale.slangp b/crt/crt-royale.slangp index d66ee566..15a30dfc 100644 --- a/crt/crt-royale.slangp +++ b/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" \ No newline at end of file +wrap_mode11 = "clamp_to_edge" diff --git a/crt/crt-torridgristle.slangp b/crt/crt-torridgristle.slangp index 44303e9a..7c48b1f4 100644 --- a/crt/crt-torridgristle.slangp +++ b/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; -YIQAmount = 0.35; -BrightenLevel = 2.0; -BrightenAmount = 0.1; -GlowLevel = 1.0; -GlowTightness = 0.8; +ScanlineSize = 3.0 +YIQAmount = 0.35 +BrightenLevel = 2.0 +BrightenAmount = 0.1 +GlowLevel = 1.0 +GlowTightness = 0.8 LUTWidth = 4.0 LUTHeight = 4.0 -OverlayMix = 0.5 \ No newline at end of file +OverlayMix = 0.5 diff --git a/crt/mame_hlsl.slangp b/crt/mame_hlsl.slangp index d16570a1..33f1e23e 100644 --- a/crt/mame_hlsl.slangp +++ b/crt/mame_hlsl.slangp @@ -67,8 +67,8 @@ filter_linear10 = true scale_type10 = viewport scale10 = 1.0 -shader11 = shaders/mame_hlsl/shaders/lut.slang -filter_linear11 = true +#shader11 = shaders/mame_hlsl/shaders/lut.slang +#filter_linear11 = true # mame's textures are available here: https://github.com/mamedev/mame/tree/master/artwork textures = "MaskTexture" diff --git a/crt/vector-glow-alt-render.slangp b/crt/vector-glow-alt-render.slangp index 13d81ba1..1cf01c5f 100644 --- a/crt/vector-glow-alt-render.slangp +++ b/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" \ No newline at end of file +screen_combine = "1.0" diff --git a/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp b/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp index 9401a849..8f375e3d 100644 --- a/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp +++ b/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp @@ -1,37 +1,39 @@ -shaders = "5" -shader0 = "shaders/fast-bilateral-3d.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_edge" -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" +shaders = "6" +shader0 = ../stock.slang +alias0 = super2xbr3d_refpass +shader1 = "shaders/fast-bilateral-3d.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 \ No newline at end of file +JINC2_AR_STRENGTH = 0.8 diff --git a/misc/grade.slangp b/misc/grade.slangp index b785fed0..ee57558a 100644 --- a/misc/grade.slangp +++ b/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" diff --git a/misc/shaders/glass.slang b/misc/shaders/glass.slang index 851f1197..498512b1 100644 --- a/misc/shaders/glass.slang +++ b/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/white_point.h" +#include "../../include/img/helper_macros.h" +#include "../../include/img/white_point.h" #define temperature global.temperature #define reflblur params.g_reflblur diff --git a/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp index 51d82285..fc8e658d 100644 --- a/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp +++ b/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" \ No newline at end of file +percent = "0.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp index 7b725753..56d8e346 100644 --- a/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp +++ b/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" \ No newline at end of file +percent = "0.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp index c0dc75fd..8ed617cb 100644 --- a/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp +++ b/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" \ No newline at end of file +percent = "0.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp index ca927c7b..2e067f9b 100644 --- a/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp +++ b/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" \ No newline at end of file +percent = "0.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp index eb242020..689ec74f 100644 --- a/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp +++ b/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" diff --git a/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp index 216e3fcc..59896442 100644 --- a/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp +++ b/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" diff --git a/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp index 3d20fb3e..88ba6ac4 100644 --- a/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp +++ b/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" \ No newline at end of file +percent = "0.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp index 153690dd..b12d0065 100644 --- a/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp +++ b/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" \ No newline at end of file +percent = "0.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp index c4bcfc44..60af34cd 100644 --- a/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp +++ b/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 -shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang +shader1 = ../../ntsc/shaders/maister/ntsc-pass1-composite-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 diff --git a/presets/tvout/tvout+ntsc-256px-composite.slangp b/presets/tvout/tvout+ntsc-256px-composite.slangp index 99e792d8..4147307b 100644 --- a/presets/tvout/tvout+ntsc-256px-composite.slangp +++ b/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" \ No newline at end of file +B = "1.000000" diff --git a/presets/tvout/tvout+ntsc-256px-svideo.slangp b/presets/tvout/tvout+ntsc-256px-svideo.slangp index 62a9999e..6bff3f90 100644 --- a/presets/tvout/tvout+ntsc-256px-svideo.slangp +++ b/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" \ No newline at end of file +B = "1.000000" diff --git a/presets/tvout/tvout+ntsc-2phase-composite.slangp b/presets/tvout/tvout+ntsc-2phase-composite.slangp index 409b0a4e..cef1c01f 100644 --- a/presets/tvout/tvout+ntsc-2phase-composite.slangp +++ b/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" \ No newline at end of file +B = "1.000000" diff --git a/presets/tvout/tvout+ntsc-2phase-svideo.slangp b/presets/tvout/tvout+ntsc-2phase-svideo.slangp index dc87727b..3c63eff8 100644 --- a/presets/tvout/tvout+ntsc-2phase-svideo.slangp +++ b/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" \ No newline at end of file +B = "1.000000" diff --git a/presets/tvout/tvout+ntsc-320px-composite.slangp b/presets/tvout/tvout+ntsc-320px-composite.slangp index a3d3de34..678a4ee4 100644 --- a/presets/tvout/tvout+ntsc-320px-composite.slangp +++ b/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" diff --git a/presets/tvout/tvout+ntsc-320px-svideo.slangp b/presets/tvout/tvout+ntsc-320px-svideo.slangp index 4d38e42b..cc439568 100644 --- a/presets/tvout/tvout+ntsc-320px-svideo.slangp +++ b/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" diff --git a/presets/tvout/tvout+ntsc-3phase-composite.slangp b/presets/tvout/tvout+ntsc-3phase-composite.slangp index 67ef4c12..9240787c 100644 --- a/presets/tvout/tvout+ntsc-3phase-composite.slangp +++ b/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" \ No newline at end of file +B = "1.000000" diff --git a/presets/tvout/tvout+ntsc-3phase-svideo.slangp b/presets/tvout/tvout+ntsc-3phase-svideo.slangp index f4503d3f..bdd9575d 100644 --- a/presets/tvout/tvout+ntsc-3phase-svideo.slangp +++ b/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" \ No newline at end of file +B = "1.000000" diff --git a/presets/tvout/tvout+ntsc-nes.slangp b/presets/tvout/tvout+ntsc-nes.slangp index e2dc880f..e1bfe5d7 100644 --- a/presets/tvout/tvout+ntsc-nes.slangp +++ b/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 -shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang +shader1 = ../../ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang +shader2 = ../../ntsc/shaders/maister/ntsc-pass2-3phase.slang shader3 = ../../crt/shaders/tvout-tweaks.slang shader4 = ../../misc/shaders/image-adjustment.slang diff --git a/scalefx/shaders/old/scalefx-9x.slangp b/scalefx/shaders/old/scalefx-9x.slangp index f4c5d583..8b3c7b74 100644 --- a/scalefx/shaders/old/scalefx-9x.slangp +++ b/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 diff --git a/scalefx/shaders/old/scalefx.slangp b/scalefx/shaders/old/scalefx.slangp index 6dd9a796..ef7829df 100644 --- a/scalefx/shaders/old/scalefx.slangp +++ b/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