Merge pull request #274 from Hyllian/master

Improves smooth shaders presets

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
+shader1 = ../cubic/shaders/bicubic-x.slang
-filter_linear1 = true
+filter_linear1 = false
+scale_type_x1 = viewport
+scale_type_y1 = source
+scale1 = 1.0
+
+shader2 = ../cubic/shaders/bicubic-y.slang
+filter_linear2 = false

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
+shader1 = ../cubic/shaders/bicubic-x.slang
-filter_linear1 = true
+filter_linear1 = false
+scale_type_x1 = viewport
+scale_type_y1 = source
+scale1 = 1.0
+
+shader2 = ../cubic/shaders/bicubic-y.slang
+filter_linear2 = false
+

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
+shader1 = ../cubic/shaders/bicubic-x.slang
-filter_linear1 = true
+filter_linear1 = false
+scale_type_x1 = viewport
+scale_type_y1 = source
+scale1 = 1.0
+
+shader2 = ../cubic/shaders/bicubic-y.slang
+filter_linear2 = false

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

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

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

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
+

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
+

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
+shader1 = ../cubic/shaders/bicubic-x.slang
-filter_linear1 = true
+filter_linear1 = false
+scale_type_x1 = viewport
+scale_type_y1 = source
+scale1 = 1.0
+
+shader2 = ../cubic/shaders/bicubic-y.slang
+filter_linear2 = false

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
+shader1 = ../cubic/shaders/spline16-x.slang
-filter_linear1 = true
+filter_linear1 = false
+scale_type_x1 = viewport
+scale_type_y1 = source
+scale1 = 1.0
+
+shader2 = ../cubic/shaders/spline16-y.slang
+filter_linear2 = false

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
+shader2 = ../cubic/shaders/b-spline-x.slang
-filter_linear2 = true
+filter_linear2 = false
+scale_type_x2 = viewport
+scale_type_y2 = source
+scale2 = 1.0
+
+shader3 = ../cubic/shaders/b-spline-y.slang
+filter_linear3 = false

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
+shader2 = ../cubic/shaders/b-spline-x.slang
-filter_linear2 = true
+filter_linear2 = false
+scale_type_x2 = viewport
+scale_type_y2 = source
+scale2 = 1.0
+
+shader3 = ../cubic/shaders/b-spline-y.slang
+filter_linear3 = false