From 76615ce847483d1c158a06d513331325236819af Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Mon, 3 Jun 2024 17:49:42 +0100 Subject: [PATCH] Squashed 'thirdparty/slang-shaders/' changes from 6cb93ce1b..1265cf159 1265cf159 Merge pull request #601 from Hyllian/master d96718591 Add mixed-res-crt-hyllian preset 407a45729 Merge pull request #600 from Hyllian/master 8583cfee2 Update mixed-res shaders git-subtree-dir: thirdparty/slang-shaders git-subtree-split: 1265cf159d63253ab8978c7f9e63048e9d791e8c --- downsample/mixed-res-4x-crt-hyllian.slangp | 94 ++++++ downsample/mixed-res-4x-jinc2.slangp | 34 ++- .../mixed-res/2x/mixed-res-bicubic.slangp | 28 +- .../mixed-res/2x/mixed-res-bilinear.slangp | 28 +- .../mixed-res/2x/mixed-res-jinc2.slangp | 28 +- .../mixed-res/2x/mixed-res-lanczos3.slangp | 28 +- .../mixed-res/2x/mixed-res-nnedi3-luma.slangp | 28 +- .../mixed-res/2x/mixed-res-reverse-aa.slangp | 28 +- .../mixed-res/2x/mixed-res-spline16.slangp | 28 +- .../2x/mixed-res-super-xbr-film-full.slangp | 41 +-- .../2x/mixed-res-super-xbr-film.slangp | 40 ++- .../mixed-res/2x/mixed-res-super-xbr.slangp | 38 +-- .../mixed-res/3x/mixed-res-bicubic.slangp | 28 +- .../mixed-res/3x/mixed-res-bilinear.slangp | 28 +- .../mixed-res/3x/mixed-res-jinc2.slangp | 28 +- .../mixed-res/3x/mixed-res-lanczos3.slangp | 28 +- .../mixed-res/3x/mixed-res-nnedi3-luma.slangp | 28 +- .../mixed-res/3x/mixed-res-reverse-aa.slangp | 28 +- .../mixed-res/3x/mixed-res-spline16.slangp | 28 +- .../3x/mixed-res-super-xbr-film-full.slangp | 41 +-- .../3x/mixed-res-super-xbr-film.slangp | 40 ++- .../mixed-res/3x/mixed-res-super-xbr.slangp | 38 +-- .../mixed-res/4x/mixed-res-bicubic.slangp | 33 ++- .../mixed-res/4x/mixed-res-bilinear.slangp | 33 ++- .../mixed-res/4x/mixed-res-jinc2.slangp | 33 ++- .../mixed-res/4x/mixed-res-lanczos3.slangp | 33 ++- .../mixed-res/4x/mixed-res-nnedi3-luma.slangp | 33 ++- .../mixed-res/4x/mixed-res-reverse-aa.slangp | 33 ++- .../mixed-res/4x/mixed-res-spline16.slangp | 33 ++- .../4x/mixed-res-super-xbr-film-full.slangp | 41 +-- .../4x/mixed-res-super-xbr-film.slangp | 34 +-- .../mixed-res/4x/mixed-res-super-xbr.slangp | 39 ++- .../shaders/mixed-res/blur-gauss-h.slang | 2 +- .../shaders/mixed-res/blur-gauss-v.slang | 2 +- .../mixed-res/cheap-sharpen-tweaked.slang | 10 +- downsample/shaders/mixed-res/coder.slang | 2 +- .../shaders/mixed-res/hires-tagger.slang | 23 +- downsample/shaders/mixed-res/output.slang | 17 +- .../mixed-res/support/fxaa-plus-alpha.slang | 271 ++++++++++++++++++ 39 files changed, 925 insertions(+), 505 deletions(-) create mode 100644 downsample/mixed-res-4x-crt-hyllian.slangp create mode 100644 downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang diff --git a/downsample/mixed-res-4x-crt-hyllian.slangp b/downsample/mixed-res-4x-crt-hyllian.slangp new file mode 100644 index 000000000..d6a1c4c86 --- /dev/null +++ b/downsample/mixed-res-4x-crt-hyllian.slangp @@ -0,0 +1,94 @@ +shaders = "10" +feedback_pass = "0" + +shader0 = "shaders/mixed-res/multiLUT-modified.slang" +scale_type0 = "source" +scale0 = "1.000000" + + +SamplerLUT1 = "../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true + +shader1 = "shaders/mixed-res/coder.slang" +scale_type1 = "source" +scale1 = "1.000000" + +shader2 = "shaders/mixed-res/hires-tagger.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +scale_type2 = "source" +scale2 = "1.000000" + +shader3 = "shaders/mixed-res/blur-gauss-h.slang" +filter_linear3 = true +scale_type3 = source +scale3 = 0.25 + +shader4 = "shaders/mixed-res/blur-gauss-v.slang" +filter_linear4 = true +alias4 = "BlurSource" +scale_type4 = source +scale4 = 1.0 + +shader5 = "../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 + +shader6 = "../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 + + +shader7 = "../crt/shaders/hyllian/crt-hyllian-pass0.slang" +filter_linear7 = "false" +wrap_mode7 = "clamp_to_border" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" +scale_x7 = "1.000000" +scale_type_y7 = "source" +scale_y7 = "1.000000" + +shader8 = "../crt/shaders/hyllian/crt-hyllian-pass1.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type_x8 = "source" +scale_x8 = "1.000000" +scale_type_y8 = "viewport" +scale_y8 = "1.000000" + +shader9 = "shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" + +LUT_selector_param = "2.000000" + +IR_SCALE = "4.0" +B_TRESH = "0.30" +B_HL = "0.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" + +HFILTER_PROFILE = "1.000000" +BEAM_MIN_WIDTH = "0.860000" +BEAM_MAX_WIDTH = "1.000000" +SCANLINES_STRENGTH = "0.720000" +BRIGHTBOOST = "1.500000" +PHOSPHOR_LAYOUT = "2.000000" +MASK_INTENSITY = "0.650000" +CURVATURE = "0.000000" +WARP_X = "0.000000" +WARP_Y = "0.025000" +CORNER_SIZE = "0.011000" + +textures = "SamplerLUT1;SamplerLUT2" + diff --git a/downsample/mixed-res-4x-jinc2.slangp b/downsample/mixed-res-4x-jinc2.slangp index 8eee3aa63..696eb97fb 100644 --- a/downsample/mixed-res-4x-jinc2.slangp +++ b/downsample/mixed-res-4x-jinc2.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "shaders/mixed-res/blur-gauss-v.slang" +shader3 = "shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -61,10 +66,11 @@ scale_type9 = "source" scale9 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" OFFSET = "3.000000" DEBLUR = "3.000000" SMART = "1.000000" + diff --git a/downsample/mixed-res/2x/mixed-res-bicubic.slangp b/downsample/mixed-res/2x/mixed-res-bicubic.slangp index b6340c29f..ab8f1a94a 100644 --- a/downsample/mixed-res/2x/mixed-res-bicubic.slangp +++ b/downsample/mixed-res/2x/mixed-res-bicubic.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -64,6 +67,7 @@ scale9 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-bilinear.slangp b/downsample/mixed-res/2x/mixed-res-bilinear.slangp index b49780ead..384b7d1b8 100644 --- a/downsample/mixed-res/2x/mixed-res-bilinear.slangp +++ b/downsample/mixed-res/2x/mixed-res-bilinear.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -68,6 +71,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-jinc2.slangp b/downsample/mixed-res/2x/mixed-res-jinc2.slangp index 5f1cd7d45..702b3f803 100644 --- a/downsample/mixed-res/2x/mixed-res-jinc2.slangp +++ b/downsample/mixed-res/2x/mixed-res-jinc2.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -61,6 +64,7 @@ scale_type9 = "source" scale9 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-lanczos3.slangp b/downsample/mixed-res/2x/mixed-res-lanczos3.slangp index ab45ad83a..2183e71ed 100644 --- a/downsample/mixed-res/2x/mixed-res-lanczos3.slangp +++ b/downsample/mixed-res/2x/mixed-res-lanczos3.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -70,6 +73,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp b/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp index 6d4539439..aadc02a70 100644 --- a/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp +++ b/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp @@ -9,23 +9,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -109,6 +112,7 @@ scale15 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp b/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp index f1a9b1c9f..5267c89f0 100644 --- a/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp +++ b/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -69,6 +72,7 @@ scale10 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-spline16.slangp b/downsample/mixed-res/2x/mixed-res-spline16.slangp index ef82ca894..74990db10 100644 --- a/downsample/mixed-res/2x/mixed-res-spline16.slangp +++ b/downsample/mixed-res/2x/mixed-res-spline16.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.5 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -70,6 +73,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp index e5da14bd2..0fdfc874a 100644 --- a/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp +++ b/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp @@ -1,48 +1,32 @@ shaders = "12" shader0 = "../../shaders/mixed-res/coder.slang" -wrap_mode0 = "clamp_to_border" -mipmap_input0 = "false" -alias0 = "" -float_framebuffer0 = "false" -srgb_framebuffer0 = "false" -scale_type_x0 = "source" -scale_x0 = "1.000000" -scale_type_y0 = "source" -scale_y0 = "1.000000" +scale_type0 = "source" +scale0 = "1.000000" shader1 = "../../shaders/mixed-res/hires-tagger.slang" filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" -mipmap_input1 = "false" -float_framebuffer1 = "false" -srgb_framebuffer1 = "false" -scale_type_x1 = "source" -scale_x1 = "1.000000" -scale_type_y1 = "source" -scale_y1 = "1.000000" +alias1 = "HiresSource" +scale_type1 = "source" +scale1 = "1.000000" shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear2 = true -scale_type_x2 = source -scale_x2 = 1.0 -scale_type_y2 = source -scale_y2 = 1.0 +scale_type2 = source +scale2 = 0.5 shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type_x3 = source -scale_x3 = 1.0 -scale_type_y3 = source -scale_y3 = 1.0 +alias3 = "BlurSource" +scale_type3 = source +scale3 = 1.0 shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" filter_linear4 = true alias4 = "XbrSource" wrap_mode4 = "clamp_to_edge" scale_type4 = source -scale4 = 0.5 +scale4 = 1.0 shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear5 = "false" @@ -113,8 +97,7 @@ scale11 = 1.0 IR_SCALE = "2.0" -B_TRESH = "0.20" -CS_RADIUS = "2.0" +B_TRESH = "0.30" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp index e77182fd3..4283bac5d 100644 --- a/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp +++ b/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp @@ -22,27 +22,26 @@ scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type_x2 = source -scale_x2 = 1.0 -scale_type_y2 = source -scale_y2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type_x3 = source -scale_x3 = 1.0 -scale_type_y3 = source -scale_y3 = 1.0 +scale_type3 = source +scale3 = 0.5 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -alias4 = "" -wrap_mode4 = "clamp_to_edge" -scale_type4 = source -scale4 = 0.5 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../film/shaders/film-grain.slang" filter_linear5 = false @@ -97,7 +96,7 @@ scale9 = 1.0 shader10 = "../../../deblur/shaders/deblur.slang" filter_linear10 = "true" -wrap_mode10 = "clamp_to_border" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = "source" scale10 = "1.000000" @@ -116,12 +115,11 @@ scale_y11 = "1.000000" IR_SCALE = "2.0" -B_TRESH = "0.20" -CS_RADIUS = "2.0" +B_TRESH = "0.30" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" -C = "0.330000" +C = "0.500000" CS_SHARPNESS = "0.200000" OFFSET = "3.000000" DEBLUR = "3.000000" diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr.slangp index e15397329..775c6bde9 100644 --- a/downsample/mixed-res/2x/mixed-res-super-xbr.slangp +++ b/downsample/mixed-res/2x/mixed-res-super-xbr.slangp @@ -4,12 +4,6 @@ shader0 = "../../shaders/mixed-res/multiLUT-modified.slang" scale_type0 = "source" scale0 = "1.000000" -textures = "SamplerLUT1;SamplerLUT2" -SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" -SamplerLUT1_linear = true -SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" -SamplerLUT2_linear = true - shader1 = "../../shaders/mixed-res/coder.slang" scale_type1 = "source" scale1 = "1.000000" @@ -19,23 +13,24 @@ filter_linear2 = "true" scale_type2 = "source" scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear3 = true -scale_type3 = source -scale3 = 1.0 +shader3 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear3 = "true" +alias3 = "HiresSource" +wrap_mode3 = "clamp_to_edge" +srgb_framebuffer3 = true +scale_type3 = "source" +scale3 = "1.000000" -shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear4 = true -alias4 = "HiresSource" scale_type4 = source -scale4 = 1.0 +scale4 = 0.5 -shader5 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader5 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear5 = true -wrap_mode5 = "clamp_to_edge" -srgb_framebuffer5 = "true" +alias5 = "BlurSource" scale_type5 = source -scale5 = 0.5 +scale5 = 1.0 shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear6 = false @@ -50,7 +45,6 @@ wrap_mode7 = "clamp_to_border" scale_type7 = source scale7 = 1.0 - shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" @@ -87,14 +81,20 @@ scale_type12 = "source" scale12 = "1.000000" shader13 = "../../shaders/mixed-res/output.slang" -filter_linear13 = false +filter_linear13 = true wrap_mode13 = "clamp_to_border" scale_type13 = "source" scale13 = "1.000000" +textures = "SamplerLUT1;SamplerLUT2" +SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true LUT_selector_param = "2.000000" IR_SCALE = "2.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-bicubic.slangp b/downsample/mixed-res/3x/mixed-res-bicubic.slangp index 615120095..8e1217a86 100644 --- a/downsample/mixed-res/3x/mixed-res-bicubic.slangp +++ b/downsample/mixed-res/3x/mixed-res-bicubic.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -64,6 +67,7 @@ scale9 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-bilinear.slangp b/downsample/mixed-res/3x/mixed-res-bilinear.slangp index 179412ba1..2d23cde06 100644 --- a/downsample/mixed-res/3x/mixed-res-bilinear.slangp +++ b/downsample/mixed-res/3x/mixed-res-bilinear.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -68,6 +71,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-jinc2.slangp b/downsample/mixed-res/3x/mixed-res-jinc2.slangp index e686e6933..7a7d34bf3 100644 --- a/downsample/mixed-res/3x/mixed-res-jinc2.slangp +++ b/downsample/mixed-res/3x/mixed-res-jinc2.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -61,6 +64,7 @@ scale_type9 = "source" scale9 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-lanczos3.slangp b/downsample/mixed-res/3x/mixed-res-lanczos3.slangp index e19d5ccda..de369423d 100644 --- a/downsample/mixed-res/3x/mixed-res-lanczos3.slangp +++ b/downsample/mixed-res/3x/mixed-res-lanczos3.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -70,6 +73,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp b/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp index d779551dc..fc5934a7e 100644 --- a/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp +++ b/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp @@ -9,23 +9,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -109,6 +112,7 @@ scale15 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp b/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp index 1f8c97877..e6e223d93 100644 --- a/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp +++ b/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -69,6 +72,7 @@ scale10 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-spline16.slangp b/downsample/mixed-res/3x/mixed-res-spline16.slangp index 44016924d..e59169461 100644 --- a/downsample/mixed-res/3x/mixed-res-spline16.slangp +++ b/downsample/mixed-res/3x/mixed-res-spline16.slangp @@ -10,23 +10,26 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type3 = source -scale3 = 1.0 +scale3 = 0.333333 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -70,6 +73,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp index b6a43495e..6ddbfe0cb 100644 --- a/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp +++ b/downsample/mixed-res/3x/mixed-res-super-xbr-film-full.slangp @@ -1,48 +1,32 @@ shaders = "12" shader0 = "../../shaders/mixed-res/coder.slang" -wrap_mode0 = "clamp_to_border" -mipmap_input0 = "false" -alias0 = "" -float_framebuffer0 = "false" -srgb_framebuffer0 = "false" -scale_type_x0 = "source" -scale_x0 = "1.000000" -scale_type_y0 = "source" -scale_y0 = "1.000000" +scale_type0 = "source" +scale0 = "1.000000" shader1 = "../../shaders/mixed-res/hires-tagger.slang" filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" -mipmap_input1 = "false" -float_framebuffer1 = "false" -srgb_framebuffer1 = "false" -scale_type_x1 = "source" -scale_x1 = "1.000000" -scale_type_y1 = "source" -scale_y1 = "1.000000" +alias1 = "HiresSource" +scale_type1 = "source" +scale1 = "1.000000" shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear2 = true -scale_type_x2 = source -scale_x2 = 1.0 -scale_type_y2 = source -scale_y2 = 1.0 +scale_type2 = source +scale2 = 0.333333 shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type_x3 = source -scale_x3 = 1.0 -scale_type_y3 = source -scale_y3 = 1.0 +alias3 = "BlurSource" +scale_type3 = source +scale3 = 1.0 shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" filter_linear4 = true alias4 = "XbrSource" wrap_mode4 = "clamp_to_edge" scale_type4 = source -scale4 = 0.333333 +scale4 = 1.0 shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear5 = "false" @@ -113,8 +97,7 @@ scale11 = 1.0 IR_SCALE = "3.0" -B_TRESH = "0.20" -CS_RADIUS = "3.0" +B_TRESH = "0.30" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp index 7efa52eb3..943a469c7 100644 --- a/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp +++ b/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp @@ -22,27 +22,26 @@ scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type_x2 = source -scale_x2 = 1.0 -scale_type_y2 = source -scale_y2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type_x3 = source -scale_x3 = 1.0 -scale_type_y3 = source -scale_y3 = 1.0 +scale_type3 = source +scale3 = 0.333333 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -alias4 = "" -wrap_mode4 = "clamp_to_edge" -scale_type4 = source -scale4 = 0.333333 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../film/shaders/film-grain.slang" filter_linear5 = false @@ -97,7 +96,7 @@ scale9 = 1.0 shader10 = "../../../deblur/shaders/deblur.slang" filter_linear10 = "true" -wrap_mode10 = "clamp_to_border" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = "source" scale10 = "1.000000" @@ -116,12 +115,11 @@ scale_y11 = "1.000000" IR_SCALE = "3.0" -B_TRESH = "0.20" -CS_RADIUS = "3.0" +B_TRESH = "0.30" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" -C = "0.330000" +C = "0.500000" CS_SHARPNESS = "0.200000" OFFSET = "3.000000" DEBLUR = "3.000000" diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr.slangp index c7eb928c6..2de291c33 100644 --- a/downsample/mixed-res/3x/mixed-res-super-xbr.slangp +++ b/downsample/mixed-res/3x/mixed-res-super-xbr.slangp @@ -4,12 +4,6 @@ shader0 = "../../shaders/mixed-res/multiLUT-modified.slang" scale_type0 = "source" scale0 = "1.000000" -textures = "SamplerLUT1;SamplerLUT2" -SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" -SamplerLUT1_linear = true -SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" -SamplerLUT2_linear = true - shader1 = "../../shaders/mixed-res/coder.slang" scale_type1 = "source" scale1 = "1.000000" @@ -19,23 +13,24 @@ filter_linear2 = "true" scale_type2 = "source" scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear3 = true -scale_type3 = source -scale3 = 1.0 +shader3 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear3 = "true" +alias3 = "HiresSource" +wrap_mode3 = "clamp_to_edge" +srgb_framebuffer3 = true +scale_type3 = "source" +scale3 = "1.000000" -shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear4 = true -alias4 = "HiresSource" scale_type4 = source -scale4 = 1.0 +scale4 = 0.333333 -shader5 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader5 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear5 = true -wrap_mode5 = "clamp_to_edge" -srgb_framebuffer5 = "true" +alias5 = "BlurSource" scale_type5 = source -scale5 = 0.333333 +scale5 = 1.0 shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear6 = false @@ -50,7 +45,6 @@ wrap_mode7 = "clamp_to_border" scale_type7 = source scale7 = 1.0 - shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" @@ -87,14 +81,20 @@ scale_type12 = "source" scale12 = "1.000000" shader13 = "../../shaders/mixed-res/output.slang" -filter_linear13 = false +filter_linear13 = true wrap_mode13 = "clamp_to_border" scale_type13 = "source" scale13 = "1.000000" +textures = "SamplerLUT1;SamplerLUT2" +SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true LUT_selector_param = "2.000000" IR_SCALE = "3.0" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-bicubic.slangp b/downsample/mixed-res/4x/mixed-res-bicubic.slangp index 9470e3006..d655b0224 100644 --- a/downsample/mixed-res/4x/mixed-res-bicubic.slangp +++ b/downsample/mixed-res/4x/mixed-res-bicubic.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -64,7 +69,7 @@ scale9 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-bilinear.slangp b/downsample/mixed-res/4x/mixed-res-bilinear.slangp index 4b3c0be24..3506e7ea9 100644 --- a/downsample/mixed-res/4x/mixed-res-bilinear.slangp +++ b/downsample/mixed-res/4x/mixed-res-bilinear.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -68,7 +73,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-jinc2.slangp b/downsample/mixed-res/4x/mixed-res-jinc2.slangp index c7aab8982..0e4857eb6 100644 --- a/downsample/mixed-res/4x/mixed-res-jinc2.slangp +++ b/downsample/mixed-res/4x/mixed-res-jinc2.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -61,7 +66,7 @@ scale_type9 = "source" scale9 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-lanczos3.slangp b/downsample/mixed-res/4x/mixed-res-lanczos3.slangp index aed135ed7..269d01afc 100644 --- a/downsample/mixed-res/4x/mixed-res-lanczos3.slangp +++ b/downsample/mixed-res/4x/mixed-res-lanczos3.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -70,7 +75,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp b/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp index 028141d47..d42b98523 100644 --- a/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp +++ b/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp @@ -9,23 +9,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -109,7 +114,7 @@ scale15 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp b/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp index d770cfbcc..f3f5d8ee8 100644 --- a/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp +++ b/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -69,7 +74,7 @@ scale10 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-spline16.slangp b/downsample/mixed-res/4x/mixed-res-spline16.slangp index cd40c48d3..b11056e96 100644 --- a/downsample/mixed-res/4x/mixed-res-spline16.slangp +++ b/downsample/mixed-res/4x/mixed-res-spline16.slangp @@ -10,23 +10,28 @@ filter_linear1 = "true" scale_type1 = "source" scale1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type2 = source -scale2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type3 = source -scale3 = 1.0 +scale_type_x3 = source +scale_x3 = 0.25 +scale_type_y3 = source +scale_y3 = 0.25 -shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -wrap_mode4 = "clamp_to_edge" -srgb_framebuffer4 = "true" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false @@ -70,7 +75,7 @@ scale_type10 = "source" scale10 = "1.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp index 97ec0c590..7a385f54a 100644 --- a/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp +++ b/downsample/mixed-res/4x/mixed-res-super-xbr-film-full.slangp @@ -1,48 +1,32 @@ shaders = "12" shader0 = "../../shaders/mixed-res/coder.slang" -wrap_mode0 = "clamp_to_border" -mipmap_input0 = "false" -alias0 = "" -float_framebuffer0 = "false" -srgb_framebuffer0 = "false" -scale_type_x0 = "source" -scale_x0 = "1.000000" -scale_type_y0 = "source" -scale_y0 = "1.000000" +scale_type0 = "source" +scale0 = "1.000000" shader1 = "../../shaders/mixed-res/hires-tagger.slang" filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" -mipmap_input1 = "false" -float_framebuffer1 = "false" -srgb_framebuffer1 = "false" -scale_type_x1 = "source" -scale_x1 = "1.000000" -scale_type_y1 = "source" -scale_y1 = "1.000000" +alias1 = "HiresSource" +scale_type1 = "source" +scale1 = "1.000000" shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear2 = true -scale_type_x2 = source -scale_x2 = 1.0 -scale_type_y2 = source -scale_y2 = 1.0 +scale_type2 = source +scale2 = 0.25 shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear3 = true -alias3 = "HiresSource" -scale_type_x3 = source -scale_x3 = 1.0 -scale_type_y3 = source -scale_y3 = 1.0 +alias3 = "BlurSource" +scale_type3 = source +scale3 = 1.0 shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" filter_linear4 = true alias4 = "XbrSource" wrap_mode4 = "clamp_to_edge" scale_type4 = source -scale4 = 0.25 +scale4 = 1.0 shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear5 = "false" @@ -113,8 +97,7 @@ scale11 = 1.0 IR_SCALE = "4.0" -B_TRESH = "0.10" -CS_RADIUS = "4.0" +B_TRESH = "0.30" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" diff --git a/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp index dc7591260..193a1b4b4 100644 --- a/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp +++ b/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp @@ -22,27 +22,28 @@ scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear2 = true -scale_type_x2 = source -scale_x2 = 1.0 -scale_type_y2 = source -scale_y2 = 1.0 +shader2 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear2 = "true" +alias2 = "HiresSource" +wrap_mode2 = "clamp_to_edge" +srgb_framebuffer2 = true +scale_type2 = "source" +scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear3 = true -alias3 = "HiresSource" scale_type_x3 = source -scale_x3 = 1.0 +scale_x3 = 0.25 scale_type_y3 = source -scale_y3 = 1.0 +scale_y3 = 0.25 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear4 = true -alias4 = "" -wrap_mode4 = "clamp_to_edge" -scale_type4 = source -scale4 = 0.25 +alias4 = "BlurSource" +scale_type_x4 = source +scale_x4 = 1.0 +scale_type_y4 = source +scale_y4 = 1.0 shader5 = "../../../film/shaders/film-grain.slang" filter_linear5 = false @@ -116,8 +117,7 @@ scale_y11 = "1.000000" IR_SCALE = "4.0" -CS_RADIUS = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" diff --git a/downsample/mixed-res/4x/mixed-res-super-xbr.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr.slangp index 667d921a9..752743a87 100644 --- a/downsample/mixed-res/4x/mixed-res-super-xbr.slangp +++ b/downsample/mixed-res/4x/mixed-res-super-xbr.slangp @@ -4,12 +4,6 @@ shader0 = "../../shaders/mixed-res/multiLUT-modified.slang" scale_type0 = "source" scale0 = "1.000000" -textures = "SamplerLUT1;SamplerLUT2" -SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" -SamplerLUT1_linear = true -SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" -SamplerLUT2_linear = true - shader1 = "../../shaders/mixed-res/coder.slang" scale_type1 = "source" scale1 = "1.000000" @@ -19,23 +13,24 @@ filter_linear2 = "true" scale_type2 = "source" scale2 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-h.slang" -filter_linear3 = true -scale_type3 = source -scale3 = 1.0 +shader3 = "../../shaders/mixed-res/support/fxaa-plus-alpha.slang" +filter_linear3 = "true" +alias3 = "HiresSource" +wrap_mode3 = "clamp_to_edge" +srgb_framebuffer3 = true +scale_type3 = "source" +scale3 = "1.000000" -shader4 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader4 = "../../shaders/mixed-res/blur-gauss-h.slang" filter_linear4 = true -alias4 = "HiresSource" scale_type4 = source -scale4 = 1.0 +scale4 = 0.25 -shader5 = "../../../interpolation/shaders/b-spline-4-taps.slang" +shader5 = "../../shaders/mixed-res/blur-gauss-v.slang" filter_linear5 = true -wrap_mode5 = "clamp_to_edge" -srgb_framebuffer5 = "true" +alias5 = "BlurSource" scale_type5 = source -scale5 = 0.25 +scale5 = 1.0 shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear6 = false @@ -50,7 +45,6 @@ wrap_mode7 = "clamp_to_border" scale_type7 = source scale7 = 1.0 - shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" @@ -87,15 +81,20 @@ scale_type12 = "source" scale12 = "1.000000" shader13 = "../../shaders/mixed-res/output.slang" -filter_linear13 = false +filter_linear13 = true wrap_mode13 = "clamp_to_border" scale_type13 = "source" scale13 = "1.000000" +textures = "SamplerLUT1;SamplerLUT2" +SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true LUT_selector_param = "2.000000" IR_SCALE = "4.0" -B_TRESH = "0.10" +B_TRESH = "0.30" FRANGE = "2.000000" FBSMOOTH = "0.150000" FSIGMA = "1.000000" diff --git a/downsample/shaders/mixed-res/blur-gauss-h.slang b/downsample/shaders/mixed-res/blur-gauss-h.slang index 34a46ba2f..f20e641ee 100644 --- a/downsample/shaders/mixed-res/blur-gauss-h.slang +++ b/downsample/shaders/mixed-res/blur-gauss-h.slang @@ -31,7 +31,7 @@ layout(location = 0) out vec2 vTexCoord; void main() { gl_Position = global.MVP * Position; - vTexCoord = TexCoord; + vTexCoord = TexCoord * 1.0001; } #pragma stage fragment diff --git a/downsample/shaders/mixed-res/blur-gauss-v.slang b/downsample/shaders/mixed-res/blur-gauss-v.slang index 2455c7f2b..8d3cf5514 100644 --- a/downsample/shaders/mixed-res/blur-gauss-v.slang +++ b/downsample/shaders/mixed-res/blur-gauss-v.slang @@ -31,7 +31,7 @@ layout(location = 0) out vec2 vTexCoord; void main() { gl_Position = global.MVP * Position; - vTexCoord = TexCoord; + vTexCoord = TexCoord * 1.0001; } #pragma stage fragment diff --git a/downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang b/downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang index 50bfd3091..7d5da3070 100644 --- a/downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang +++ b/downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang @@ -29,14 +29,14 @@ layout(push_constant) uniform Push vec4 OutputSize; uint FrameCount; float CS_SHARPNESS; - float CS_RADIUS; + float IR_SCALE; } params; #pragma parameter CS_SHARPNESS "Sharpness" 0.4 0.0 1.0 0.1 -#pragma parameter CS_RADIUS "Sharpness Radius" 1.0 1.0 8.0 1.0 +#pragma parameter IR_SCALE "INTERNAL RESOLUTION SCALE" 1.0 1.0 8.0 1.0 #define CS_SHARPNESS params.CS_SHARPNESS -#define CS_RADIUS params.CS_RADIUS +#define IR_SCALE params.IR_SCALE layout(std140, set = 0, binding = 0) uniform UBO { @@ -54,8 +54,8 @@ void main() { gl_Position = global.MVP * Position; vTexCoord = TexCoord * 1.0001; - float dx = params.SourceSize.z * CS_RADIUS; - float dy = params.SourceSize.w * CS_RADIUS; + float dx = params.SourceSize.z * IR_SCALE; + float dy = params.SourceSize.w * IR_SCALE; t1 = vTexCoord.xyyy + vec4( 0.0, -dy, 0.0, dy); // B E H t2 = vTexCoord.xxxy + vec4( -dx, 0.0, dx, 0.0); // D E F diff --git a/downsample/shaders/mixed-res/coder.slang b/downsample/shaders/mixed-res/coder.slang index f894308c7..4b5da7c91 100644 --- a/downsample/shaders/mixed-res/coder.slang +++ b/downsample/shaders/mixed-res/coder.slang @@ -25,7 +25,7 @@ layout(location = 0) out vec2 vTexCoord; void main() { gl_Position = global.MVP * Position; - vTexCoord = TexCoord; + vTexCoord = TexCoord * 1.0001; } diff --git a/downsample/shaders/mixed-res/hires-tagger.slang b/downsample/shaders/mixed-res/hires-tagger.slang index 4ef33a4d3..22ee20ce2 100644 --- a/downsample/shaders/mixed-res/hires-tagger.slang +++ b/downsample/shaders/mixed-res/hires-tagger.slang @@ -32,19 +32,31 @@ layout(push_constant) uniform Push vec4 OutputSize; uint FrameCount; float IR_SCALE; + float EQ_THRESH; } params; #pragma parameter IR_SCALE "INTERNAL RESOLUTION SCALE" 1.0 1.0 8.0 1.0 #pragma parameter B_VIEW "SHOW HIRES DETECTION" 0.0 0.0 1.0 1.0 -#pragma parameter B_TRESH "BLUR THRESHOLD" 0.2 0.0 1.0 0.01 +#pragma parameter B_TRESH "DETECTION THRESHOLD" 0.3 0.0 1.0 0.02 +#pragma parameter EQ_THRESH "ARTIFACTS MITIGATION" 0.0 0.0 0.02 0.005 #define IR_SCALE params.IR_SCALE +#define EQ_THRESH params.EQ_THRESH layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; } global; +float diff(float a, float b) +{ + return abs(a-b); +} + +bool eq(float a, float b) +{ + return (diff(a, b) <= EQ_THRESH); +} #pragma stage vertex layout(location = 0) in vec4 Position; @@ -54,7 +66,7 @@ layout(location = 0) out vec2 vTexCoord; void main() { gl_Position = global.MVP * Position; - vTexCoord = TexCoord; + vTexCoord = TexCoord * 1.0001; } @@ -69,13 +81,12 @@ void main() { vec2 tex = (floor(vTexCoord*params.SourceSize.xy/IR_SCALE) + vec2(0.5, 0.5))*IR_SCALE/params.SourceSize.xy; - vec2 g1 = vec2(IR_SCALE/params.SourceSize.x, 0.0); - vec2 g2 = vec2(0.0, IR_SCALE/params.SourceSize.y); + vec2 dxy = IR_SCALE * params.SourceSize.zw; - float k0 = texture(Source, tex +0.1*g1+0.1*g2).a; + float k0 = texture(Source, tex + 0.1*dxy).a; float k1 = texture(Source, tex).a; - float hires = (k0==k1) ? 0.0 : 1.0; + float hires = eq(k0,k1) ? 0.0 : 1.0; FragColor = vec4(texture(Source, vTexCoord).rgb, hires); } diff --git a/downsample/shaders/mixed-res/output.slang b/downsample/shaders/mixed-res/output.slang index 2928f4671..d766373bb 100644 --- a/downsample/shaders/mixed-res/output.slang +++ b/downsample/shaders/mixed-res/output.slang @@ -8,13 +8,16 @@ layout(push_constant) uniform Push uint FrameCount; float B_VIEW; float B_TRESH; + float B_HL; } params; #pragma parameter B_VIEW "SHOW HIRES DETECTION" 0.0 0.0 1.0 1.0 -#pragma parameter B_TRESH "BLUR THRESHOLD" 0.2 0.0 1.0 0.01 +#pragma parameter B_TRESH "DETECTION THRESHOLD" 0.3 0.0 1.0 0.02 +#pragma parameter B_HL "HI-LOW MIXER" 1.0 0.0 1.0 0.1 #define B_VIEW params.B_VIEW #define B_TRESH params.B_TRESH +#define B_HL params.B_HL layout(std140, set = 0, binding = 0) uniform UBO { @@ -31,7 +34,7 @@ layout(location = 0) out vec2 vTexCoord; void main() { gl_Position = global.MVP * Position; - vTexCoord = TexCoord; + vTexCoord = TexCoord * 1.0001; } #pragma stage fragment @@ -39,15 +42,15 @@ layout(location = 0) in vec2 vTexCoord; layout(location = 0) out vec4 FragColor; layout(set = 0, binding = 2) uniform sampler2D Source; layout(set = 0, binding = 3) uniform sampler2D HiresSource; +layout(set = 0, binding = 4) uniform sampler2D BlurSource; void main() { - vec4 c_a = texture(HiresSource, vTexCoord); - - float tag = c_a.a; - - vec3 c_hires = c_a.rgb; vec3 c_lowres = texture(Source, vTexCoord).rgb; + vec3 c_hires = texture(HiresSource, vTexCoord).rgb; + float tag = texture(BlurSource, vTexCoord).a; + + c_hires = mix(c_lowres, c_hires, clamp(0.5*tag+B_HL, 0.0, 1.0)); vec3 color = mix(c_lowres, mix(c_hires, vec3(0.0, 0.0, dot(c_hires, coder)), B_VIEW), smoothstep(0.0, B_TRESH, tag)); diff --git a/downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang b/downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang new file mode 100644 index 000000000..4ff5744cc --- /dev/null +++ b/downsample/shaders/mixed-res/support/fxaa-plus-alpha.slang @@ -0,0 +1,271 @@ +#version 450 + +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; + +/** + * @license + * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. + * + * TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED + * *AS IS* AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS + * OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, NONINFRINGEMENT,IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA + * OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, SPECIAL, INCIDENTAL, INDIRECT, OR + * CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS + * OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY + * OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, + * EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ + +/* +FXAA_PRESET - Choose compile-in knob preset 0-5. +------------------------------------------------------------------------------ +FXAA_EDGE_THRESHOLD - The minimum amount of local contrast required + to apply algorithm. + 1.0/3.0 - too little + 1.0/4.0 - good start + 1.0/8.0 - applies to more edges + 1.0/16.0 - overkill +------------------------------------------------------------------------------ +FXAA_EDGE_THRESHOLD_MIN - Trims the algorithm from processing darks. + Perf optimization. + 1.0/32.0 - visible limit (smaller isn't visible) + 1.0/16.0 - good compromise + 1.0/12.0 - upper limit (seeing artifacts) +------------------------------------------------------------------------------ +FXAA_SEARCH_STEPS - Maximum number of search steps for end of span. +------------------------------------------------------------------------------ +FXAA_SEARCH_THRESHOLD - Controls when to stop searching. + 1.0/4.0 - seems to be the best quality wise +------------------------------------------------------------------------------ +FXAA_SUBPIX_TRIM - Controls sub-pixel aliasing removal. + 1.0/2.0 - low removal + 1.0/3.0 - medium removal + 1.0/4.0 - default removal + 1.0/8.0 - high removal + 0.0 - complete removal +------------------------------------------------------------------------------ +FXAA_SUBPIX_CAP - Insures fine detail is not completely removed. + This is important for the transition of sub-pixel detail, + like fences and wires. + 3.0/4.0 - default (medium amount of filtering) + 7.0/8.0 - high amount of filtering + 1.0 - no capping of sub-pixel aliasing removal +*/ + +#ifndef FXAA_PRESET + #define FXAA_PRESET 5 +#endif +#if (FXAA_PRESET == 3) + #define FXAA_EDGE_THRESHOLD (1.0/8.0) + #define FXAA_EDGE_THRESHOLD_MIN (1.0/16.0) + #define FXAA_SEARCH_STEPS 16 + #define FXAA_SEARCH_THRESHOLD (1.0/4.0) + #define FXAA_SUBPIX_CAP (3.0/4.0) + #define FXAA_SUBPIX_TRIM (1.0/4.0) +#endif +#if (FXAA_PRESET == 4) + #define FXAA_EDGE_THRESHOLD (1.0/8.0) + #define FXAA_EDGE_THRESHOLD_MIN (1.0/24.0) + #define FXAA_SEARCH_STEPS 24 + #define FXAA_SEARCH_THRESHOLD (1.0/4.0) + #define FXAA_SUBPIX_CAP (3.0/4.0) + #define FXAA_SUBPIX_TRIM (1.0/4.0) +#endif +#if (FXAA_PRESET == 5) + #define FXAA_EDGE_THRESHOLD (1.0/8.0) + #define FXAA_EDGE_THRESHOLD_MIN (1.0/24.0) + #define FXAA_SEARCH_STEPS 32 + #define FXAA_SEARCH_THRESHOLD (1.0/4.0) + #define FXAA_SUBPIX_CAP (3.0/4.0) + #define FXAA_SUBPIX_TRIM (1.0/4.0) +#endif + +#define FXAA_SUBPIX_TRIM_SCALE (1.0/(1.0 - FXAA_SUBPIX_TRIM)) + +// Return the luma, the estimation of luminance from rgb inputs. +// This approximates luma using one FMA instruction, +// skipping normalization and tossing out blue. +// FxaaLuma() will range 0.0 to 2.963210702. +float FxaaLuma(vec3 rgb) { + return rgb.y * (0.587/0.299) + rgb.x; +} + +vec3 FxaaLerp3(vec3 a, vec3 b, float amountOfA) { + return (vec3(-amountOfA) * b) + ((a * vec3(amountOfA)) + b); +} + +vec4 FxaaTexOff(sampler2D tex, vec2 pos, ivec2 off, vec2 rcpFrame) { + float x = pos.x + float(off.x) * rcpFrame.x; + float y = pos.y + float(off.y) * rcpFrame.y; + return texture(tex, vec2(x, y)); +} + +// pos is the output of FxaaVertexShader interpolated across screen. +// xy -> actual texture position {0.0 to 1.0} +// rcpFrame should be a uniform equal to {1.0/frameWidth, 1.0/frameHeight} +vec3 FxaaPixelShader(vec2 pos, sampler2D tex, vec2 rcpFrame) +{ + vec3 rgbN = FxaaTexOff(tex, pos.xy, ivec2( 0,-1), rcpFrame).xyz; + vec3 rgbW = FxaaTexOff(tex, pos.xy, ivec2(-1, 0), rcpFrame).xyz; + vec3 rgbM = FxaaTexOff(tex, pos.xy, ivec2( 0, 0), rcpFrame).xyz; + vec3 rgbE = FxaaTexOff(tex, pos.xy, ivec2( 1, 0), rcpFrame).xyz; + vec3 rgbS = FxaaTexOff(tex, pos.xy, ivec2( 0, 1), rcpFrame).xyz; + + float lumaN = FxaaLuma(rgbN); + float lumaW = FxaaLuma(rgbW); + float lumaM = FxaaLuma(rgbM); + float lumaE = FxaaLuma(rgbE); + float lumaS = FxaaLuma(rgbS); + float rangeMin = min(lumaM, min(min(lumaN, lumaW), min(lumaS, lumaE))); + float rangeMax = max(lumaM, max(max(lumaN, lumaW), max(lumaS, lumaE))); + + float range = rangeMax - rangeMin; + if(range < max(FXAA_EDGE_THRESHOLD_MIN, rangeMax * FXAA_EDGE_THRESHOLD)) + { + return rgbM; + } + + vec3 rgbL = rgbN + rgbW + rgbM + rgbE + rgbS; + + float lumaL = (lumaN + lumaW + lumaE + lumaS) * 0.25; + float rangeL = abs(lumaL - lumaM); + float blendL = max(0.0, (rangeL / range) - FXAA_SUBPIX_TRIM) * FXAA_SUBPIX_TRIM_SCALE; + blendL = min(FXAA_SUBPIX_CAP, blendL); + + vec3 rgbNW = FxaaTexOff(tex, pos.xy, ivec2(-1,-1), rcpFrame).xyz; + vec3 rgbNE = FxaaTexOff(tex, pos.xy, ivec2( 1,-1), rcpFrame).xyz; + vec3 rgbSW = FxaaTexOff(tex, pos.xy, ivec2(-1, 1), rcpFrame).xyz; + vec3 rgbSE = FxaaTexOff(tex, pos.xy, ivec2( 1, 1), rcpFrame).xyz; + rgbL += (rgbNW + rgbNE + rgbSW + rgbSE); + rgbL *= vec3(1.0/9.0); + + float lumaNW = FxaaLuma(rgbNW); + float lumaNE = FxaaLuma(rgbNE); + float lumaSW = FxaaLuma(rgbSW); + float lumaSE = FxaaLuma(rgbSE); + + float edgeVert = + abs((0.25 * lumaNW) + (-0.5 * lumaN) + (0.25 * lumaNE)) + + abs((0.50 * lumaW ) + (-1.0 * lumaM) + (0.50 * lumaE )) + + abs((0.25 * lumaSW) + (-0.5 * lumaS) + (0.25 * lumaSE)); + float edgeHorz = + abs((0.25 * lumaNW) + (-0.5 * lumaW) + (0.25 * lumaSW)) + + abs((0.50 * lumaN ) + (-1.0 * lumaM) + (0.50 * lumaS )) + + abs((0.25 * lumaNE) + (-0.5 * lumaE) + (0.25 * lumaSE)); + + bool horzSpan = edgeHorz >= edgeVert; + float lengthSign = horzSpan ? -rcpFrame.y : -rcpFrame.x; + + if(!horzSpan) + { + lumaN = lumaW; + lumaS = lumaE; + } + + float gradientN = abs(lumaN - lumaM); + float gradientS = abs(lumaS - lumaM); + lumaN = (lumaN + lumaM) * 0.5; + lumaS = (lumaS + lumaM) * 0.5; + + if (gradientN < gradientS) + { + lumaN = lumaS; + lumaN = lumaS; + gradientN = gradientS; + lengthSign *= -1.0; + } + + vec2 posN; + posN.x = pos.x + (horzSpan ? 0.0 : lengthSign * 0.5); + posN.y = pos.y + (horzSpan ? lengthSign * 0.5 : 0.0); + + gradientN *= FXAA_SEARCH_THRESHOLD; + + vec2 posP = posN; + vec2 offNP = horzSpan ? vec2(rcpFrame.x, 0.0) : vec2(0.0, rcpFrame.y); + float lumaEndN = lumaN; + float lumaEndP = lumaN; + bool doneN = false; + bool doneP = false; + posN += offNP * vec2(-1.0, -1.0); + posP += offNP * vec2( 1.0, 1.0); + + for(int i = 0; i < FXAA_SEARCH_STEPS; i++) { + if(!doneN) + { + lumaEndN = FxaaLuma(texture(tex, posN.xy).xyz); + } + if(!doneP) + { + lumaEndP = FxaaLuma(texture(tex, posP.xy).xyz); + } + + doneN = doneN || (abs(lumaEndN - lumaN) >= gradientN); + doneP = doneP || (abs(lumaEndP - lumaN) >= gradientN); + + if(doneN && doneP) + { + break; + } + if(!doneN) + { + posN -= offNP; + } + if(!doneP) + { + posP += offNP; + } + } + + float dstN = horzSpan ? pos.x - posN.x : pos.y - posN.y; + float dstP = horzSpan ? posP.x - pos.x : posP.y - pos.y; + bool directionN = dstN < dstP; + lumaEndN = directionN ? lumaEndN : lumaEndP; + + if(((lumaM - lumaN) < 0.0) == ((lumaEndN - lumaN) < 0.0)) + { + lengthSign = 0.0; + } + + + float spanLength = (dstP + dstN); + dstN = directionN ? dstN : dstP; + float subPixelOffset = (0.5 + (dstN * (-1.0/spanLength))) * lengthSign; + vec3 rgbF = texture(tex, vec2( + pos.x + (horzSpan ? 0.0 : subPixelOffset), + pos.y + (horzSpan ? subPixelOffset : 0.0))).xyz; + return FxaaLerp3(rgbL, rgbF, blendL); +} + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord * 1.0001; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + +void main() +{ + FragColor = vec4(FxaaPixelShader(vTexCoord, Source, vec2(params.SourceSize.z, params.SourceSize.w)), texture(Source, vTexCoord).a); +}