diff --git a/blurs/kawase/kawase0.slang b/blurs/kawase/kawase0.slang index b21785b..b9458f7 100644 --- a/blurs/kawase/kawase0.slang +++ b/blurs/kawase/kawase0.slang @@ -50,9 +50,9 @@ vec4 reSample(float d, vec2 uv, sampler2D decal) return color; } -#include "../../misc/colorspace-tools.h" +#include "../../include/colorspace-tools.h" void main() { FragColor = vec4(YIQtoRGB(RGBtoYIQ(reSample(0., vTexCoord, Source).rgb) - vec3(params.bloom_threshold, 0.,0.)), 1.0); -} \ No newline at end of file +} diff --git a/border/gameboy-player/gameboy-player-tvout+interlacing.slangp b/border/gameboy-player/gameboy-player-tvout+interlacing.slangp index 532ca1e..ff8802f 100644 --- a/border/gameboy-player/gameboy-player-tvout+interlacing.slangp +++ b/border/gameboy-player/gameboy-player-tvout+interlacing.slangp @@ -1,8 +1,8 @@ shaders = 5 shader0 = ../shaders/imgborder-gbp.slang shader1 = ../../crt/shaders/tvout-tweaks.slang -shader2 = ../../misc/image-adjustment.slang -shader3 = ../../misc/interlacing.slang +shader2 = ../../misc/shaders/image-adjustment.slang +shader3 = ../../misc/shaders/interlacing.slang shader4 = ../../auto-box/box-center.slang scale_type_x0 = absolute diff --git a/border/gameboy-player/gameboy-player-tvout-gba-color+interlacing.slangp b/border/gameboy-player/gameboy-player-tvout-gba-color+interlacing.slangp index 9df3a81..2f39d38 100644 --- a/border/gameboy-player/gameboy-player-tvout-gba-color+interlacing.slangp +++ b/border/gameboy-player/gameboy-player-tvout-gba-color+interlacing.slangp @@ -2,8 +2,8 @@ shaders = 6 shader0 = ../../handheld/shaders/color/gba-color.slang shader1 = ../shaders/imgborder-gbp.slang shader2 = ../../crt/shaders/tvout-tweaks.slang -shader3 = ../../misc/image-adjustment.slang -shader4 = ../../misc/interlacing.slang +shader3 = ../../misc/shaders/image-adjustment.slang +shader4 = ../../misc/shaders/interlacing.slang shader5 = ../../auto-box/box-center.slang scale_type0 = source diff --git a/border/gameboy-player/gameboy-player-tvout-gba-color.slangp b/border/gameboy-player/gameboy-player-tvout-gba-color.slangp index 5e9854c..cabacf3 100644 --- a/border/gameboy-player/gameboy-player-tvout-gba-color.slangp +++ b/border/gameboy-player/gameboy-player-tvout-gba-color.slangp @@ -2,7 +2,7 @@ shaders = 5 shader0 = ../../handheld/shaders/color/gba-color.slang shader1 = ../shaders/imgborder-gbp.slang shader2 = ../../crt/shaders/tvout-tweaks.slang -shader3 = ../../misc/image-adjustment.slang +shader3 = ../../misc/shaders/image-adjustment.slang shader4 = ../../auto-box/box-center.slang scale_type0 = source diff --git a/border/gameboy-player/gameboy-player-tvout.slangp b/border/gameboy-player/gameboy-player-tvout.slangp index 34d7558..64ceed4 100644 --- a/border/gameboy-player/gameboy-player-tvout.slangp +++ b/border/gameboy-player/gameboy-player-tvout.slangp @@ -1,7 +1,7 @@ shaders = 4 shader0 = ../shaders/imgborder-gbp.slang shader1 = ../../crt/shaders/tvout-tweaks.slang -shader2 = ../../misc/image-adjustment.slang +shader2 = ../../misc/shaders/image-adjustment.slang shader3 = ../../auto-box/box-center.slang diff --git a/border/sgb/sgb-gbc-color-tvout+interlacing.slangp b/border/sgb/sgb-gbc-color-tvout+interlacing.slangp index 6bc5be9..9aad6a6 100644 --- a/border/sgb/sgb-gbc-color-tvout+interlacing.slangp +++ b/border/sgb/sgb-gbc-color-tvout+interlacing.slangp @@ -2,8 +2,8 @@ shaders = 6 shader0 = ../../handheld/shaders/color/gbc-color.slang shader1 = ../shaders/imgborder-sgb.slang shader2 = ../../crt/shaders/tvout-tweaks.slang -shader3 = ../../misc/image-adjustment.slang -shader4 = ../../misc/interlacing.slang +shader3 = ../../misc/shaders/image-adjustment.slang +shader4 = ../../misc/shaders/interlacing.slang shader5 = ../../auto-box/box-center.slang filter_linear0 = false diff --git a/border/sgb/sgb-tvout+interlacing.slangp b/border/sgb/sgb-tvout+interlacing.slangp index 7007aa3..deac851 100644 --- a/border/sgb/sgb-tvout+interlacing.slangp +++ b/border/sgb/sgb-tvout+interlacing.slangp @@ -1,8 +1,8 @@ shaders = 5 shader0 = ../shaders/imgborder-sgb.slang shader1 = ../../crt/shaders/tvout-tweaks.slang -shader2 = ../../misc/image-adjustment.slang -shader3 = ../../misc/interlacing.slang +shader2 = ../../misc/shaders/image-adjustment.slang +shader3 = ../../misc/shaders/interlacing.slang shader4 = ../../auto-box/box-center.slang scale_type_x0 = absolute diff --git a/border/sgba/sgba-tvout+interlacing.slangp b/border/sgba/sgba-tvout+interlacing.slangp index ef89b9e..1fd7604 100644 --- a/border/sgba/sgba-tvout+interlacing.slangp +++ b/border/sgba/sgba-tvout+interlacing.slangp @@ -1,8 +1,8 @@ shaders = 5 shader0 = ../shaders/imgborder-sgba.slang shader1 = ../../crt/shaders/tvout-tweaks.slang -shader2 = ../../misc/image-adjustment.slang -shader3 = ../../misc/interlacing.slang +shader2 = ../../misc/shaders/image-adjustment.slang +shader3 = ../../misc/shaders/interlacing.slang shader4 = ../../auto-box/box-center.slang scale_type_x0 = absolute diff --git a/border/sgba/sgba-tvout-gba-color+interlacing.slangp b/border/sgba/sgba-tvout-gba-color+interlacing.slangp index eeb6368..4cbdd8e 100644 --- a/border/sgba/sgba-tvout-gba-color+interlacing.slangp +++ b/border/sgba/sgba-tvout-gba-color+interlacing.slangp @@ -2,8 +2,8 @@ shaders = 6 shader0 = ../../handheld/shaders/color/gba-color.slang shader1 = ../shaders/imgborder-sgba.slang shader2 = ../../crt/shaders/tvout-tweaks.slang -shader3 = ../../misc/image-adjustment.slang -shader4 = ../../misc/interlacing.slang +shader3 = ../../misc/shaders/image-adjustment.slang +shader4 = ../../misc/shaders/interlacing.slang shader5 = ../../auto-box/box-center.slang scale_type0 = source diff --git a/crt/vector-glow-alt-render.slangp b/crt/vector-glow-alt-render.slangp index 547e218..604bbf0 100644 --- a/crt/vector-glow-alt-render.slangp +++ b/crt/vector-glow-alt-render.slangp @@ -1,6 +1,6 @@ shaders = 4 -shader0 = "../misc/image-adjustment.slang" +shader0 = "../misc/shaders/image-adjustment.slang" alias0 = PASS1 shader1 = "../blurs/blur11fast-vertical.slang" diff --git a/crt/vector-glow.slangp b/crt/vector-glow.slangp index 69ad217..a4e7ff0 100644 --- a/crt/vector-glow.slangp +++ b/crt/vector-glow.slangp @@ -37,7 +37,7 @@ srgb_framebuffer6 = "true" shader7 = "shaders/glow-trails/combine.slang" -shader8 = "../misc/image-adjustment.slang" +shader8 = "../misc/shaders/image-adjustment.slang" parameters = "mixfactor;threshold;trail_bright;glowFactor;haze_strength;luminance;bright" mixfactor = "0.18" diff --git a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp index b2c3192..e1649bd 100644 --- a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp +++ b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp @@ -6,7 +6,7 @@ scale_type_x0 = "source" scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "../misc/natural-vision.slang" +shader1 = "../misc/shaders/natural-vision.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_edge" scale_type_x1 = "source" diff --git a/misc/colorspace-tools.h b/include/colorspace-tools.h similarity index 100% rename from misc/colorspace-tools.h rename to include/colorspace-tools.h diff --git a/include/img/col_tools.h b/include/img/col_tools.h index 396d477..3ff7cb0 100644 --- a/include/img/col_tools.h +++ b/include/img/col_tools.h @@ -1,6 +1,6 @@ #ifndef COL_TOOLS #define COL_TOOLS -#include "../../misc/colorspace-tools.h" +#include "../colorspace-tools.h" #endif diff --git a/misc/accessibility_mods.slangp b/misc/accessibility_mods.slangp new file mode 100644 index 0000000..46adea3 --- /dev/null +++ b/misc/accessibility_mods.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/accessibility_mods.slang diff --git a/misc/anti-flicker.slangp b/misc/anti-flicker.slangp new file mode 100644 index 0000000..4184db9 --- /dev/null +++ b/misc/anti-flicker.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/anti-flicker.slang diff --git a/misc/ascii.slangp b/misc/ascii.slangp new file mode 100644 index 0000000..2c95b11 --- /dev/null +++ b/misc/ascii.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/ascii.slang diff --git a/misc/bead.slangp b/misc/bead.slangp new file mode 100644 index 0000000..b9d44cb --- /dev/null +++ b/misc/bead.slangp @@ -0,0 +1,4 @@ +shaders = 1 + +shader0 = shaders/bead.slang +filter_linear0 = false diff --git a/misc/bob-deinterlacing.slangp b/misc/bob-deinterlacing.slangp new file mode 100644 index 0000000..58e59b3 --- /dev/null +++ b/misc/bob-deinterlacing.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/bob-deinterlacing.slang diff --git a/misc/chroma.slangp b/misc/chroma.slangp new file mode 100644 index 0000000..6eb115a --- /dev/null +++ b/misc/chroma.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/chroma.slang diff --git a/misc/clamphack.inc b/misc/clamphack.inc deleted file mode 100644 index a20c1a3..0000000 --- a/misc/clamphack.inc +++ /dev/null @@ -1,7 +0,0 @@ -//hacky clamp fix -vec2 bordertest = (vTexCoord); -vec3 res = texture(Source, vTexCoord).rgb; -if ( bordertest.x > 0.0001 && bordertest.x < 0.9999 && bordertest.y > 0.0001 && bordertest.y < 0.9999) -res.rgb = res.rgb; -else -res.rgb = vec3(0.0); \ No newline at end of file diff --git a/misc/cmyk-halftone-dot.slangp b/misc/cmyk-halftone-dot.slangp new file mode 100644 index 0000000..423c3bb --- /dev/null +++ b/misc/cmyk-halftone-dot.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/cmyk-halftone-dot.slang diff --git a/misc/cocktail-cabinet.slangp b/misc/cocktail-cabinet.slangp new file mode 100644 index 0000000..6a6f185 --- /dev/null +++ b/misc/cocktail-cabinet.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/cocktail-cabinet.slang diff --git a/misc/color-mangler.slangp b/misc/color-mangler.slangp new file mode 100644 index 0000000..b499b2d --- /dev/null +++ b/misc/color-mangler.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/color-mangler.slang diff --git a/misc/colorimetry.slangp b/misc/colorimetry.slangp new file mode 100644 index 0000000..f87c301 --- /dev/null +++ b/misc/colorimetry.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/colorimetry.slang diff --git a/misc/deband.slangp b/misc/deband.slangp new file mode 100644 index 0000000..9833fba --- /dev/null +++ b/misc/deband.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/deband.slang diff --git a/misc/deinterlace.slangp b/misc/deinterlace.slangp new file mode 100644 index 0000000..8d1808b --- /dev/null +++ b/misc/deinterlace.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/deinterlace.slang diff --git a/misc/edge-detect.slangp b/misc/edge-detect.slangp new file mode 100644 index 0000000..4a36614 --- /dev/null +++ b/misc/edge-detect.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/edge-detect.slang diff --git a/misc/glass.slangp b/misc/glass.slangp new file mode 100644 index 0000000..7b0b180 --- /dev/null +++ b/misc/glass.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/glass.slang diff --git a/misc/grade.slangp b/misc/grade.slangp new file mode 100644 index 0000000..b785fed --- /dev/null +++ b/misc/grade.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/grade.slang diff --git a/misc/image-adjustment.slangp b/misc/image-adjustment.slangp new file mode 100644 index 0000000..831bda9 --- /dev/null +++ b/misc/image-adjustment.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/image-adjustment.slang diff --git a/misc/img_mod.slangp b/misc/img_mod.slangp index 07621d9..3ac8886 100644 --- a/misc/img_mod.slangp +++ b/misc/img_mod.slangp @@ -1,6 +1,6 @@ shaders = 1 -shader0 = img_mod.slang +shader0 = shaders/img_mod.slang textures = "SamplerLUT1;SamplerLUT2" SamplerLUT1 = ../reshade/shaders/LUT/16.png diff --git a/misc/interlacing.slangp b/misc/interlacing.slangp new file mode 100644 index 0000000..1a79f2d --- /dev/null +++ b/misc/interlacing.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/interlacing.slang diff --git a/misc/natural-vision.slangp b/misc/natural-vision.slangp new file mode 100644 index 0000000..ca37e6b --- /dev/null +++ b/misc/natural-vision.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/natural-vision.slang diff --git a/misc/ntsc-colors.slangp b/misc/ntsc-colors.slangp new file mode 100644 index 0000000..ff2fa8c --- /dev/null +++ b/misc/ntsc-colors.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/ntsc-colors.slang diff --git a/misc/accessibility_mods.slang b/misc/shaders/accessibility_mods.slang similarity index 100% rename from misc/accessibility_mods.slang rename to misc/shaders/accessibility_mods.slang diff --git a/misc/anti-flicker.slang b/misc/shaders/anti-flicker.slang similarity index 100% rename from misc/anti-flicker.slang rename to misc/shaders/anti-flicker.slang diff --git a/misc/ascii.slang b/misc/shaders/ascii.slang similarity index 100% rename from misc/ascii.slang rename to misc/shaders/ascii.slang diff --git a/misc/bead.slang b/misc/shaders/bead.slang similarity index 62% rename from misc/bead.slang rename to misc/shaders/bead.slang index 2dfbde3..97d3203 100644 --- a/misc/bead.slang +++ b/misc/shaders/bead.slang @@ -11,13 +11,18 @@ layout(push_constant) uniform Push vec4 OriginalSize; vec4 OutputSize; uint FrameCount; - float BEAD_HIGH, BEAD_LOW; + float BEAD_HIGH, BEAD_LOW, scale_factor, BEAD_SHARP; } params; -#pragma parameter BEAD_HIGH "Bead High" 0.35 0.0 1.0 0.01 + +#pragma parameter scale_factor "Scale (0 = Auto)" 0.0 0.0 30.0 1.0 +int scale_factor = int(params.scale_factor); +#pragma parameter BEAD_HIGH "Bead Outside Diameter" 0.45 0.0 1.0 0.01 #define BEAD_HIGH params.BEAD_HIGH -#pragma parameter BEAD_LOW "Bead Low" 0.2 0.0 1.0 0.01 +#pragma parameter BEAD_LOW "Bead Inside Diameter" 0.15 0.0 1.0 0.01 #define BEAD_LOW params.BEAD_LOW +#pragma parameter BEAD_SHARP "Bead Sharpness" 6.0 1.0 20.0 1.0 +#define BEAD_SHARP params.BEAD_SHARP layout(std140, set = 0, binding = 0) uniform UBO { @@ -33,7 +38,13 @@ layout(location = 1) out vec2 pixel_no; void main() { gl_Position = global.MVP * Position; - vTexCoord = TexCoord; + vec2 box_scale = (scale_factor == 0) ? floor(params.OutputSize.xy * params.SourceSize.zw) : vec2(scale_factor); + box_scale = vec2(min(box_scale.x, box_scale.y)); + + vec2 scale = (params.OutputSize.xy * params.SourceSize.zw) / box_scale; + vec2 middle = vec2(0.5); + vec2 diff = TexCoord - middle; + vTexCoord = middle + diff * scale; pixel_no = vTexCoord * params.SourceSize.xy; } @@ -51,7 +62,7 @@ float dist(vec2 coord, vec2 source) float rolloff(float len) { - return exp(-6.0 * len); + return exp(-BEAD_SHARP * len); } vec3 lookup(vec2 pixel_no, vec3 color) @@ -68,10 +79,10 @@ vec3 lookup(vec2 pixel_no, vec3 color) return vec3(0.0, 0.0, 0.0); } -#define TEX(coord) texture(Source, coord).rgb +#define TEX(coord) texelFetch(Source, ivec2(coord*params.SourceSize.xy),0).rgb void main() { vec3 mid_color = lookup(pixel_no, TEX(vTexCoord)); FragColor = vec4(mid_color, 1.0); -} \ No newline at end of file +} diff --git a/misc/bob-deinterlacing.slang b/misc/shaders/bob-deinterlacing.slang similarity index 100% rename from misc/bob-deinterlacing.slang rename to misc/shaders/bob-deinterlacing.slang diff --git a/misc/chroma.slang b/misc/shaders/chroma.slang similarity index 100% rename from misc/chroma.slang rename to misc/shaders/chroma.slang diff --git a/misc/cmyk-halftone-dot.slang b/misc/shaders/cmyk-halftone-dot.slang similarity index 100% rename from misc/cmyk-halftone-dot.slang rename to misc/shaders/cmyk-halftone-dot.slang diff --git a/misc/cocktail-cabinet.slang b/misc/shaders/cocktail-cabinet.slang similarity index 100% rename from misc/cocktail-cabinet.slang rename to misc/shaders/cocktail-cabinet.slang diff --git a/misc/color-mangler.slang b/misc/shaders/color-mangler.slang similarity index 100% rename from misc/color-mangler.slang rename to misc/shaders/color-mangler.slang diff --git a/misc/colorimetry.slang b/misc/shaders/colorimetry.slang similarity index 100% rename from misc/colorimetry.slang rename to misc/shaders/colorimetry.slang diff --git a/misc/deband.slang b/misc/shaders/deband.slang similarity index 100% rename from misc/deband.slang rename to misc/shaders/deband.slang diff --git a/misc/deinterlace.slang b/misc/shaders/deinterlace.slang similarity index 100% rename from misc/deinterlace.slang rename to misc/shaders/deinterlace.slang diff --git a/misc/deposterize-pass0.slang b/misc/shaders/deposterize/deposterize-pass0.slang similarity index 100% rename from misc/deposterize-pass0.slang rename to misc/shaders/deposterize/deposterize-pass0.slang diff --git a/misc/deposterize-pass1.slang b/misc/shaders/deposterize/deposterize-pass1.slang similarity index 100% rename from misc/deposterize-pass1.slang rename to misc/shaders/deposterize/deposterize-pass1.slang diff --git a/misc/edge-detect.slang b/misc/shaders/edge-detect.slang similarity index 100% rename from misc/edge-detect.slang rename to misc/shaders/edge-detect.slang diff --git a/misc/glass.slang b/misc/shaders/glass.slang similarity index 100% rename from misc/glass.slang rename to misc/shaders/glass.slang diff --git a/misc/grade.slang b/misc/shaders/grade.slang similarity index 100% rename from misc/grade.slang rename to misc/shaders/grade.slang diff --git a/misc/image-adjustment.slang b/misc/shaders/image-adjustment.slang similarity index 99% rename from misc/image-adjustment.slang rename to misc/shaders/image-adjustment.slang index fae9752..ae473c5 100644 --- a/misc/image-adjustment.slang +++ b/misc/shaders/image-adjustment.slang @@ -62,7 +62,7 @@ layout(std140, set = 0, binding = 0) uniform UBO // Author: hunterk // License: Public domain -#include "colorspace-tools.h" +#include "../../include/colorspace-tools.h" //https://www.shadertoy.com/view/4sXSWs strength= 16.0 vec3 filmGrain(vec2 uv, float strength ){ @@ -134,4 +134,4 @@ else conColor = vec3(0.0); FragColor = vec4(conColor, 1.0); -} \ No newline at end of file +} diff --git a/misc/img_mod.slang b/misc/shaders/img_mod.slang similarity index 76% rename from misc/img_mod.slang rename to misc/shaders/img_mod.slang index 9bcdcee..bed417c 100644 --- a/misc/img_mod.slang +++ b/misc/shaders/img_mod.slang @@ -14,76 +14,76 @@ layout(push_constant) uniform Push layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; -#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" /////////////////////////////// INCLUDES //////////////////////////////// // comment the #include and corresponding line to remove functionality // ///////////////////////////////////////////////////////////////////////// // Flip image vertically or horizontally -#include "../include/img/image_flip.h" +#include "../../include/img/image_flip.h" // Stretching, Zooming, Panning -#include "../include/img/stretch_zoom_pan.h" +#include "../../include/img/stretch_zoom_pan.h" // Film grain effect -#include "../include/img/film_grain.h" +#include "../../include/img/film_grain.h" // Sharp, antialiased pixels; use with linear filtering -#include "../include/img/sharpening.h" +#include "../../include/img/sharpening.h" // Saturation and Luminance -//#include "../include/img/sat_lum.h" -#include "../include/img/lum_chrom.h" +//#include "../../include/img/sat_lum.h" +#include "../../include/img/lum_chrom.h" // Gamma correction // exp_gamma is basic pow function -//#include "../include/img/exp_gamma.h" -#include "../include/img/gamma_srgb.h" +//#include "../../include/img/exp_gamma.h" +#include "../../include/img/gamma_srgb.h" // Mask edges to hide unsightly garbage -#include "../include/img/border_mask.h" +#include "../../include/img/border_mask.h" // Change the whitepoint to warmer/cooler -#include "../include/img/white_point.h" +#include "../../include/img/white_point.h" // Add a phosphor mask effect onto the image -#include "../include/img/subpx_masks.h" +#include "../../include/img/subpx_masks.h" // Force integer scaling and custom aspect ratio -//#include "../include/img/int_ar.h" +//#include "../../include/img/int_ar.h" // Vignette; Darkens image around edges -//#include "../include/img/vignette.h" +//#include "../../include/img/vignette.h" // Black level // uncomment only one of the next 2 lines to set black level method -//#include "../include/img/black_lvl.h" -#include "../include/img/black_lvl_dogway.h" +//#include "../../include/img/black_lvl.h" +#include "../../include/img/black_lvl_dogway.h" // Brightness and Contrast control // uncomment only one of the next 2 lines to set contract complexity; // sigmoidal_con is advanced, bright_con is basic -#include "../include/img/sigmoidal_con.h" -//#include "../include/img/bright_con.h" +#include "../../include/img/sigmoidal_con.h" +//#include "../../include/img/bright_con.h" // Adjust color balance and tint // uncomment only one of the next 2 lines to set color channel complexity; // color mangler is advanced, channel mixer is basic -//#include "../include/img/col_mangler.h" -#include "../include/img/channel_mix.h" +//#include "../../include/img/col_mangler.h" +#include "../../include/img/channel_mix.h" // 2D screen curvature -//#include "../include/img/gristle_warp.h" -//#include "../include/img/lottes_warp.h" -#include "../include/img/cgwg_warp.h" +//#include "../../include/img/gristle_warp.h" +//#include "../../include/img/lottes_warp.h" +#include "../../include/img/cgwg_warp.h" // Rounded corners -#include "../include/img/corner.h" +#include "../../include/img/corner.h" ////////////////////////////// END INCLUDES ////////////////////////////// @@ -120,8 +120,8 @@ layout(set = 0, binding = 2) uniform sampler2D Source; //////////////////////////////// LUTS /////////////////////////////////// // Use either 1 or 2 color-grading LUTs // uncomment only one of the next 2 lines -//#include "../include/img/lut1.h" -//#include "../include/img/lut2.h" +//#include "../../include/img/lut1.h" +//#include "../../include/img/lut2.h" ////////////////////////////// END LUTS ///////////////////////////////// void main() diff --git a/misc/interlacing.slang b/misc/shaders/interlacing.slang similarity index 100% rename from misc/interlacing.slang rename to misc/shaders/interlacing.slang diff --git a/misc/natural-vision.slang b/misc/shaders/natural-vision.slang similarity index 100% rename from misc/natural-vision.slang rename to misc/shaders/natural-vision.slang diff --git a/misc/ntsc-colors.slang b/misc/shaders/ntsc-colors.slang similarity index 95% rename from misc/ntsc-colors.slang rename to misc/shaders/ntsc-colors.slang index c154a1c..a3a6b2b 100755 --- a/misc/ntsc-colors.slang +++ b/misc/shaders/ntsc-colors.slang @@ -16,7 +16,7 @@ layout(std140, set = 0, binding = 0) uniform UBO mat4 MVP; } global; -#include "colorspace-tools.h" +#include "../../include/colorspace-tools.h" #pragma stage vertex layout(location = 0) in vec4 Position; diff --git a/misc/ss-gamma-ramp.slang b/misc/shaders/ss-gamma-ramp.slang similarity index 100% rename from misc/ss-gamma-ramp.slang rename to misc/shaders/ss-gamma-ramp.slang diff --git a/misc/tonemapping.slang b/misc/shaders/tonemapping.slang similarity index 100% rename from misc/tonemapping.slang rename to misc/shaders/tonemapping.slang diff --git a/misc/white_point.slang b/misc/shaders/white_point.slang similarity index 100% rename from misc/white_point.slang rename to misc/shaders/white_point.slang diff --git a/misc/yiq-hue-adjustment.slang b/misc/shaders/yiq-hue-adjustment.slang similarity index 96% rename from misc/yiq-hue-adjustment.slang rename to misc/shaders/yiq-hue-adjustment.slang index 8d50a1c..ada4727 100644 --- a/misc/yiq-hue-adjustment.slang +++ b/misc/shaders/yiq-hue-adjustment.slang @@ -22,7 +22,7 @@ layout(std140, set = 0, binding = 0) uniform UBO #pragma parameter hue_degrees "Hue" 0.0 -360.0 360.0 1.0 #define M_PI 3.1415926535897932384626433832795 -#include "colorspace-tools.h" +#include "../../include/colorspace-tools.h" #pragma stage vertex layout(location = 0) in vec4 Position; @@ -50,4 +50,4 @@ void main() vec3 color = vec3(yiq.x, chroma * cos(hue), chroma * sin(hue)); FragColor = vec4(YIQtoRGB(color).rgb, 1.0); -} \ No newline at end of file +} diff --git a/misc/snes-blend-and-bob.slang b/misc/snes-blend-and-bob.slang deleted file mode 100644 index 540271f..0000000 --- a/misc/snes-blend-and-bob.slang +++ /dev/null @@ -1,81 +0,0 @@ -#version 450 - -/* - Bob-Deinterlacing - Author: hunterk - License: Public domain - - Note: This shader is designed to work with the typical interlaced output from an emulator, which displays both even and odd fields twice. - As such, it is inappropriate for general video use unless the video has already been similarly woven beforehand. -*/ - -layout(push_constant) uniform Push -{ - vec4 SourceSize; - vec4 OriginalSize; - vec4 OutputSize; - uint FrameCount; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; -layout(location = 1) out vec4 t1; - -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord; - vec2 ps = params.SourceSize.zw; - float dx = ps.x; - float dy = ps.y; - t1 = vTexCoord.xxxy + vec4( -dx, 0., dx, 0.); // L, C, R -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec4 t1; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - -void main() -{ - float y = 0.0; - vec4 c; - vec4 l; - vec4 r; - // assume anything with a vertical resolution greater than 400 lines is interlaced - if (params.SourceSize.y > 400.0) y = params.SourceSize.y * vTexCoord.y + float(params.FrameCount); - else y = 2.000001 * params.SourceSize.y * vTexCoord.y; - - if (mod(y, 2.0) > 0.99999) - { - c = vec4(texture(Source, t1.yw + vec2(0.0, params.SourceSize.w))); - l = vec4(texture(Source, t1.xw + vec2(0.0, params.SourceSize.w))); - r = vec4(texture(Source, t1.zw + vec2(0.0, params.SourceSize.w))); - } - else - { - c = texture(Source, t1.yw); - l = texture(Source, t1.xw); - r = texture(Source, t1.zw); - } - - vec4 final; - if (params.SourceSize.x < 500.0) final = c; - else - { - // pixel location - float fp = round(fract(0.5*vTexCoord.x*params.SourceSize.x)); - - // output - final = (((l.x == c.x)||(r.x == c.x))&&((l.y == c.y)||(r.y == c.y))&&((l.z == c.z)||(r.z == c.z))) ? c : (fp > 0.5 ? mix(c,r,0.5) : mix(c,l,0.5)); - } - FragColor = final; -} \ No newline at end of file diff --git a/misc/ss-gamma-ramp.slangp b/misc/ss-gamma-ramp.slangp new file mode 100644 index 0000000..d0da304 --- /dev/null +++ b/misc/ss-gamma-ramp.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/ss-gamma-ramp.slang diff --git a/misc/tonemapping.slangp b/misc/tonemapping.slangp new file mode 100644 index 0000000..0e61b0c --- /dev/null +++ b/misc/tonemapping.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/tonemapping.slang diff --git a/misc/white_point.slangp b/misc/white_point.slangp new file mode 100644 index 0000000..7dbf146 --- /dev/null +++ b/misc/white_point.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/white_point.slang diff --git a/misc/yiq-hue-adjustment.slangp b/misc/yiq-hue-adjustment.slangp new file mode 100644 index 0000000..03b1e33 --- /dev/null +++ b/misc/yiq-hue-adjustment.slangp @@ -0,0 +1,3 @@ +shaders = 1 + +shader0 = shaders/yiq-hue-adjustment.slang diff --git a/nedi/presets/bilateral-variant3.slangp b/nedi/presets/bilateral-variant3.slangp index 76a815d..89346d8 100644 --- a/nedi/presets/bilateral-variant3.slangp +++ b/nedi/presets/bilateral-variant3.slangp @@ -53,7 +53,7 @@ shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../misc/natural-vision.slang" +shader5 = "../../misc/shaders/natural-vision.slang" shader6 = "../../vhs/shaders/vhs.slang" shader7 = "../../sharpen/shaders/adaptive-sharpen.slang" shaders = "8" diff --git a/nedi/presets/bilateral-variant4.slangp b/nedi/presets/bilateral-variant4.slangp index 0dc348b..3f252e9 100644 --- a/nedi/presets/bilateral-variant4.slangp +++ b/nedi/presets/bilateral-variant4.slangp @@ -56,7 +56,7 @@ shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../misc/natural-vision.slang" +shader5 = "../../misc/shaders/natural-vision.slang" shader6 = "../../vhs/shaders/vhs.slang" shader7 = "../../sharpen/shaders/adaptive-sharpen.slang" shader8 = "../../sharpen/shaders/adaptive-sharpen.slang" diff --git a/nedi/presets/bilateral-variant5.slangp b/nedi/presets/bilateral-variant5.slangp index 370e8b3..44b1b20 100644 --- a/nedi/presets/bilateral-variant5.slangp +++ b/nedi/presets/bilateral-variant5.slangp @@ -59,7 +59,7 @@ shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../misc/natural-vision.slang" +shader5 = "../../misc/shaders/natural-vision.slang" shader6 = "../../vhs/shaders/vhs.slang" shader7 = "../../sharpen/shaders/adaptive-sharpen.slang" shader8 = "../../sharpen/shaders/adaptive-sharpen.slang" diff --git a/ntsc/ntsc-256px-gauss-scanline.slangp b/ntsc/ntsc-256px-composite-scanline.slangp similarity index 63% rename from ntsc/ntsc-256px-gauss-scanline.slangp rename to ntsc/ntsc-256px-composite-scanline.slangp index 1a38872..c768259 100644 --- a/ntsc/ntsc-256px-gauss-scanline.slangp +++ b/ntsc/ntsc-256px-composite-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-composite-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-composite-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-256px.slangp b/ntsc/ntsc-256px-composite.slangp similarity index 67% rename from ntsc/ntsc-256px.slangp rename to ntsc/ntsc-256px-composite.slangp index 7e8d8a8..8cb31fc 100644 --- a/ntsc/ntsc-256px.slangp +++ b/ntsc/ntsc-256px-composite.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-composite-3phase.slang -shader1 = shaders/ntsc-pass2-3phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-composite-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-256px-svideo-gauss-scanline.slangp b/ntsc/ntsc-256px-svideo-scanline.slangp similarity index 63% rename from ntsc/ntsc-256px-svideo-gauss-scanline.slangp rename to ntsc/ntsc-256px-svideo-scanline.slangp index 4348dc9..c521f91 100644 --- a/ntsc/ntsc-256px-svideo-gauss-scanline.slangp +++ b/ntsc/ntsc-256px-svideo-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-svideo-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-svideo-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-256px-svideo.slangp b/ntsc/ntsc-256px-svideo.slangp index 663b7ed..c95c695 100644 --- a/ntsc/ntsc-256px-svideo.slangp +++ b/ntsc/ntsc-256px-svideo.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-svideo-3phase.slang -shader1 = shaders/ntsc-pass2-3phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-svideo-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px-gauss-scanline.slangp b/ntsc/ntsc-320px-composite-scanline.slangp similarity index 63% rename from ntsc/ntsc-320px-gauss-scanline.slangp rename to ntsc/ntsc-320px-composite-scanline.slangp index e7ddf50..7c83711 100644 --- a/ntsc/ntsc-320px-gauss-scanline.slangp +++ b/ntsc/ntsc-320px-composite-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-composite-2phase.slang -shader1 = shaders/ntsc-pass2-2phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-composite-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px.slangp b/ntsc/ntsc-320px-composite.slangp similarity index 67% rename from ntsc/ntsc-320px.slangp rename to ntsc/ntsc-320px-composite.slangp index d2139fa..e3d1b8f 100644 --- a/ntsc/ntsc-320px.slangp +++ b/ntsc/ntsc-320px-composite.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-composite-2phase.slang -shader1 = shaders/ntsc-pass2-2phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-composite-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px-svideo-gauss-scanline.slangp b/ntsc/ntsc-320px-svideo-scanline.slangp similarity index 63% rename from ntsc/ntsc-320px-svideo-gauss-scanline.slangp rename to ntsc/ntsc-320px-svideo-scanline.slangp index 675cecf..5f52c20 100644 --- a/ntsc/ntsc-320px-svideo-gauss-scanline.slangp +++ b/ntsc/ntsc-320px-svideo-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-svideo-2phase.slang -shader1 = shaders/ntsc-pass2-2phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-svideo-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px-svideo.slangp b/ntsc/ntsc-320px-svideo.slangp index 2b4531f..b78b8c5 100644 --- a/ntsc/ntsc-320px-svideo.slangp +++ b/ntsc/ntsc-320px-svideo.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-svideo-2phase.slang -shader1 = shaders/ntsc-pass2-2phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-svideo-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-svideo.slangp b/ntsc/ntsc-svideo.slangp deleted file mode 100644 index e3931cc..0000000 --- a/ntsc/ntsc-svideo.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = 4 -shader0 = shaders/ntsc-pass1-svideo-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -scale_type0 = source -scale_x0 = 4.0 -scale_y0 = 1.0 -frame_count_mod0 = 2 -float_framebuffer0 = true - -scale_type1 = source -scale_x1 = 0.5 -scale_y1 = 1.0 - -scale_type_x2 = source -scale_type_y2 = viewport -scale2 = 1.0 - diff --git a/ntsc/ntsc.slangp b/ntsc/ntsc.slangp deleted file mode 100644 index b8143e9..0000000 --- a/ntsc/ntsc.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = 4 -shader0 = shaders/ntsc-pass1-composite-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -scale_type0 = source -scale_x0 = 4.0 -scale_y0 = 1.0 -frame_count_mod0 = 2 -float_framebuffer0 = true - -scale_type1 = source -scale_x1 = 0.5 -scale_y1 = 1.0 - -scale_type_x2 = source -scale_type_y2 = viewport -scale2 = 1.0 - diff --git a/ntsc/shaders/ntsc-decode-filter-2phase.inc b/ntsc/shaders/maister/ntsc-decode-filter-2phase.inc similarity index 100% rename from ntsc/shaders/ntsc-decode-filter-2phase.inc rename to ntsc/shaders/maister/ntsc-decode-filter-2phase.inc diff --git a/ntsc/shaders/ntsc-decode-filter-3phase.inc b/ntsc/shaders/maister/ntsc-decode-filter-3phase.inc similarity index 100% rename from ntsc/shaders/ntsc-decode-filter-3phase.inc rename to ntsc/shaders/maister/ntsc-decode-filter-3phase.inc diff --git a/ntsc/shaders/ntsc-gauss-pass.slang b/ntsc/shaders/maister/ntsc-gauss-pass.slang similarity index 100% rename from ntsc/shaders/ntsc-gauss-pass.slang rename to ntsc/shaders/maister/ntsc-gauss-pass.slang diff --git a/ntsc/shaders/ntsc-param.inc b/ntsc/shaders/maister/ntsc-param.inc similarity index 100% rename from ntsc/shaders/ntsc-param.inc rename to ntsc/shaders/maister/ntsc-param.inc diff --git a/ntsc/shaders/ntsc-pass1-composite-2phase.slang b/ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-composite-2phase.slang rename to ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang diff --git a/ntsc/shaders/ntsc-pass1-composite-3phase.slang b/ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-composite-3phase.slang rename to ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang diff --git a/ntsc/shaders/ntsc-pass1-encode-demodulate.inc b/ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc similarity index 100% rename from ntsc/shaders/ntsc-pass1-encode-demodulate.inc rename to ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc diff --git a/ntsc/shaders/ntsc-pass1-svideo-2phase.slang b/ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-svideo-2phase.slang rename to ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang diff --git a/ntsc/shaders/ntsc-pass1-svideo-3phase.slang b/ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-svideo-3phase.slang rename to ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang diff --git a/ntsc/shaders/ntsc-pass1-vertex.inc b/ntsc/shaders/maister/ntsc-pass1-vertex.inc similarity index 100% rename from ntsc/shaders/ntsc-pass1-vertex.inc rename to ntsc/shaders/maister/ntsc-pass1-vertex.inc diff --git a/ntsc/shaders/ntsc-pass2-2phase-gamma.slang b/ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-2phase-gamma.slang rename to ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang diff --git a/ntsc/shaders/ntsc-pass2-2phase-linear.slang b/ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-2phase-linear.slang rename to ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang diff --git a/ntsc/shaders/ntsc-pass2-2phase.slang b/ntsc/shaders/maister/ntsc-pass2-2phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-2phase.slang rename to ntsc/shaders/maister/ntsc-pass2-2phase.slang diff --git a/ntsc/shaders/ntsc-pass2-3phase-gamma.slang b/ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-3phase-gamma.slang rename to ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang diff --git a/ntsc/shaders/ntsc-pass2-3phase-linear.slang b/ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-3phase-linear.slang rename to ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang diff --git a/ntsc/shaders/ntsc-pass2-3phase.slang b/ntsc/shaders/maister/ntsc-pass2-3phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-3phase.slang rename to ntsc/shaders/maister/ntsc-pass2-3phase.slang diff --git a/ntsc/shaders/ntsc-pass2-decode.inc b/ntsc/shaders/maister/ntsc-pass2-decode.inc similarity index 100% rename from ntsc/shaders/ntsc-pass2-decode.inc rename to ntsc/shaders/maister/ntsc-pass2-decode.inc diff --git a/ntsc/shaders/ntsc-pass2-vertex.inc b/ntsc/shaders/maister/ntsc-pass2-vertex.inc similarity index 100% rename from ntsc/shaders/ntsc-pass2-vertex.inc rename to ntsc/shaders/maister/ntsc-pass2-vertex.inc diff --git a/ntsc/shaders/ntsc-rgbyuv.inc b/ntsc/shaders/maister/ntsc-rgbyuv.inc similarity index 100% rename from ntsc/shaders/ntsc-rgbyuv.inc rename to ntsc/shaders/maister/ntsc-rgbyuv.inc diff --git a/ntsc/shaders/ntsc-stock.slang b/ntsc/shaders/maister/ntsc-stock.slang similarity index 100% rename from ntsc/shaders/ntsc-stock.slang rename to ntsc/shaders/maister/ntsc-stock.slang diff --git a/presets/crt-geom-ntsc-composite-sharp-tate.slangp b/presets/crt-geom-ntsc-composite-sharp-tate.slangp index 66380f1..13add4d 100644 --- a/presets/crt-geom-ntsc-composite-sharp-tate.slangp +++ b/presets/crt-geom-ntsc-composite-sharp-tate.slangp @@ -1,5 +1,5 @@ shaders = "6" -shader0 = "../misc/ntsc-colors.slang" +shader0 = "../misc/shaders/ntsc-colors.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/presets/crt-geom-ntsc-composite-sharp.slangp b/presets/crt-geom-ntsc-composite-sharp.slangp index 6c6590d..3232ce7 100644 --- a/presets/crt-geom-ntsc-composite-sharp.slangp +++ b/presets/crt-geom-ntsc-composite-sharp.slangp @@ -1,5 +1,5 @@ shaders = "6" -shader0 = "../misc/ntsc-colors.slang" +shader0 = "../misc/shaders/ntsc-colors.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/presets/crt-geom-ntsc-upscale-sharp-tate.slangp b/presets/crt-geom-ntsc-upscale-sharp-tate.slangp index 4f710ed..9ba1adb 100644 --- a/presets/crt-geom-ntsc-upscale-sharp-tate.slangp +++ b/presets/crt-geom-ntsc-upscale-sharp-tate.slangp @@ -1,5 +1,5 @@ shaders = "6" -shader0 = "../misc/ntsc-colors.slang" +shader0 = "../misc/shaders/ntsc-colors.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/presets/crt-geom-ntsc-upscale-sharp.slangp b/presets/crt-geom-ntsc-upscale-sharp.slangp index 4458101..5e2aa02 100644 --- a/presets/crt-geom-ntsc-upscale-sharp.slangp +++ b/presets/crt-geom-ntsc-upscale-sharp.slangp @@ -1,5 +1,5 @@ shaders = "6" -shader0 = "../misc/ntsc-colors.slang" +shader0 = "../misc/shaders/ntsc-colors.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/presets/crt-guest-dr-venom-maxDR.slangp b/presets/crt-guest-dr-venom-maxDR.slangp index 5b5023b..0109794 100644 --- a/presets/crt-guest-dr-venom-maxDR.slangp +++ b/presets/crt-guest-dr-venom-maxDR.slangp @@ -10,7 +10,7 @@ shaders = "8" -shader0 = "../misc/grade.slang" +shader0 = "../misc/shaders/grade.slang" filter_linear0 = "true" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" diff --git a/presets/crt-royale-kurozumi.slangp b/presets/crt-royale-kurozumi.slangp index 0039851..ac42a0f 100755 --- a/presets/crt-royale-kurozumi.slangp +++ b/presets/crt-royale-kurozumi.slangp @@ -1,5 +1,5 @@ shaders = "13" -shader0 = "../misc/grade.slang" +shader0 = "../misc/shaders/grade.slang" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" alias0 = "" diff --git a/presets/crtsim-grungy.slangp b/presets/crtsim-grungy.slangp index 4fa77d6..2db0379 100644 --- a/presets/crtsim-grungy.slangp +++ b/presets/crtsim-grungy.slangp @@ -6,7 +6,7 @@ mipmap_input0 = "false" alias0 = "" float_framebuffer0 = "false" srgb_framebuffer0 = "false" -shader1 = ../misc/image-adjustment.slang +shader1 = ../misc/shaders/image-adjustment.slang wrap_mode1 = "clamp_to_border" mipmap_input1 = "false" alias1 = "CRTPASS" diff --git a/presets/nes-color-decoder+colorimetry+pixellate.slangp b/presets/nes-color-decoder+colorimetry+pixellate.slangp index fb878b6..8322c6f 100644 --- a/presets/nes-color-decoder+colorimetry+pixellate.slangp +++ b/presets/nes-color-decoder+colorimetry+pixellate.slangp @@ -1,6 +1,6 @@ shaders = "3" shader0 = ../nes_raw_palette/shaders/nes-color-decoder.slang -shader1 = ../misc/colorimetry.slang +shader1 = ../misc/shaders/colorimetry.slang shader2 = ../interpolation/shaders/pixellate.slang filter_linear0 = "false" diff --git a/presets/retro-v2+image-adjustment.slangp b/presets/retro-v2+image-adjustment.slangp index d76016e..fedc1a6 100644 --- a/presets/retro-v2+image-adjustment.slangp +++ b/presets/retro-v2+image-adjustment.slangp @@ -1,6 +1,6 @@ shaders = "2" -shader0 = "../misc/image-adjustment.slang" +shader0 = "../misc/shaders/image-adjustment.slang" shader1 = "../handheld/shaders/retro-v2.slang" filter_linear0 = "false" diff --git a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp index 04c9e68..ed755f0 100644 --- a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp +++ b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp @@ -48,7 +48,7 @@ scale_type7 = source scale7 = 3.0 alias7 = sfxp7 -shader8 = ../misc/image-adjustment.slang +shader8 = ../misc/shaders/image-adjustment.slang filter_linear8 = false scale_type8 = source scale8 = 1.0 @@ -84,7 +84,7 @@ filter_linear14 = true scale_type14 = source scale14 = 1.0 -shader15 = ../misc/ntsc-colors.slang +shader15 = ../misc/shaders/ntsc-colors.slang filter_linear15 = false scale_type15 = source scale15 = 1.0 diff --git a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp index 5f2c10d..59ae7ee 100644 --- a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp +++ b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp @@ -48,7 +48,7 @@ scale_type7 = source scale7 = 3.0 alias7 = sfxp7 -shader8 = ../misc/image-adjustment.slang +shader8 = ../misc/shaders/image-adjustment.slang filter_linear8 = false scale_type8 = source scale8 = 1.0 diff --git a/presets/tvout+interlacing/tvout+interlacing.slangp b/presets/tvout+interlacing/tvout+interlacing.slangp index e782794..4b5d028 100644 --- a/presets/tvout+interlacing/tvout+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+interlacing.slangp @@ -2,8 +2,8 @@ shaders = "3" shader0 = "../../crt/shaders/tvout-tweaks.slang" -shader1 = "../../misc/image-adjustment.slang" -shader2 = "../../misc/interlacing.slang" +shader1 = "../../misc/shaders/image-adjustment.slang" +shader2 = "../../misc/shaders/interlacing.slang" scale_type_x0 = "viewport" scale_x0 = "1.000000" diff --git a/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp b/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp index d26e0ca..fbdf164 100644 --- a/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+nes-color-decoder+interlacing.slangp @@ -3,8 +3,8 @@ shaders = "4" shader0 = "../../nes_raw_palette/shaders/nes-color-decoder.slang" shader1 = "../../crt/shaders/tvout-tweaks.slang" -shader2 = "../../misc/image-adjustment.slang" -shader3 = "../../misc/interlacing.slang" +shader2 = "../../misc/shaders/image-adjustment.slang" +shader3 = "../../misc/shaders/interlacing.slang" scale_type0 = source scale0 = 1.0 diff --git a/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp index 9a8251c..51d8228 100644 --- a/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-256px-composite+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp index 904a5e7..7b72575 100644 --- a/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-256px-svideo+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp index 5c4eace..c0dc75f 100644 --- a/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-2phase-composite+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp index 8ade373..ca927c7 100644 --- a/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-2phase-svideo+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp index 180e382..eb24202 100644 --- a/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-320px-composite+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp index 59f706e..216e3fc 100644 --- a/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-320px-svideo+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp index 45106d7..3d20fb3 100644 --- a/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-3phase-composite+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp index 0c93613..153690d 100644 --- a/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-3phase-svideo+interlacing.slangp @@ -25,10 +25,10 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" -shader4 = "../../misc/interlacing.slang" +shader4 = "../../misc/shaders/interlacing.slang" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B;percent" TVOUT_RESOLUTION = "512.000000" diff --git a/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp b/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp index b6c8ba4..c4bcfc4 100644 --- a/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp +++ b/presets/tvout+interlacing/tvout+ntsc-nes+interlacing.slangp @@ -3,8 +3,8 @@ shader0 = ../../nes_raw_palette/shaders/nes-color-decoder.slang shader1 = ../../ntsc/shaders/ntsc-pass1-composite-3phase.slang shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang shader3 = ../../crt/shaders/tvout-tweaks.slang -shader4 = ../../misc/image-adjustment.slang -shader5 = ../../misc/interlacing.slang +shader4 = ../../misc/shaders/image-adjustment.slang +shader5 = ../../misc/shaders/interlacing.slang filter_linear0 = false filter_linear1 = false diff --git a/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp b/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp index 9345176..ff8352b 100644 --- a/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp +++ b/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp @@ -2,9 +2,9 @@ shaders = "4" shader0 = "../../crt/shaders/tvout-tweaks.slang" -shader1 = "../../misc/image-adjustment.slang" +shader1 = "../../misc/shaders/image-adjustment.slang" shader2 = "../../windowed/shaders/jinc2.slang" -shader3 = "../../misc/interlacing.slang" +shader3 = "../../misc/shaders/interlacing.slang" scale_type_x0 = "source" scale_x0 = "2.000000" diff --git a/presets/tvout/tvout+nes-color-decoder.slangp b/presets/tvout/tvout+nes-color-decoder.slangp index f243ae8..e30dcbb 100644 --- a/presets/tvout/tvout+nes-color-decoder.slangp +++ b/presets/tvout/tvout+nes-color-decoder.slangp @@ -3,7 +3,7 @@ shaders = "3" shader0 = "../../nes_raw_palette/shaders/nes-color-decoder.slang" shader1 = "../../crt/shaders/tvout-tweaks.slang" -shader2 = "../../misc/image-adjustment.slang" +shader2 = "../../misc/shaders/image-adjustment.slang" scale_type0 = source scale0 = 1.0 diff --git a/presets/tvout/tvout+ntsc-256px-composite.slangp b/presets/tvout/tvout+ntsc-256px-composite.slangp index 5d2ff5e..99e792d 100644 --- a/presets/tvout/tvout+ntsc-256px-composite.slangp +++ b/presets/tvout/tvout+ntsc-256px-composite.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-256px-svideo.slangp b/presets/tvout/tvout+ntsc-256px-svideo.slangp index d112a3a..62a9999 100644 --- a/presets/tvout/tvout+ntsc-256px-svideo.slangp +++ b/presets/tvout/tvout+ntsc-256px-svideo.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-2phase-composite.slangp b/presets/tvout/tvout+ntsc-2phase-composite.slangp index 0c71220..409b0a4 100644 --- a/presets/tvout/tvout+ntsc-2phase-composite.slangp +++ b/presets/tvout/tvout+ntsc-2phase-composite.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-2phase-svideo.slangp b/presets/tvout/tvout+ntsc-2phase-svideo.slangp index 13bc95f..dc87727 100644 --- a/presets/tvout/tvout+ntsc-2phase-svideo.slangp +++ b/presets/tvout/tvout+ntsc-2phase-svideo.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-320px-composite.slangp b/presets/tvout/tvout+ntsc-320px-composite.slangp index f2779b9..a3d3de3 100644 --- a/presets/tvout/tvout+ntsc-320px-composite.slangp +++ b/presets/tvout/tvout+ntsc-320px-composite.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-320px-svideo.slangp b/presets/tvout/tvout+ntsc-320px-svideo.slangp index f36141e..4d38e42 100644 --- a/presets/tvout/tvout+ntsc-320px-svideo.slangp +++ b/presets/tvout/tvout+ntsc-320px-svideo.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-3phase-composite.slangp b/presets/tvout/tvout+ntsc-3phase-composite.slangp index 6446405..67ef4c1 100644 --- a/presets/tvout/tvout+ntsc-3phase-composite.slangp +++ b/presets/tvout/tvout+ntsc-3phase-composite.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-3phase-svideo.slangp b/presets/tvout/tvout+ntsc-3phase-svideo.slangp index c687c69..f4503d3 100644 --- a/presets/tvout/tvout+ntsc-3phase-svideo.slangp +++ b/presets/tvout/tvout+ntsc-3phase-svideo.slangp @@ -25,7 +25,7 @@ scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../../misc/image-adjustment.slang" +shader3 = "../../misc/shaders/image-adjustment.slang" float_framebuffer3 = "false" parameters = "TVOUT_RESOLUTION;TVOUT_COMPOSITE_CONNECTION;TVOUT_TV_COLOR_LEVELS;target_gamma;monitor_gamma;overscan_percent_x;overscan_percent_y;saturation;contrast;luminance;bright_boost;R;G;B" diff --git a/presets/tvout/tvout+ntsc-nes.slangp b/presets/tvout/tvout+ntsc-nes.slangp index 3f00651..e2dc880 100644 --- a/presets/tvout/tvout+ntsc-nes.slangp +++ b/presets/tvout/tvout+ntsc-nes.slangp @@ -3,7 +3,7 @@ shader0 = ../../nes_raw_palette/shaders/nes-color-decoder.slang shader1 = ../../ntsc/shaders/ntsc-pass1-composite-3phase.slang shader2 = ../../ntsc/shaders/ntsc-pass2-3phase.slang shader3 = ../../crt/shaders/tvout-tweaks.slang -shader4 = ../../misc/image-adjustment.slang +shader4 = ../../misc/shaders/image-adjustment.slang filter_linear0 = false filter_linear1 = false diff --git a/presets/tvout/tvout+snes-hires-blend.slangp b/presets/tvout/tvout+snes-hires-blend.slangp index b3a6998..ba2f08a 100644 --- a/presets/tvout/tvout+snes-hires-blend.slangp +++ b/presets/tvout/tvout+snes-hires-blend.slangp @@ -3,7 +3,7 @@ shaders = "3" shader0 = "../../crt/shaders/snes-hires-blend.slang" shader1 = "../../crt/shaders/tvout-tweaks.slang" -shader2 = "../../misc/image-adjustment.slang" +shader2 = "../../misc/shaders/image-adjustment.slang" filter_linear0 = "false" scale_type0 = "source" diff --git a/presets/tvout/tvout-jinc-sharpen.slangp b/presets/tvout/tvout-jinc-sharpen.slangp index 66e0d6f..357c29f 100644 --- a/presets/tvout/tvout-jinc-sharpen.slangp +++ b/presets/tvout/tvout-jinc-sharpen.slangp @@ -2,9 +2,9 @@ shaders = "3" shader0 = "../../crt/shaders/tvout-tweaks.slang" -shader1 = "../../misc/image-adjustment.slang" +shader1 = "../../misc/shaders/image-adjustment.slang" shader2 = "../../windowed/shaders/jinc2.slang" -shader3 = "../../misc/interlacing.slang" +shader3 = "../../misc/shaders/interlacing.slang" scale_type_x0 = "source" scale_x0 = "2.000000" diff --git a/presets/tvout/tvout-pixelsharp.slangp b/presets/tvout/tvout-pixelsharp.slangp index 7255bd5..db2310c 100644 --- a/presets/tvout/tvout-pixelsharp.slangp +++ b/presets/tvout/tvout-pixelsharp.slangp @@ -1,6 +1,6 @@ shaders = "3" shader0 = "../../crt/shaders/tvout-tweaks.slang" -shader1 = "../../misc/image-adjustment.slang" +shader1 = "../../misc/shaders/image-adjustment.slang" shader2 = "../../stock.slang" scale_type_x0 = "viewport" diff --git a/presets/tvout/tvout.slangp b/presets/tvout/tvout.slangp index 093e71e..d21bfb3 100644 --- a/presets/tvout/tvout.slangp +++ b/presets/tvout/tvout.slangp @@ -2,7 +2,7 @@ shaders = "2" shader0 = "../../crt/shaders/tvout-tweaks.slang" -shader1 = "../../misc/image-adjustment.slang" +shader1 = "../../misc/shaders/image-adjustment.slang" scale_type_x0 = "viewport" scale_x0 = "1.000000" diff --git a/reshade/halftone-print.slangp b/reshade/halftone-print.slangp index 34ac06c..439d82e 100644 --- a/reshade/halftone-print.slangp +++ b/reshade/halftone-print.slangp @@ -1,7 +1,7 @@ shaders = 2 shader0 = shaders/LUT/LUT.slang -shader1 = ../misc/cmyk-halftone-dot.slang +shader1 = ../misc/shaders/cmyk-halftone-dot.slang filter_linear1 = true textures = SamplerLUT diff --git a/sharpen/super-xbr-super-res.slangp b/sharpen/super-xbr-super-res.slangp index bd77f35..2daef71 100644 --- a/sharpen/super-xbr-super-res.slangp +++ b/sharpen/super-xbr-super-res.slangp @@ -27,11 +27,11 @@ filter_linear5 = "true" scale_type5 = "source" scale5 = "2.000000" -shader6 = "../misc/deposterize-pass0.slang" +shader6 = "../misc/shaders/deposterize/deposterize-pass0.slang" filter_linear6 = "false" scale_type6 = "source" scale6 = "1.000000" -shader7 = "../misc/deposterize-pass1.slang" +shader7 = "../misc/shaders/deposterize/deposterize-pass1.slang" filter_linear7 = "false" scale_type7 = "source" scale7 = "1.000000" diff --git a/vhs/ntsc-vcr.slangp b/vhs/ntsc-vcr.slangp index 9da582a..a18ee15 100644 --- a/vhs/ntsc-vcr.slangp +++ b/vhs/ntsc-vcr.slangp @@ -3,7 +3,7 @@ shader0 = ../ntsc/shaders/ntsc-pass1-composite-3phase.slang shader1 = ../ntsc/shaders/ntsc-pass2-3phase.slang shader2 = ../ntsc/shaders/ntsc-stock.slang shader3 = shaders/static.slang -shader4 = ../misc/image-adjustment.slang +shader4 = ../misc/shaders/image-adjustment.slang filter_linear0 = false filter_linear1 = false