From 37cce2aa74bd8b32e5d468370b6757c471496724 Mon Sep 17 00:00:00 2001 From: Hyllian Date: Sun, 19 May 2024 10:30:11 -0300 Subject: [PATCH] Update mixed-res shaders. - Now using bilateral to get rid of compression noise. IQ is more pleasing. --- downsample/mixed-res-4x-jinc2.slangp | 92 +++++----- .../mixed-res/2x/mixed-res-bicubic.slangp | 102 +++++------ .../mixed-res/2x/mixed-res-bilinear.slangp | 102 ++++++----- .../mixed-res/2x/mixed-res-jinc2.slangp | 93 +++++----- .../mixed-res/2x/mixed-res-lanczos3.slangp | 102 +++++------ .../mixed-res/2x/mixed-res-nnedi3-luma.slangp | 150 ++++++++-------- .../mixed-res/2x/mixed-res-reverse-aa.slangp | 115 ++++++------ .../mixed-res/2x/mixed-res-spline16.slangp | 101 +++++------ .../2x/mixed-res-super-xbr-film-full.slangp | 1 + .../2x/mixed-res-super-xbr-film.slangp | 1 + .../mixed-res/2x/mixed-res-super-xbr.slangp | 167 ++++++++---------- .../mixed-res/3x/mixed-res-bicubic.slangp | 103 +++++------ .../mixed-res/3x/mixed-res-bilinear.slangp | 102 ++++++----- .../mixed-res/3x/mixed-res-jinc2.slangp | 93 +++++----- .../mixed-res/3x/mixed-res-lanczos3.slangp | 102 +++++------ .../mixed-res/3x/mixed-res-nnedi3-luma.slangp | 150 ++++++++-------- .../mixed-res/3x/mixed-res-reverse-aa.slangp | 115 ++++++------ .../mixed-res/3x/mixed-res-spline16.slangp | 101 +++++------ .../3x/mixed-res-super-xbr-film-full.slangp | 1 + .../3x/mixed-res-super-xbr-film.slangp | 1 + .../mixed-res/3x/mixed-res-super-xbr.slangp | 167 ++++++++---------- .../mixed-res/4x/mixed-res-bicubic.slangp | 102 +++++------ .../mixed-res/4x/mixed-res-bilinear.slangp | 102 ++++++----- .../mixed-res/4x/mixed-res-jinc2.slangp | 71 ++++++++ .../mixed-res/4x/mixed-res-lanczos3.slangp | 102 +++++------ .../mixed-res/4x/mixed-res-nnedi3-luma.slangp | 150 ++++++++-------- .../mixed-res/4x/mixed-res-reverse-aa.slangp | 115 ++++++------ .../mixed-res/4x/mixed-res-spline16.slangp | 101 +++++------ .../4x/mixed-res-super-xbr-film-full.slangp | 1 + .../4x/mixed-res-super-xbr-film.slangp | 5 +- .../mixed-res/4x/mixed-res-super-xbr.slangp | 166 ++++++++--------- .../mixed-res/cheap-sharpen-tweaked.slang | 10 +- .../shaders/mixed-res/multiLUT-modified.slang | 81 +++++++++ 33 files changed, 1518 insertions(+), 1449 deletions(-) create mode 100644 downsample/mixed-res/4x/mixed-res-jinc2.slangp create mode 100644 downsample/shaders/mixed-res/multiLUT-modified.slang diff --git a/downsample/mixed-res-4x-jinc2.slangp b/downsample/mixed-res-4x-jinc2.slangp index cd8cdf62..8eee3aa6 100644 --- a/downsample/mixed-res-4x-jinc2.slangp +++ b/downsample/mixed-res-4x-jinc2.slangp @@ -1,70 +1,70 @@ -shaders = "7" +shaders = "10" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 -shader5 = "../interpolation/shaders/jinc2.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "viewport" -scale_y5 = "1.000000" +shader5 = "../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "shaders/mixed-res/output.slang" +shader6 = "../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false +alias6 = "XbrSource" wrap_mode6 = "clamp_to_border" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "false" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../interpolation/shaders/jinc2.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = "viewport" +scale7 = "1.000000" + +shader8 = "../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" IR_SCALE = "4.0" B_TRESH = "0.10" +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 47183259..b6340c29 100644 --- a/downsample/mixed-res/2x/mixed-res-bicubic.slangp +++ b/downsample/mixed-res/2x/mixed-res-bicubic.slangp @@ -1,78 +1,74 @@ -shaders = "8" +shaders = "10" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" - -shader6 = "../../../interpolation/shaders/bicubic-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" -scale_x7 = "1.000000" -scale_type_y7 = "source" -scale_y7 = "1.000000" +shader7 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear7 = true +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = viewport +scale7 = 1.0 + +shader8 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "../../shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" + IR_SCALE = "2.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +B = "0.333333" +C = "0.500000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-bilinear.slangp b/downsample/mixed-res/2x/mixed-res-bilinear.slangp index 18123a73..b49780ea 100644 --- a/downsample/mixed-res/2x/mixed-res-bilinear.slangp +++ b/downsample/mixed-res/2x/mixed-res-bilinear.slangp @@ -1,69 +1,77 @@ -shaders = "7" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 -shader5 = "../../../stock.slang" -filter_linear5 = "true" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "viewport" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../shaders/mixed-res/output.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" wrap_mode6 = "clamp_to_border" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "false" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +filter_linear7 = true +wrap_mode7 = "clamp_to_edge" +scale_type7 = source +scale7 = 1.0 + +shader8 = "../../../stock.slang" +filter_linear8 = "true" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "viewport" +scale8 = "1.000000" + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" IR_SCALE = "2.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +CS_SHARPNESS = "0.200000" +OFFSET = "4.000000" +DEBLUR = "1.750000" +SMART = "1.000000" diff --git a/downsample/mixed-res/2x/mixed-res-jinc2.slangp b/downsample/mixed-res/2x/mixed-res-jinc2.slangp index 489e47a8..5f1cd7d4 100644 --- a/downsample/mixed-res/2x/mixed-res-jinc2.slangp +++ b/downsample/mixed-res/2x/mixed-res-jinc2.slangp @@ -1,69 +1,70 @@ -shaders = "7" +shaders = "10" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 -shader5 = "../../../interpolation/shaders/jinc2.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "viewport" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../shaders/mixed-res/output.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false +alias6 = "XbrSource" wrap_mode6 = "clamp_to_border" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "false" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../../interpolation/shaders/jinc2.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = "viewport" +scale7 = "1.000000" + +shader8 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "../../shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" IR_SCALE = "2.0" +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-lanczos3.slangp b/downsample/mixed-res/2x/mixed-res-lanczos3.slangp index c225458f..ab45ad83 100644 --- a/downsample/mixed-res/2x/mixed-res-lanczos3.slangp +++ b/downsample/mixed-res/2x/mixed-res-lanczos3.slangp @@ -1,78 +1,78 @@ -shaders = "8" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../interpolation/shaders/lanczos3-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" - -shader6 = "../../../interpolation/shaders/lanczos3-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" - -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" +shader7 = "../../../interpolation/shaders/lanczos3-x.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" +shader8 = "../../../interpolation/shaders/lanczos3-y.slang" +filter_linear8 = false +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" + IR_SCALE = "2.0" +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-nnedi3-luma.slangp b/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp index e1017d19..6d453943 100644 --- a/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp +++ b/downsample/mixed-res/2x/mixed-res-nnedi3-luma.slangp @@ -1,121 +1,119 @@ -shaders = "14" +shaders = "16" 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true -alias4 = "" wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 -shader5 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false -alias5 = "PassOutput0" +wrap_mode5 = "clamp_to_border" scale_type5 = source -scale_x5 = 1.0 -scale_y5 = 1.0 -wrap_mode5 = "clamp_to_edge" +scale5 = 1.0 -shader6 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang" -filter_linear6 = false -wrap_mode6 = "clamp_to_edge" -srgb_framebuffer6 = "true" -scale_type6 = source -scale_x6 = 1.0 -scale_y6 = 2.0 +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 -shader7 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_edge" -srgb_framebuffer7 = "true" -scale_type7 = source -scale_x7 = 2.0 -scale_y7 = 1.0 +shader7 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang" +filter_linear7 = false +wrap_mode7 = "clamp_to_edge" +alias7 = "PassOutput0" +scale_type7 = source +scale7 = 1.0 -shader8 = "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang" +shader8 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang" filter_linear8 = false -alias8 = "PassOutput3" wrap_mode8 = "clamp_to_edge" srgb_framebuffer8 = "true" scale_type8 = source scale_x8 = 1.0 -scale_y8 = 1.0 +scale_y8 = 2.0 -shader9 = "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang" +shader9 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang" filter_linear9 = false +wrap_mode9 = "clamp_to_edge" srgb_framebuffer9 = "true" scale_type9 = source -scale_x9 = 1.0 +scale_x9 = 2.0 scale_y9 = 1.0 -wrap_mode9 = "clamp_to_edge" -shader10 = "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang" +shader10 = "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang" filter_linear10 = false +alias10 = "PassOutput3" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = source scale_x10 = 1.0 scale_y10 = 1.0 -shader11 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode11 = "clamp_to_edge" -srgb_framebuffer11 = "true" -scale_type_x11 = "viewport" -scale_x11 = "1.000000" -scale_type_y11 = "source" -scale_y11 = "1.000000" +shader11 = "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang" +filter_linear11 = false +srgb_framebuffer11 = "true" +scale_type11 = source +scale_x11 = 1.0 +scale_y11 = 1.0 +wrap_mode11 = "clamp_to_edge" -shader12 = "../../../interpolation/shaders/bicubic-y.slang" -filter_linear12 = false -wrap_mode12 = "clamp_to_edge" -srgb_framebuffer12 = "true" -scale_type_x12 = viewport -scale_type_y12 = viewport -scale12 = 1.0 +shader12 = "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang" +filter_linear12 = false +srgb_framebuffer12 = "true" +scale_type12 = source +scale_x12 = 1.0 +scale_y12 = 1.0 -shader13 = "../../shaders/mixed-res/output.slang" -filter_linear13 = false -scale_type_x13 = "source" -scale_x13 = "1.000000" -scale_type_y13 = "source" -scale_y13 = "1.000000" +shader13 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear13 = true +wrap_mode13 = "clamp_to_edge" +srgb_framebuffer13 = "true" +scale_type13 = viewport +scale13 = 1.0 + +shader14 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear14 = "false" +wrap_mode14 = "clamp_to_edge" +srgb_framebuffer14 = "true" +scale_type14 = "source" +scale14 = "1.000000" + +shader15 = "../../shaders/mixed-res/output.slang" +filter_linear15 = false +wrap_mode15 = "clamp_to_border" +scale_type15 = "source" +scale15 = "1.000000" IR_SCALE = "2.0" -B_TRESH = "0.20" - +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +B = "0.333333" +C = "0.500000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 0a10dddf..f1a9b1c9 100644 --- a/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp +++ b/downsample/mixed-res/2x/mixed-res-reverse-aa.slangp @@ -1,90 +1,77 @@ -shaders = "9" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../anti-aliasing/shaders/reverse-aa.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "true" -scale_type_x5 = "source" -scale_x5 = "2.000000" -scale_type_y5 = "source" -scale_y5 = "2.000000" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 -shader6 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode6 = "clamp_to_edge" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "true" -scale_type_x6 = "viewport" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - -shader7 = "../../../interpolation/shaders/bicubic-y.slang" -filter_linear7 = false +shader7 = "../../../anti-aliasing/shaders/reverse-aa.slang" wrap_mode7 = "clamp_to_edge" srgb_framebuffer7 = "true" -scale_type_x7 = viewport -scale_type_y7 = viewport -scale7 = 1.0 +scale_type7 = "source" +scale7 = "2.000000" +shader8 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear8 = true +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" -shader8 = "../../shaders/mixed-res/output.slang" -filter_linear8 = false -wrap_mode8 = "clamp_to_border" -mipmap_input8 = "false" -alias8 = "" -float_framebuffer8 = "false" -srgb_framebuffer8 = "false" -scale_type_x8 = "source" -scale_x8 = "1.000000" -scale_type_y8 = "source" -scale_y8 = "1.000000" IR_SCALE = "2.0" +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-spline16.slangp b/downsample/mixed-res/2x/mixed-res-spline16.slangp index 38e0fe3b..ef82ca89 100644 --- a/downsample/mixed-res/2x/mixed-res-spline16.slangp +++ b/downsample/mixed-res/2x/mixed-res-spline16.slangp @@ -1,77 +1,78 @@ -shaders = "8" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.5 -shader5 = "../../../interpolation/shaders/spline16-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../../interpolation/shaders/spline16-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" - -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" +shader7 = "../../../interpolation/shaders/spline16-x.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" +shader8 = "../../../interpolation/shaders/spline16-y.slang" +filter_linear8 = false +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" + IR_SCALE = "2.0" +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-super-xbr-film-full.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr-film-full.slangp index 3a75ce87..e5da14bd 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 @@ -114,6 +114,7 @@ scale11 = 1.0 IR_SCALE = "2.0" B_TRESH = "0.20" +CS_RADIUS = "2.0" 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 044a632b..e77182fd 100644 --- a/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp +++ b/downsample/mixed-res/2x/mixed-res-super-xbr-film.slangp @@ -117,6 +117,7 @@ scale_y11 = "1.000000" IR_SCALE = "2.0" B_TRESH = "0.20" +CS_RADIUS = "2.0" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" diff --git a/downsample/mixed-res/2x/mixed-res-super-xbr.slangp b/downsample/mixed-res/2x/mixed-res-super-xbr.slangp index e9082df9..e1539732 100644 --- a/downsample/mixed-res/2x/mixed-res-super-xbr.slangp +++ b/downsample/mixed-res/2x/mixed-res-super-xbr.slangp @@ -1,130 +1,109 @@ -shaders = "13" +shaders = "14" -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" +shader0 = "../../shaders/mixed-res/multiLUT-modified.slang" +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" +textures = "SamplerLUT1;SamplerLUT2" +SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true -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 +shader1 = "../../shaders/mixed-res/coder.slang" +scale_type1 = "source" +scale1 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader2 = "../../shaders/mixed-res/hires-tagger.slang" +filter_linear2 = "true" +scale_type2 = "source" +scale2 = "1.000000" + +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 = 1.0 -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" +alias4 = "HiresSource" scale_type4 = source -scale4 = 0.5 +scale4 = 1.0 -shader5 = "../../../denoisers/shaders/fast-bilateral.slang" -filter_linear5 = false -alias5 = "XbrSource" -wrap_mode5 = "clamp_to_border" +shader5 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear5 = true +wrap_mode5 = "clamp_to_edge" +srgb_framebuffer5 = "true" scale_type5 = source -scale5 = 1.0 +scale5 = 0.5 + +shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear6 = false +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear7 = false +alias7 = "XbrSource" +wrap_mode7 = "clamp_to_border" +scale_type7 = source +scale7 = 1.0 -shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" -filter_linear6 = "false" -wrap_mode6 = "clamp_to_edge" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "true" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - -shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear7 = "false" -wrap_mode7 = "clamp_to_edge" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "true" -scale_type_x7 = "source" -scale_x7 = "2.000000" -scale_type_y7 = "source" -scale_y7 = "2.000000" - -shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" -mipmap_input8 = "false" -alias8 = "" -float_framebuffer8 = "false" srgb_framebuffer8 = "true" -scale_type_x8 = "source" -scale_x8 = "1.000000" -scale_type_y8 = "source" -scale_y8 = "1.000000" +scale_type8 = "source" +scale8 = "1.000000" -shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang" -filter_linear9 = true +shader9 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" +filter_linear9 = "false" wrap_mode9 = "clamp_to_edge" srgb_framebuffer9 = "true" -scale_type9 = viewport -scale9 = 1.0 +scale_type9 = "source" +scale9 = "2.000000" -shader10 = "../../../warp/shaders/dilation.slang" +shader10 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear10 = "false" -wrap_mode10 = "clamp_to_border" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = "source" scale10 = "1.000000" -shader11 = "../../../deblur/shaders/deblur.slang" -filter_linear11 = "true" -wrap_mode11 = "clamp_to_border" +shader11 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear11 = true +wrap_mode11 = "clamp_to_edge" srgb_framebuffer11 = "true" -scale_type11 = "source" -scale11 = "1.000000" +scale_type11 = viewport +scale11 = 1.0 -shader12 = "../../shaders/mixed-res/output.slang" -filter_linear12 = false -wrap_mode12 = "clamp_to_border" -scale_type12 = "source" -scale12 = "1.000000" +shader12 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear12 = "false" +wrap_mode12 = "clamp_to_edge" +srgb_framebuffer12 = "true" +scale_type12 = "source" +scale12 = "1.000000" + +shader13 = "../../shaders/mixed-res/output.slang" +filter_linear13 = false +wrap_mode13 = "clamp_to_border" +scale_type13 = "source" +scale13 = "1.000000" +LUT_selector_param = "2.000000" IR_SCALE = "2.0" -B_TRESH = "0.20" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" XBR_EDGE_STR_P0 = "2.500000" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "2.500000" -DILATION_STRENGTH = "0.300000" B = "0.330000" -C = "0.330000" +C = "0.500000" CS_SHARPNESS = "0.200000" OFFSET = "3.000000" -DEBLUR = "2.000000" +DEBLUR = "3.000000" SMART = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-bicubic.slangp b/downsample/mixed-res/3x/mixed-res-bicubic.slangp index 346263dc..61512009 100644 --- a/downsample/mixed-res/3x/mixed-res-bicubic.slangp +++ b/downsample/mixed-res/3x/mixed-res-bicubic.slangp @@ -1,79 +1,74 @@ -shaders = "8" +shaders = "10" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" - -shader6 = "../../../interpolation/shaders/bicubic-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" -scale_x7 = "1.000000" -scale_type_y7 = "source" -scale_y7 = "1.000000" +shader7 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear7 = true +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = viewport +scale7 = 1.0 + +shader8 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "../../shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" + IR_SCALE = "3.0" - +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +B = "0.333333" +C = "0.500000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-bilinear.slangp b/downsample/mixed-res/3x/mixed-res-bilinear.slangp index 7ed15779..179412ba 100644 --- a/downsample/mixed-res/3x/mixed-res-bilinear.slangp +++ b/downsample/mixed-res/3x/mixed-res-bilinear.slangp @@ -1,69 +1,77 @@ -shaders = "7" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 -shader5 = "../../../stock.slang" -filter_linear5 = "true" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "viewport" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../shaders/mixed-res/output.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" wrap_mode6 = "clamp_to_border" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "false" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +filter_linear7 = true +wrap_mode7 = "clamp_to_edge" +scale_type7 = source +scale7 = 1.0 + +shader8 = "../../../stock.slang" +filter_linear8 = "true" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "viewport" +scale8 = "1.000000" + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" IR_SCALE = "3.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +CS_SHARPNESS = "0.200000" +OFFSET = "4.000000" +DEBLUR = "1.750000" +SMART = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-jinc2.slangp b/downsample/mixed-res/3x/mixed-res-jinc2.slangp index 83696461..e686e693 100644 --- a/downsample/mixed-res/3x/mixed-res-jinc2.slangp +++ b/downsample/mixed-res/3x/mixed-res-jinc2.slangp @@ -1,69 +1,70 @@ -shaders = "7" +shaders = "10" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 -shader5 = "../../../interpolation/shaders/jinc2.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "viewport" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../shaders/mixed-res/output.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false +alias6 = "XbrSource" wrap_mode6 = "clamp_to_border" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "false" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../../interpolation/shaders/jinc2.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = "viewport" +scale7 = "1.000000" + +shader8 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "../../shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" IR_SCALE = "3.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" + diff --git a/downsample/mixed-res/3x/mixed-res-lanczos3.slangp b/downsample/mixed-res/3x/mixed-res-lanczos3.slangp index 2b03fe33..e19d5ccd 100644 --- a/downsample/mixed-res/3x/mixed-res-lanczos3.slangp +++ b/downsample/mixed-res/3x/mixed-res-lanczos3.slangp @@ -1,78 +1,78 @@ -shaders = "8" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../interpolation/shaders/lanczos3-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" - -shader6 = "../../../interpolation/shaders/lanczos3-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" - -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" +shader7 = "../../../interpolation/shaders/lanczos3-x.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" +shader8 = "../../../interpolation/shaders/lanczos3-y.slang" +filter_linear8 = false +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" + IR_SCALE = "3.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 40c23a9a..d779551d 100644 --- a/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp +++ b/downsample/mixed-res/3x/mixed-res-nnedi3-luma.slangp @@ -1,121 +1,119 @@ -shaders = "14" +shaders = "16" 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true -alias4 = "" wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 -shader5 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false -alias5 = "PassOutput0" +wrap_mode5 = "clamp_to_border" scale_type5 = source -scale_x5 = 1.0 -scale_y5 = 1.0 -wrap_mode5 = "clamp_to_edge" +scale5 = 1.0 -shader6 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang" -filter_linear6 = false -wrap_mode6 = "clamp_to_edge" -srgb_framebuffer6 = "true" -scale_type6 = source -scale_x6 = 1.0 -scale_y6 = 2.0 +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 -shader7 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_edge" -srgb_framebuffer7 = "true" -scale_type7 = source -scale_x7 = 2.0 -scale_y7 = 1.0 +shader7 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang" +filter_linear7 = false +wrap_mode7 = "clamp_to_edge" +alias7 = "PassOutput0" +scale_type7 = source +scale7 = 1.0 -shader8 = "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang" +shader8 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang" filter_linear8 = false -alias8 = "PassOutput3" wrap_mode8 = "clamp_to_edge" srgb_framebuffer8 = "true" scale_type8 = source scale_x8 = 1.0 -scale_y8 = 1.0 +scale_y8 = 2.0 -shader9 = "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang" +shader9 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang" filter_linear9 = false +wrap_mode9 = "clamp_to_edge" srgb_framebuffer9 = "true" scale_type9 = source -scale_x9 = 1.0 +scale_x9 = 2.0 scale_y9 = 1.0 -wrap_mode9 = "clamp_to_edge" -shader10 = "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang" +shader10 = "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang" filter_linear10 = false +alias10 = "PassOutput3" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = source scale_x10 = 1.0 scale_y10 = 1.0 -shader11 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode11 = "clamp_to_edge" -srgb_framebuffer11 = "true" -scale_type_x11 = "viewport" -scale_x11 = "1.000000" -scale_type_y11 = "source" -scale_y11 = "1.000000" +shader11 = "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang" +filter_linear11 = false +srgb_framebuffer11 = "true" +scale_type11 = source +scale_x11 = 1.0 +scale_y11 = 1.0 +wrap_mode11 = "clamp_to_edge" -shader12 = "../../../interpolation/shaders/bicubic-y.slang" -filter_linear12 = false -wrap_mode12 = "clamp_to_edge" -srgb_framebuffer12 = "true" -scale_type_x12 = viewport -scale_type_y12 = viewport -scale12 = 1.0 +shader12 = "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang" +filter_linear12 = false +srgb_framebuffer12 = "true" +scale_type12 = source +scale_x12 = 1.0 +scale_y12 = 1.0 -shader13 = "../../shaders/mixed-res/output.slang" -filter_linear13 = false -scale_type_x13 = "source" -scale_x13 = "1.000000" -scale_type_y13 = "source" -scale_y13 = "1.000000" +shader13 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear13 = true +wrap_mode13 = "clamp_to_edge" +srgb_framebuffer13 = "true" +scale_type13 = viewport +scale13 = 1.0 + +shader14 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear14 = "false" +wrap_mode14 = "clamp_to_edge" +srgb_framebuffer14 = "true" +scale_type14 = "source" +scale14 = "1.000000" + +shader15 = "../../shaders/mixed-res/output.slang" +filter_linear15 = false +wrap_mode15 = "clamp_to_border" +scale_type15 = "source" +scale15 = "1.000000" IR_SCALE = "3.0" -B_TRESH = "0.20" - +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +B = "0.333333" +C = "0.500000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 f9cd0846..1f8c9787 100644 --- a/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp +++ b/downsample/mixed-res/3x/mixed-res-reverse-aa.slangp @@ -1,90 +1,77 @@ -shaders = "9" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../anti-aliasing/shaders/reverse-aa.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "true" -scale_type_x5 = "source" -scale_x5 = "2.000000" -scale_type_y5 = "source" -scale_y5 = "2.000000" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 -shader6 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode6 = "clamp_to_edge" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "true" -scale_type_x6 = "viewport" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - -shader7 = "../../../interpolation/shaders/bicubic-y.slang" -filter_linear7 = false +shader7 = "../../../anti-aliasing/shaders/reverse-aa.slang" wrap_mode7 = "clamp_to_edge" srgb_framebuffer7 = "true" -scale_type_x7 = viewport -scale_type_y7 = viewport -scale7 = 1.0 +scale_type7 = "source" +scale7 = "2.000000" +shader8 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear8 = true +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" -shader8 = "../../shaders/mixed-res/output.slang" -filter_linear8 = false -wrap_mode8 = "clamp_to_border" -mipmap_input8 = "false" -alias8 = "" -float_framebuffer8 = "false" -srgb_framebuffer8 = "false" -scale_type_x8 = "source" -scale_x8 = "1.000000" -scale_type_y8 = "source" -scale_y8 = "1.000000" IR_SCALE = "3.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" diff --git a/downsample/mixed-res/3x/mixed-res-spline16.slangp b/downsample/mixed-res/3x/mixed-res-spline16.slangp index 6fd08666..44016924 100644 --- a/downsample/mixed-res/3x/mixed-res-spline16.slangp +++ b/downsample/mixed-res/3x/mixed-res-spline16.slangp @@ -1,77 +1,78 @@ -shaders = "8" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.333333 -shader5 = "../../../interpolation/shaders/spline16-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../../interpolation/shaders/spline16-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" - -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" +shader7 = "../../../interpolation/shaders/spline16-x.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" +shader8 = "../../../interpolation/shaders/spline16-y.slang" +filter_linear8 = false +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" + IR_SCALE = "3.0" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 0c2d4141..b6a43495 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 @@ -114,6 +114,7 @@ scale11 = 1.0 IR_SCALE = "3.0" B_TRESH = "0.20" +CS_RADIUS = "3.0" 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 3d3fe58f..7efa52eb 100644 --- a/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp +++ b/downsample/mixed-res/3x/mixed-res-super-xbr-film.slangp @@ -117,6 +117,7 @@ scale_y11 = "1.000000" IR_SCALE = "3.0" B_TRESH = "0.20" +CS_RADIUS = "3.0" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "5.000000" B = "0.330000" diff --git a/downsample/mixed-res/3x/mixed-res-super-xbr.slangp b/downsample/mixed-res/3x/mixed-res-super-xbr.slangp index d95e84ad..c7eb928c 100644 --- a/downsample/mixed-res/3x/mixed-res-super-xbr.slangp +++ b/downsample/mixed-res/3x/mixed-res-super-xbr.slangp @@ -1,130 +1,109 @@ -shaders = "13" +shaders = "14" -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" +shader0 = "../../shaders/mixed-res/multiLUT-modified.slang" +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" +textures = "SamplerLUT1;SamplerLUT2" +SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true -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 +shader1 = "../../shaders/mixed-res/coder.slang" +scale_type1 = "source" +scale1 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader2 = "../../shaders/mixed-res/hires-tagger.slang" +filter_linear2 = "true" +scale_type2 = "source" +scale2 = "1.000000" + +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 = 1.0 -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" +alias4 = "HiresSource" scale_type4 = source -scale4 = 0.333333 +scale4 = 1.0 -shader5 = "../../../denoisers/shaders/fast-bilateral.slang" -filter_linear5 = false -alias5 = "XbrSource" -wrap_mode5 = "clamp_to_border" +shader5 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear5 = true +wrap_mode5 = "clamp_to_edge" +srgb_framebuffer5 = "true" scale_type5 = source -scale5 = 1.0 +scale5 = 0.333333 + +shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear6 = false +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear7 = false +alias7 = "XbrSource" +wrap_mode7 = "clamp_to_border" +scale_type7 = source +scale7 = 1.0 -shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" -filter_linear6 = "false" -wrap_mode6 = "clamp_to_edge" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "true" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - -shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear7 = "false" -wrap_mode7 = "clamp_to_edge" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "true" -scale_type_x7 = "source" -scale_x7 = "2.000000" -scale_type_y7 = "source" -scale_y7 = "2.000000" - -shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" -mipmap_input8 = "false" -alias8 = "" -float_framebuffer8 = "false" srgb_framebuffer8 = "true" -scale_type_x8 = "source" -scale_x8 = "1.000000" -scale_type_y8 = "source" -scale_y8 = "1.000000" +scale_type8 = "source" +scale8 = "1.000000" -shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang" -filter_linear9 = true +shader9 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" +filter_linear9 = "false" wrap_mode9 = "clamp_to_edge" srgb_framebuffer9 = "true" -scale_type9 = viewport -scale9 = 1.0 +scale_type9 = "source" +scale9 = "2.000000" -shader10 = "../../../warp/shaders/dilation.slang" +shader10 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear10 = "false" -wrap_mode10 = "clamp_to_border" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = "source" scale10 = "1.000000" -shader11 = "../../../deblur/shaders/deblur.slang" -filter_linear11 = "true" -wrap_mode11 = "clamp_to_border" +shader11 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear11 = true +wrap_mode11 = "clamp_to_edge" srgb_framebuffer11 = "true" -scale_type11 = "source" -scale11 = "1.000000" +scale_type11 = viewport +scale11 = 1.0 -shader12 = "../../shaders/mixed-res/output.slang" -filter_linear12 = false -wrap_mode12 = "clamp_to_border" -scale_type12 = "source" -scale12 = "1.000000" +shader12 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear12 = "false" +wrap_mode12 = "clamp_to_edge" +srgb_framebuffer12 = "true" +scale_type12 = "source" +scale12 = "1.000000" + +shader13 = "../../shaders/mixed-res/output.slang" +filter_linear13 = false +wrap_mode13 = "clamp_to_border" +scale_type13 = "source" +scale13 = "1.000000" +LUT_selector_param = "2.000000" IR_SCALE = "3.0" -B_TRESH = "0.20" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" XBR_EDGE_STR_P0 = "2.500000" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "2.500000" -DILATION_STRENGTH = "0.300000" B = "0.330000" -C = "0.330000" +C = "0.500000" CS_SHARPNESS = "0.200000" OFFSET = "3.000000" -DEBLUR = "2.000000" +DEBLUR = "3.000000" SMART = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-bicubic.slangp b/downsample/mixed-res/4x/mixed-res-bicubic.slangp index 262d9d71..9470e300 100644 --- a/downsample/mixed-res/4x/mixed-res-bicubic.slangp +++ b/downsample/mixed-res/4x/mixed-res-bicubic.slangp @@ -1,79 +1,75 @@ -shaders = "8" +shaders = "10" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" - -shader6 = "../../../interpolation/shaders/bicubic-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" -scale_x7 = "1.000000" -scale_type_y7 = "source" -scale_y7 = "1.000000" +shader7 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear7 = true +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = viewport +scale7 = 1.0 + +shader8 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "../../shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" + IR_SCALE = "4.0" B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +B = "0.333333" +C = "0.500000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-bilinear.slangp b/downsample/mixed-res/4x/mixed-res-bilinear.slangp index ff683b5e..4b3c0be2 100644 --- a/downsample/mixed-res/4x/mixed-res-bilinear.slangp +++ b/downsample/mixed-res/4x/mixed-res-bilinear.slangp @@ -1,70 +1,78 @@ -shaders = "7" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 -shader5 = "../../../stock.slang" -filter_linear5 = "true" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "viewport" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../shaders/mixed-res/output.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" wrap_mode6 = "clamp_to_border" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "false" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +filter_linear7 = true +wrap_mode7 = "clamp_to_edge" +scale_type7 = source +scale7 = 1.0 + +shader8 = "../../../stock.slang" +filter_linear8 = "true" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "viewport" +scale8 = "1.000000" + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" IR_SCALE = "4.0" B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +CS_SHARPNESS = "0.200000" +OFFSET = "4.000000" +DEBLUR = "1.750000" +SMART = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-jinc2.slangp b/downsample/mixed-res/4x/mixed-res-jinc2.slangp new file mode 100644 index 00000000..c7aab898 --- /dev/null +++ b/downsample/mixed-res/4x/mixed-res-jinc2.slangp @@ -0,0 +1,71 @@ +shaders = "10" +feedback_pass = "0" + +shader0 = "../../shaders/mixed-res/coder.slang" +scale_type0 = "source" +scale0 = "1.000000" + +shader1 = "../../shaders/mixed-res/hires-tagger.slang" +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 + +shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +filter_linear3 = true +alias3 = "HiresSource" +scale_type3 = source +scale3 = 1.0 + +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear4 = true +wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" +scale_type4 = source +scale4 = 0.25 + +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 +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../../interpolation/shaders/jinc2.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type7 = "viewport" +scale7 = "1.000000" + +shader8 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear8 = "false" +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = "source" +scale8 = "1.000000" + +shader9 = "../../shaders/mixed-res/output.slang" +filter_linear9 = false +wrap_mode9 = "clamp_to_border" +scale_type9 = "source" +scale9 = "1.000000" + +IR_SCALE = "4.0" +B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" + diff --git a/downsample/mixed-res/4x/mixed-res-lanczos3.slangp b/downsample/mixed-res/4x/mixed-res-lanczos3.slangp index 571d9a0c..aed135ed 100644 --- a/downsample/mixed-res/4x/mixed-res-lanczos3.slangp +++ b/downsample/mixed-res/4x/mixed-res-lanczos3.slangp @@ -1,79 +1,79 @@ -shaders = "8" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../interpolation/shaders/lanczos3-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" - -shader6 = "../../../interpolation/shaders/lanczos3-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" - -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" +shader7 = "../../../interpolation/shaders/lanczos3-x.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" +shader8 = "../../../interpolation/shaders/lanczos3-y.slang" +filter_linear8 = false +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" + IR_SCALE = "4.0" B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 ae10ebe6..028141d4 100644 --- a/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp +++ b/downsample/mixed-res/4x/mixed-res-nnedi3-luma.slangp @@ -1,120 +1,120 @@ -shaders = "14" +shaders = "16" 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true -alias4 = "" wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 -shader5 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" filter_linear5 = false -alias5 = "PassOutput0" +wrap_mode5 = "clamp_to_border" scale_type5 = source -scale_x5 = 1.0 -scale_y5 = 1.0 -wrap_mode5 = "clamp_to_edge" +scale5 = 1.0 -shader6 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang" -filter_linear6 = false -wrap_mode6 = "clamp_to_edge" -srgb_framebuffer6 = "true" -scale_type6 = source -scale_x6 = 1.0 -scale_y6 = 2.0 +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 -shader7 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_edge" -srgb_framebuffer7 = "true" -scale_type7 = source -scale_x7 = 2.0 -scale_y7 = 1.0 +shader7 = "../../../edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang" +filter_linear7 = false +wrap_mode7 = "clamp_to_edge" +alias7 = "PassOutput0" +scale_type7 = source +scale7 = 1.0 -shader8 = "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang" +shader8 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang" filter_linear8 = false -alias8 = "PassOutput3" wrap_mode8 = "clamp_to_edge" srgb_framebuffer8 = "true" scale_type8 = source scale_x8 = 1.0 -scale_y8 = 1.0 +scale_y8 = 2.0 -shader9 = "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang" +shader9 = "../../../edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang" filter_linear9 = false +wrap_mode9 = "clamp_to_edge" srgb_framebuffer9 = "true" scale_type9 = source -scale_x9 = 1.0 +scale_x9 = 2.0 scale_y9 = 1.0 -wrap_mode9 = "clamp_to_edge" -shader10 = "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang" +shader10 = "../../../edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang" filter_linear10 = false +alias10 = "PassOutput3" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = source scale_x10 = 1.0 scale_y10 = 1.0 -shader11 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode11 = "clamp_to_edge" -srgb_framebuffer11 = "true" -scale_type_x11 = "viewport" -scale_x11 = "1.000000" -scale_type_y11 = "source" -scale_y11 = "1.000000" +shader11 = "../../../edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang" +filter_linear11 = false +srgb_framebuffer11 = "true" +scale_type11 = source +scale_x11 = 1.0 +scale_y11 = 1.0 +wrap_mode11 = "clamp_to_edge" -shader12 = "../../../interpolation/shaders/bicubic-y.slang" -filter_linear12 = false -wrap_mode12 = "clamp_to_edge" -srgb_framebuffer12 = "true" -scale_type_x12 = viewport -scale_type_y12 = viewport -scale12 = 1.0 +shader12 = "../../../edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang" +filter_linear12 = false +srgb_framebuffer12 = "true" +scale_type12 = source +scale_x12 = 1.0 +scale_y12 = 1.0 + +shader13 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear13 = true +wrap_mode13 = "clamp_to_edge" +srgb_framebuffer13 = "true" +scale_type13 = viewport +scale13 = 1.0 + +shader14 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear14 = "false" +wrap_mode14 = "clamp_to_edge" +srgb_framebuffer14 = "true" +scale_type14 = "source" +scale14 = "1.000000" + +shader15 = "../../shaders/mixed-res/output.slang" +filter_linear15 = false +wrap_mode15 = "clamp_to_border" +scale_type15 = "source" +scale15 = "1.000000" -shader13 = "../../shaders/mixed-res/output.slang" -filter_linear13 = false -scale_type_x13 = "source" -scale_x13 = "1.000000" -scale_type_y13 = "source" -scale_y13 = "1.000000" IR_SCALE = "4.0" B_TRESH = "0.10" - +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +B = "0.333333" +C = "0.500000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 a101ec9b..d770cfbc 100644 --- a/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp +++ b/downsample/mixed-res/4x/mixed-res-reverse-aa.slangp @@ -1,91 +1,78 @@ -shaders = "9" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader5 = "../../../anti-aliasing/shaders/reverse-aa.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "true" -scale_type_x5 = "source" -scale_x5 = "2.000000" -scale_type_y5 = "source" -scale_y5 = "2.000000" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear6 = false +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 -shader6 = "../../../interpolation/shaders/bicubic-x.slang" -wrap_mode6 = "clamp_to_edge" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "true" -scale_type_x6 = "viewport" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - -shader7 = "../../../interpolation/shaders/bicubic-y.slang" -filter_linear7 = false +shader7 = "../../../anti-aliasing/shaders/reverse-aa.slang" wrap_mode7 = "clamp_to_edge" srgb_framebuffer7 = "true" -scale_type_x7 = viewport -scale_type_y7 = viewport -scale7 = 1.0 +scale_type7 = "source" +scale7 = "2.000000" +shader8 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear8 = true +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" -shader8 = "../../shaders/mixed-res/output.slang" -filter_linear8 = false -wrap_mode8 = "clamp_to_border" -mipmap_input8 = "false" -alias8 = "" -float_framebuffer8 = "false" -srgb_framebuffer8 = "false" -scale_type_x8 = "source" -scale_x8 = "1.000000" -scale_type_y8 = "source" -scale_y8 = "1.000000" IR_SCALE = "4.0" B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "1.000000" diff --git a/downsample/mixed-res/4x/mixed-res-spline16.slangp b/downsample/mixed-res/4x/mixed-res-spline16.slangp index edd65313..cd40c48d 100644 --- a/downsample/mixed-res/4x/mixed-res-spline16.slangp +++ b/downsample/mixed-res/4x/mixed-res-spline16.slangp @@ -1,78 +1,79 @@ -shaders = "8" +shaders = "11" feedback_pass = "0" + 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" +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 = 1.0 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 +scale_type3 = source +scale3 = 1.0 -shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang" +shader4 = "../../../interpolation/shaders/b-spline-4-taps.slang" filter_linear4 = true wrap_mode4 = "clamp_to_edge" +srgb_framebuffer4 = "true" scale_type4 = source scale4 = 0.25 -shader5 = "../../../interpolation/shaders/spline16-x.slang" -wrap_mode5 = "clamp_to_edge" -mipmap_input5 = "false" -alias5 = "" -float_framebuffer5 = "false" -srgb_framebuffer5 = "false" -scale_type_x5 = "viewport" -scale_x5 = "1.000000" -scale_type_y5 = "source" -scale_y5 = "1.000000" +shader5 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear5 = false +wrap_mode5 = "clamp_to_border" +scale_type5 = source +scale5 = 1.0 -shader6 = "../../../interpolation/shaders/spline16-y.slang" +shader6 = "../../../denoisers/shaders/bilateral-vertical.slang" filter_linear6 = false -scale_type_x6 = viewport -scale_type_y6 = viewport +alias6 = "XbrSource" +wrap_mode6 = "clamp_to_border" +scale_type6 = source scale6 = 1.0 -wrap_mode6 = "clamp_to_edge" - -shader7 = "../../shaders/mixed-res/output.slang" -filter_linear7 = false -wrap_mode7 = "clamp_to_border" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "false" -scale_type_x7 = "source" +shader7 = "../../../interpolation/shaders/spline16-x.slang" +wrap_mode7 = "clamp_to_edge" +srgb_framebuffer7 = "true" +scale_type_x7 = "viewport" scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" +shader8 = "../../../interpolation/shaders/spline16-y.slang" +filter_linear8 = false +wrap_mode8 = "clamp_to_edge" +srgb_framebuffer8 = "true" +scale_type8 = viewport +scale8 = 1.0 + +shader9 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear9 = "false" +wrap_mode9 = "clamp_to_edge" +srgb_framebuffer9 = "true" +scale_type9 = "source" +scale9 = "1.000000" + +shader10 = "../../shaders/mixed-res/output.slang" +filter_linear10 = false +wrap_mode10 = "clamp_to_border" +scale_type10 = "source" +scale10 = "1.000000" + IR_SCALE = "4.0" B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" +OFFSET = "3.000000" +DEBLUR = "3.000000" +SMART = "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 c3918282..97ec0c59 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 @@ -114,6 +114,7 @@ scale11 = 1.0 IR_SCALE = "4.0" B_TRESH = "0.10" +CS_RADIUS = "4.0" 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 288ed201..dc759126 100644 --- a/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp +++ b/downsample/mixed-res/4x/mixed-res-super-xbr-film.slangp @@ -97,7 +97,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,11 +116,12 @@ scale_y11 = "1.000000" IR_SCALE = "4.0" +CS_RADIUS = "4.0" B_TRESH = "0.10" 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/4x/mixed-res-super-xbr.slangp b/downsample/mixed-res/4x/mixed-res-super-xbr.slangp index c69dfca1..667d921a 100644 --- a/downsample/mixed-res/4x/mixed-res-super-xbr.slangp +++ b/downsample/mixed-res/4x/mixed-res-super-xbr.slangp @@ -1,130 +1,110 @@ -shaders = "13" +shaders = "14" -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" +shader0 = "../../shaders/mixed-res/multiLUT-modified.slang" +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" +textures = "SamplerLUT1;SamplerLUT2" +SamplerLUT1 = "../../../reshade/shaders/LUT/grade-composite.png" +SamplerLUT1_linear = true +SamplerLUT2 = "../../../reshade/shaders/LUT/grade-rgb.png" +SamplerLUT2_linear = true -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 +shader1 = "../../shaders/mixed-res/coder.slang" +scale_type1 = "source" +scale1 = "1.000000" -shader3 = "../../shaders/mixed-res/blur-gauss-v.slang" +shader2 = "../../shaders/mixed-res/hires-tagger.slang" +filter_linear2 = "true" +scale_type2 = "source" +scale2 = "1.000000" + +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 = 1.0 -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" +alias4 = "HiresSource" scale_type4 = source -scale4 = 0.25 +scale4 = 1.0 -shader5 = "../../../denoisers/shaders/fast-bilateral.slang" -filter_linear5 = false -alias5 = "XbrSource" -wrap_mode5 = "clamp_to_border" +shader5 = "../../../interpolation/shaders/b-spline-4-taps.slang" +filter_linear5 = true +wrap_mode5 = "clamp_to_edge" +srgb_framebuffer5 = "true" scale_type5 = source -scale5 = 1.0 +scale5 = 0.25 + +shader6 = "../../../denoisers/shaders/bilateral-horizontal.slang" +filter_linear6 = false +wrap_mode6 = "clamp_to_border" +scale_type6 = source +scale6 = 1.0 + +shader7 = "../../../denoisers/shaders/bilateral-vertical.slang" +filter_linear7 = false +alias7 = "XbrSource" +wrap_mode7 = "clamp_to_border" +scale_type7 = source +scale7 = 1.0 -shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" -filter_linear6 = "false" -wrap_mode6 = "clamp_to_edge" -mipmap_input6 = "false" -alias6 = "" -float_framebuffer6 = "false" -srgb_framebuffer6 = "true" -scale_type_x6 = "source" -scale_x6 = "1.000000" -scale_type_y6 = "source" -scale_y6 = "1.000000" - -shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" -filter_linear7 = "false" -wrap_mode7 = "clamp_to_edge" -mipmap_input7 = "false" -alias7 = "" -float_framebuffer7 = "false" -srgb_framebuffer7 = "true" -scale_type_x7 = "source" -scale_x7 = "2.000000" -scale_type_y7 = "source" -scale_y7 = "2.000000" - -shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" -mipmap_input8 = "false" -alias8 = "" -float_framebuffer8 = "false" srgb_framebuffer8 = "true" -scale_type_x8 = "source" -scale_x8 = "1.000000" -scale_type_y8 = "source" -scale_y8 = "1.000000" +scale_type8 = "source" +scale8 = "1.000000" -shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang" -filter_linear9 = true +shader9 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" +filter_linear9 = "false" wrap_mode9 = "clamp_to_edge" srgb_framebuffer9 = "true" -scale_type9 = viewport -scale9 = 1.0 +scale_type9 = "source" +scale9 = "2.000000" -shader10 = "../../../warp/shaders/dilation.slang" +shader10 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear10 = "false" -wrap_mode10 = "clamp_to_border" +wrap_mode10 = "clamp_to_edge" srgb_framebuffer10 = "true" scale_type10 = "source" scale10 = "1.000000" -shader11 = "../../../deblur/shaders/deblur.slang" -filter_linear11 = "true" -wrap_mode11 = "clamp_to_border" +shader11 = "../../../interpolation/shaders/bicubic-5-taps.slang" +filter_linear11 = true +wrap_mode11 = "clamp_to_edge" srgb_framebuffer11 = "true" -scale_type11 = "source" -scale11 = "1.000000" +scale_type11 = viewport +scale11 = 1.0 -shader12 = "../../shaders/mixed-res/output.slang" -filter_linear12 = false -wrap_mode12 = "clamp_to_border" -scale_type12 = "source" -scale12 = "1.000000" +shader12 = "../../../deblur/shaders/deblur-luma.slang" +filter_linear12 = "false" +wrap_mode12 = "clamp_to_edge" +srgb_framebuffer12 = "true" +scale_type12 = "source" +scale12 = "1.000000" + +shader13 = "../../shaders/mixed-res/output.slang" +filter_linear13 = false +wrap_mode13 = "clamp_to_border" +scale_type13 = "source" +scale13 = "1.000000" +LUT_selector_param = "2.000000" IR_SCALE = "4.0" B_TRESH = "0.10" +FRANGE = "2.000000" +FBSMOOTH = "0.150000" +FSIGMA = "1.000000" XBR_EDGE_STR_P0 = "2.500000" XBR_WEIGHT = "1.000000" XBR_EDGE_STR_P1 = "2.500000" -DILATION_STRENGTH = "0.300000" B = "0.330000" -C = "0.330000" +C = "0.500000" CS_SHARPNESS = "0.200000" OFFSET = "3.000000" -DEBLUR = "2.000000" +DEBLUR = "3.000000" SMART = "1.000000" diff --git a/downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang b/downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang index 7d5da307..50bfd309 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 IR_SCALE; + float CS_RADIUS; } params; #pragma parameter CS_SHARPNESS "Sharpness" 0.4 0.0 1.0 0.1 -#pragma parameter IR_SCALE "INTERNAL RESOLUTION SCALE" 1.0 1.0 8.0 1.0 +#pragma parameter CS_RADIUS "Sharpness Radius" 1.0 1.0 8.0 1.0 #define CS_SHARPNESS params.CS_SHARPNESS -#define IR_SCALE params.IR_SCALE +#define CS_RADIUS params.CS_RADIUS 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 * IR_SCALE; - float dy = params.SourceSize.w * IR_SCALE; + float dx = params.SourceSize.z * CS_RADIUS; + float dy = params.SourceSize.w * CS_RADIUS; 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/multiLUT-modified.slang b/downsample/shaders/mixed-res/multiLUT-modified.slang new file mode 100644 index 00000000..e571eace --- /dev/null +++ b/downsample/shaders/mixed-res/multiLUT-modified.slang @@ -0,0 +1,81 @@ +#version 450 + +// A version of the LUT shader that loads 2 LUTs. +// Can turn LUT off too. + +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 OriginalSize; + vec4 OutputSize; + uint FrameCount; + float LUT_selector_param; +} params; + +#pragma parameter LUT_selector_param "LUT [ Off | LUT1 | LUT2 ]" 1.0 0.0 2.0 1.0 +int LUT_selector = int(params.LUT_selector_param); + +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; + +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; +layout(set = 0, binding = 3) uniform sampler2D SamplerLUT1; +layout(set = 0, binding = 4) uniform sampler2D SamplerLUT2; + +// This shouldn't be necessary but it seems some undefined values can +// creep in and each GPU vendor handles that differently. This keeps +// all values within a safe range +vec4 mixfix(vec4 a, vec4 b, float c) +{ + return (a.z < 1.0) ? mix(a, b, c) : a; +} + +void main() +{ + vec4 imgColor = texture(Source, vTexCoord.xy); + + if (LUT_selector == 0.0) { + FragColor = imgColor; + } + else { + + float LUT_Size = mix(textureSize(SamplerLUT1, 0).y, textureSize(SamplerLUT2, 0).y, params.LUT_selector_param - 1.0); + vec4 color1, color2 = vec4(0.,0.,0.,0.); + float red, green, blue1, blue2, mixer = 0.0; + + red = ( imgColor.r * (LUT_Size - 1.0) + 0.4999 ) / (LUT_Size * LUT_Size); + green = ( imgColor.g * (LUT_Size - 1.0) + 0.4999 ) / LUT_Size; + blue1 = (floor( imgColor.b * (LUT_Size - 1.0) ) / LUT_Size) + red; + blue2 = (ceil( imgColor.b * (LUT_Size - 1.0) ) / LUT_Size) + red; + mixer = clamp(max((imgColor.b - blue1) / (blue2 - blue1), 0.0), 0.0, 32.0); + + if(LUT_selector == 1) + { + color1 = texture( SamplerLUT1, vec2( blue1, green )); + color2 = texture( SamplerLUT1, vec2( blue2, green )); + } + else + { + color1 = texture( SamplerLUT2, vec2( blue1, green )); + color2 = texture( SamplerLUT2, vec2( blue2, green )); + } + FragColor = mixfix(color1, color2, mixer); + } + +}