From 66b77ff3a55b62600fefab20cebc93e7e08a8db5 Mon Sep 17 00:00:00 2001 From: Hyllian Date: Thu, 15 Feb 2024 11:43:09 -0300 Subject: [PATCH] Update presets dependent on crt-hyllian - Some presets updated; - Get rid of old useless presets. --- denoisers/crt-fast-bilateral-super-xbr.slangp | 25 ++++++-- .../fast-bilateral-super-2xbr-3d-3p.slangp | 39 ------------ denoisers/fast-bilateral-super-xbr-4p.slangp | 48 -------------- denoisers/fast-bilateral-super-xbr-6p.slangp | 63 ------------------- ...-bilateral-super-xbr-natural-vision.slangp | 45 ------------- denoisers/fast-bilateral-super-xbr.slangp | 38 ----------- .../crt-hyllian-sinc-smartblur-sgenpt.slangp | 40 ++++++------ presets/crt-hyllian-smartblur-sgenpt.slangp | 23 +++++-- 8 files changed, 62 insertions(+), 259 deletions(-) delete mode 100644 denoisers/fast-bilateral-super-2xbr-3d-3p.slangp delete mode 100644 denoisers/fast-bilateral-super-xbr-4p.slangp delete mode 100644 denoisers/fast-bilateral-super-xbr-6p.slangp delete mode 100644 denoisers/fast-bilateral-super-xbr-natural-vision.slangp delete mode 100644 denoisers/fast-bilateral-super-xbr.slangp diff --git a/denoisers/crt-fast-bilateral-super-xbr.slangp b/denoisers/crt-fast-bilateral-super-xbr.slangp index 69fd3676..77a16ec3 100644 --- a/denoisers/crt-fast-bilateral-super-xbr.slangp +++ b/denoisers/crt-fast-bilateral-super-xbr.slangp @@ -1,4 +1,4 @@ -shaders = "6" +shaders = "7" shader0 = "shaders/fast-bilateral.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_edge" @@ -36,11 +36,28 @@ scale_type_x4 = "source" scale_x4 = "1.000000" scale_type_y4 = "source" scale_y4 = "0.500000" -shader5 = "../crt/shaders/hyllian/crt-hyllian.slang" +shader5 = "../crt/shaders/hyllian/crt-hyllian-pass0.slang" filter_linear5 = "false" -wrap_mode5 = "clamp_to_edge" +wrap_mode5 = "clamp_to_border" +mipmap_input5 = "false" +alias5 = "" float_framebuffer5 = "false" -scale_type5 = viewport +srgb_framebuffer5 = "true" +scale_type_x5 = "viewport" +scale_x5 = "1.000000" +scale_type_y5 = "source" +scale_y5 = "1.000000" +shader6 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang" +filter_linear6 = "false" +wrap_mode6 = "clamp_to_edge" +mipmap_input6 = "false" +alias6 = "" +float_framebuffer6 = "false" +srgb_framebuffer6 = "false" +scale_type_x6 = "source" +scale_x6 = "1.000000" +scale_type_y6 = "viewport" +scale_y6 = "1.000000" parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" JINC2_WINDOW_SINC = 0.50 diff --git a/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp b/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp deleted file mode 100644 index 08c5dfa2..00000000 --- a/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp +++ /dev/null @@ -1,39 +0,0 @@ -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 = "../edge-smoothing/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 = "../edge-smoothing/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 = "../edge-smoothing/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 = "../interpolation/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 diff --git a/denoisers/fast-bilateral-super-xbr-4p.slangp b/denoisers/fast-bilateral-super-xbr-4p.slangp deleted file mode 100644 index b283cd9e..00000000 --- a/denoisers/fast-bilateral-super-xbr-4p.slangp +++ /dev/null @@ -1,48 +0,0 @@ -shaders = "6" -shader0 = "shaders/fast-bilateral.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" -filter_linear1 = "false" -wrap_mode1 = "clamp_to_edge" -scale_type_x1 = "source" -scale_x1 = "1.000000" -scale_type_y1 = "source" -scale_y1 = "1.000000" -shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_edge" -scale_type_x2 = "source" -scale_x2 = "2.000000" -scale_type_y2 = "source" -scale_y2 = "2.000000" -alias2 = "PassPrev2" -shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang" -filter_linear4 = "false" -wrap_mode4 = "clamp_to_edge" -scale_type_x4 = "source" -scale_x4 = "2.000000" -scale_type_y4 = "source" -scale_y4 = "2.000000" - -shader5 = "../interpolation/shaders/jinc2.slang" -filter_linear5 = "false" -wrap_mode5 = "clamp_to_edge" -scale_type5 = viewport - -parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" -JINC2_WINDOW_SINC = 0.42 -JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral-super-xbr-6p.slangp b/denoisers/fast-bilateral-super-xbr-6p.slangp deleted file mode 100644 index 1d0300ee..00000000 --- a/denoisers/fast-bilateral-super-xbr-6p.slangp +++ /dev/null @@ -1,63 +0,0 @@ -shaders = "8" -shader0 = "shaders/fast-bilateral.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" -filter_linear1 = "false" -wrap_mode1 = "clamp_to_edge" -scale_type_x1 = "source" -scale_x1 = "1.000000" -scale_type_y1 = "source" -scale_y1 = "1.000000" -shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_edge" -scale_type_x2 = "source" -scale_x2 = "2.000000" -scale_type_y2 = "source" -scale_y2 = "2.000000" -alias2 = "PassPrev2" -shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang" -filter_linear5 = "false" -wrap_mode5 = "clamp_to_edge" -scale_type_x5 = "source" -scale_x5 = "2.000000" -scale_type_y5 = "source" -scale_y5 = "2.000000" -shader6 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" -filter_linear6 = "false" -wrap_mode6 = "clamp_to_edge" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - - -shader7 = "../interpolation/shaders/jinc2.slang" -filter_linear7 = "false" -wrap_mode7 = "clamp_to_edge" -scale_type7 = viewport - -parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" -JINC2_WINDOW_SINC = 0.42 -JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp deleted file mode 100644 index 253ddc12..00000000 --- a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp +++ /dev/null @@ -1,45 +0,0 @@ -shaders = "6" -shader0 = "shaders/fast-bilateral.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 = "../misc/shaders/natural-vision.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear3 = "false" -wrap_mode3 = "clamp_to_edge" -scale_type_x3 = "source" -scale_x3 = "2.000000" -scale_type_y3 = "source" -scale_y3 = "2.000000" -shader4 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-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 = "../interpolation/shaders/jinc2.slang" -filter_linear5 = "false" -wrap_mode5 = "clamp_to_edge" -scale_type5 = viewport - -parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" -JINC2_WINDOW_SINC = 0.42 -JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 diff --git a/denoisers/fast-bilateral-super-xbr.slangp b/denoisers/fast-bilateral-super-xbr.slangp deleted file mode 100644 index 394f1d41..00000000 --- a/denoisers/fast-bilateral-super-xbr.slangp +++ /dev/null @@ -1,38 +0,0 @@ -shaders = "5" -shader0 = "shaders/fast-bilateral.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 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" -filter_linear1 = "false" -wrap_mode1 = "clamp_to_edge" -scale_type_x1 = "source" -scale_x1 = "1.000000" -scale_type_y1 = "source" -scale_y1 = "1.000000" -shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_edge" -scale_type_x2 = "source" -scale_x2 = "2.000000" -scale_type_y2 = "source" -scale_y2 = "2.000000" -shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.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 = "../interpolation/shaders/jinc2.slang" -filter_linear4 = "false" -wrap_mode4 = "clamp_to_edge" -scale_type4 = viewport - -parameters = "JINC2_WINDOW_SINC;JINC2_SINC;JINC2_AR_STRENGTH" -JINC2_WINDOW_SINC = 0.42 -JINC2_SINC = 0.92 -JINC2_AR_STRENGTH = 0.8 diff --git a/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp b/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp index 43309c0b..2e7880f2 100644 --- a/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp +++ b/presets/crt-hyllian-sinc-smartblur-sgenpt.slangp @@ -1,4 +1,4 @@ -shaders = "4" +shaders = "5" shader0 = "../dithering/shaders/sgenpt-mix.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" @@ -32,32 +32,36 @@ scale_type_x2 = "source" scale_x2 = "0.500000" scale_type_y2 = "source" scale_y2 = "0.500000" -shader3 = "../crt/shaders/hyllian/crt-hyllian-sinc.slang" +shader3 = "../crt/shaders/hyllian/crt-hyllian-sinc-pass0.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_border" mipmap_input3 = "false" alias3 = "" float_framebuffer3 = "false" -srgb_framebuffer3 = "false" +srgb_framebuffer3 = "true" +scale_type_x3 = "viewport" +scale_x3 = "1.000000" +scale_type_y3 = "source" +scale_y3 = "1.000000" +shader4 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang" +filter_linear4 = "false" +wrap_mode4 = "clamp_to_edge" +mipmap_input4 = "false" +alias4 = "" +float_framebuffer4 = "false" +srgb_framebuffer4 = "false" +scale_type_x4 = "source" +scale_x4 = "1.000000" +scale_type_y4 = "viewport" +scale_y4 = "1.000000" parameters = "SGPT_BLEND_OPTION;SGPT_BLEND_LEVEL;SGPT_ADJUST_VIEW;SGPT_LINEAR_GAMMA;SB_BLUR_LEVEL;SB_RED_THRESHOLD;SB_GREEN_THRESHOLD;SB_BLUE_THRESHOLD;BEAM_PROFILE;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;HFILTER_SHARPNESS;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES" -SGPT_BLEND_OPTION = "2.000000" -SGPT_BLEND_LEVEL = "0.200000" +SGPT_BLEND_OPTION = "1.000000" +SGPT_BLEND_LEVEL = "0.500000" SGPT_ADJUST_VIEW = "0.000000" SGPT_LINEAR_GAMMA = "1.000000" SB_BLUR_LEVEL = "0.660000" SB_RED_THRESHOLD = "0.200000" SB_GREEN_THRESHOLD = "0.200000" SB_BLUE_THRESHOLD = "0.200000" -BEAM_PROFILE = "0.000000" -HFILTER_PROFILE = "0.000000" -BEAM_MIN_WIDTH = "0.860000" -BEAM_MAX_WIDTH = "1.000000" -SCANLINES_STRENGTH = "0.720000" -COLOR_BOOST = "1.250000" -HFILTER_SHARPNESS = "1.000000" -PHOSPHOR_LAYOUT = "4.000000" -MASK_INTENSITY = "0.500000" -CRT_ANTI_RINGING = "1.000000" -InputGamma = "2.400000" -OutputGamma = "2.200000" -VSCANLINES = "0.000000" +PHOSPHOR_LAYOUT = "2.000000" +BRIGHTBOOST = "1.500000" diff --git a/presets/crt-hyllian-smartblur-sgenpt.slangp b/presets/crt-hyllian-smartblur-sgenpt.slangp index 7cad9d06..5d64db72 100644 --- a/presets/crt-hyllian-smartblur-sgenpt.slangp +++ b/presets/crt-hyllian-smartblur-sgenpt.slangp @@ -1,4 +1,4 @@ -shaders = "4" +shaders = "5" shader0 = "../dithering/shaders/sgenpt-mix.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" @@ -32,15 +32,30 @@ scale_type_x2 = "source" scale_x2 = "0.500000" scale_type_y2 = "source" scale_y2 = "0.500000" -shader3 = "../crt/shaders/hyllian/crt-hyllian.slang" +shader3 = "../crt/shaders/hyllian/crt-hyllian-pass0.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_border" mipmap_input3 = "false" alias3 = "" float_framebuffer3 = "false" -srgb_framebuffer3 = "false" +srgb_framebuffer3 = "true" +scale_type_x3 = "viewport" +scale_x3 = "1.000000" +scale_type_y3 = "source" +scale_y3 = "1.000000" +shader4 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang" +filter_linear4 = "false" +wrap_mode4 = "clamp_to_edge" +mipmap_input4 = "false" +alias4 = "" +float_framebuffer4 = "false" +srgb_framebuffer4 = "false" +scale_type_x4 = "source" +scale_x4 = "1.000000" +scale_type_y4 = "viewport" +scale_y4 = "1.000000" parameters = "SGPT_BLEND_OPTION;SGPT_BLEND_LEVEL;SGPT_ADJUST_VIEW;SGPT_LINEAR_GAMMA;SB_BLUR_LEVEL;SB_RED_THRESHOLD;SB_GREEN_THRESHOLD;SB_BLUE_THRESHOLD;BEAM_PROFILE;HFILTER_PROFILE;BEAM_MIN_WIDTH;BEAM_MAX_WIDTH;SCANLINES_STRENGTH;COLOR_BOOST;HFILTER_SHARPNESS;PHOSPHOR_LAYOUT;MASK_INTENSITY;CRT_ANTI_RINGING;InputGamma;OutputGamma;VSCANLINES" -SGPT_BLEND_OPTION = "2.000000" +SGPT_BLEND_OPTION = "1.000000" SGPT_BLEND_LEVEL = "0.200000" SGPT_ADJUST_VIEW = "0.000000" SGPT_LINEAR_GAMMA = "1.000000"