From 2a4a05d863f320761ae85aa050f6cb7a288b8c91 Mon Sep 17 00:00:00 2001 From: Hyllian Date: Sun, 14 Aug 2022 17:17:07 -0300 Subject: [PATCH] Improves smooth shaders presets - Swap stock linear by cubic multipass shaders. - Improves IQ for 4xSoft, 2xSaL, 2xSacaleHq, 4xScaleHq, HQ2x, HQ3x, HQ4x, 2xBRz, 2xSaI, Super-2xSaI and Advance2x-AA. --- anti-aliasing/advanced-aa.slangp | 12 +++++++++--- eagle/2xsai.slangp | 13 ++++++++++--- eagle/super-2xsai.slangp | 12 +++++++++--- hqx/hq2x.slangp | 11 ++++++++++- hqx/hq3x.slangp | 12 +++++++++++- hqx/hq4x.slangp | 11 ++++++++++- scalehq/2xScaleHQ.slangp | 17 ++++++++++++++--- scalehq/4xScaleHQ.slangp | 17 ++++++++++++++--- xbrz/2xbrz-linear.slangp | 12 +++++++++--- xsal/2xsal.slangp | 12 +++++++++--- xsoft/4xsoft.slangp | 12 +++++++++--- xsoft/4xsoftSdB.slangp | 12 +++++++++--- 12 files changed, 123 insertions(+), 30 deletions(-) diff --git a/anti-aliasing/advanced-aa.slangp b/anti-aliasing/advanced-aa.slangp index 5f304c6..13f6e47 100644 --- a/anti-aliasing/advanced-aa.slangp +++ b/anti-aliasing/advanced-aa.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 3 shader0 = shaders/advanced-aa.slang filter_linear0 = false @@ -6,5 +6,11 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/bicubic-y.slang +filter_linear2 = false diff --git a/eagle/2xsai.slangp b/eagle/2xsai.slangp index 825631a..aab760d 100644 --- a/eagle/2xsai.slangp +++ b/eagle/2xsai.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 3 shader0 = shaders/2xsai.slang filter_linear0 = false @@ -6,5 +6,12 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/bicubic-y.slang +filter_linear2 = false + diff --git a/eagle/super-2xsai.slangp b/eagle/super-2xsai.slangp index 5460ef2..81999a3 100644 --- a/eagle/super-2xsai.slangp +++ b/eagle/super-2xsai.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 3 shader0 = shaders/super-2xsai.slang filter_linear0 = false @@ -6,5 +6,11 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/bicubic-y.slang +filter_linear2 = false diff --git a/hqx/hq2x.slangp b/hqx/hq2x.slangp index 6bde7f5..2c2b91e 100644 --- a/hqx/hq2x.slangp +++ b/hqx/hq2x.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 4 shader0 = shader-files/pass1.slang shader1 = shader-files/hq2x.slang @@ -10,6 +10,15 @@ filter_linear1 = false scale_type1 = source scale1 = 2.0 +shader2 = ../cubic/shaders/bicubic-x.slang +filter_linear2 = false +scale_type_x2 = viewport +scale_type_y2 = source +scale2 = 1.0 + +shader3 = ../cubic/shaders/bicubic-y.slang +filter_linear3 = false + textures = LUT LUT = resources/hq2x.png LUT_linear = false diff --git a/hqx/hq3x.slangp b/hqx/hq3x.slangp index 65fc4ff..fa70ad8 100644 --- a/hqx/hq3x.slangp +++ b/hqx/hq3x.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 4 shader0 = shader-files/pass1.slang shader1 = shader-files/hq3x.slang @@ -10,6 +10,16 @@ filter_linear1 = false scale_type1 = source scale1 = 3.0 +shader2 = ../cubic/shaders/b-spline-x.slang +filter_linear2 = false +scale_type_x2 = viewport +scale_type_y2 = source +scale2 = 1.0 + +shader3 = ../cubic/shaders/b-spline-y.slang +filter_linear3 = false + + textures = LUT LUT = resources/hq3x.png LUT_linear = false diff --git a/hqx/hq4x.slangp b/hqx/hq4x.slangp index d481f2d..6b2d50e 100644 --- a/hqx/hq4x.slangp +++ b/hqx/hq4x.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 4 shader0 = shader-files/pass1.slang shader1 = shader-files/hq4x.slang @@ -10,6 +10,15 @@ filter_linear1 = false scale_type1 = source scale1 = 4.0 +shader2 = ../cubic/shaders/b-spline-x.slang +filter_linear2 = false +scale_type_x2 = viewport +scale_type_y2 = source +scale2 = 1.0 + +shader3 = ../cubic/shaders/b-spline-y.slang +filter_linear3 = false + textures = LUT LUT = resources/hq4x.png LUT_linear = false diff --git a/scalehq/2xScaleHQ.slangp b/scalehq/2xScaleHQ.slangp index c59372c..998cfe0 100644 --- a/scalehq/2xScaleHQ.slangp +++ b/scalehq/2xScaleHQ.slangp @@ -1,6 +1,17 @@ -shaders = 1 +shaders = 3 -shader0 = "shaders/2xScaleHQ.slang" +shader0 = shaders/2xScaleHQ.slang filter_linear0 = false scale_type0 = source -scale0 = 2.0 +scale_x0 = 2.0 +scale_y0 = 2.0 + +shader1 = ../cubic/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/bicubic-y.slang +filter_linear2 = false + diff --git a/scalehq/4xScaleHQ.slangp b/scalehq/4xScaleHQ.slangp index 63ce663..668f117 100644 --- a/scalehq/4xScaleHQ.slangp +++ b/scalehq/4xScaleHQ.slangp @@ -1,6 +1,17 @@ -shaders = 1 +shaders = 3 -shader0 = "shaders/4xScaleHQ.slang" +shader0 = shaders/4xScaleHQ.slang filter_linear0 = false scale_type0 = source -scale0 = 4.0 +scale_x0 = 4.0 +scale_y0 = 4.0 + +shader1 = ../cubic/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/bicubic-y.slang +filter_linear2 = false + diff --git a/xbrz/2xbrz-linear.slangp b/xbrz/2xbrz-linear.slangp index 64c94c9..217d2bb 100644 --- a/xbrz/2xbrz-linear.slangp +++ b/xbrz/2xbrz-linear.slangp @@ -1,9 +1,15 @@ -shaders = 2 +shaders = 3 shader0 = shaders/2xbrz.slang filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/bicubic-y.slang +filter_linear2 = false diff --git a/xsal/2xsal.slangp b/xsal/2xsal.slangp index b20a219..278c02b 100644 --- a/xsal/2xsal.slangp +++ b/xsal/2xsal.slangp @@ -1,4 +1,4 @@ -shaders = 2 +shaders = 3 shader0 = shaders/2xsal.slang filter_linear0 = false @@ -6,5 +6,11 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../stock.slang -filter_linear1 = true +shader1 = ../cubic/shaders/spline16-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../cubic/shaders/spline16-y.slang +filter_linear2 = false diff --git a/xsoft/4xsoft.slangp b/xsoft/4xsoft.slangp index 3612d2a..2aac612 100644 --- a/xsoft/4xsoft.slangp +++ b/xsoft/4xsoft.slangp @@ -1,4 +1,4 @@ -shaders = 3 +shaders = 4 shader0 = ../stock.slang filter_linear0 = false @@ -12,5 +12,11 @@ scale_type1 = source scale_x1 = 2.0 scale_y1 = 2.0 -shader2 = ../stock.slang -filter_linear2 = true +shader2 = ../cubic/shaders/b-spline-x.slang +filter_linear2 = false +scale_type_x2 = viewport +scale_type_y2 = source +scale2 = 1.0 + +shader3 = ../cubic/shaders/b-spline-y.slang +filter_linear3 = false diff --git a/xsoft/4xsoftSdB.slangp b/xsoft/4xsoftSdB.slangp index dc67ca0..2bfa4dd 100644 --- a/xsoft/4xsoftSdB.slangp +++ b/xsoft/4xsoftSdB.slangp @@ -1,4 +1,4 @@ -shaders = 3 +shaders = 4 shader0 = ../stock.slang filter_linear0 = false @@ -12,5 +12,11 @@ scale_type1 = source scale_x1 = 2.0 scale_y1 = 2.0 -shader2 = ../stock.slang -filter_linear2 = true +shader2 = ../cubic/shaders/b-spline-x.slang +filter_linear2 = false +scale_type_x2 = viewport +scale_type_y2 = source +scale2 = 1.0 + +shader3 = ../cubic/shaders/b-spline-y.slang +filter_linear3 = false