Update super-xbr and mixed-res shaders

- Super-xbr go back to gamma color, as I think it looks better;
- Some parameters tweaked;
- New mixed-res presets.
This commit is contained in:
Hyllian 2024-05-03 12:39:32 -03:00
parent 3378d01600
commit 729ab17673
16 changed files with 942 additions and 162 deletions

View file

@ -0,0 +1,126 @@
shaders = "12"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false"
alias0 = ""
float_framebuffer0 = "false"
srgb_framebuffer0 = "false"
scale_type_x0 = "source"
scale_x0 = "1.000000"
scale_type_y0 = "source"
scale_y0 = "1.000000"
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"
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
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
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = "XbrSource"
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.5
shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear5 = "false"
wrap_mode5 = "clamp_to_edge"
mipmap_input5 = "false"
alias5 = ""
float_framebuffer5 = "false"
srgb_framebuffer5 = "true"
scale_type_x5 = "source"
scale_x5 = "1.000000"
scale_type_y5 = "source"
scale_y5 = "1.000000"
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.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 = "2.000000"
scale_type_y6 = "source"
scale_y6 = "2.000000"
shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.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 = "1.000000"
scale_type_y7 = "source"
scale_y7 = "1.000000"
shader8 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear8 = true
wrap_mode8 = "clamp_to_edge"
srgb_framebuffer8 = "true"
scale_type8 = viewport
scale8 = 1.0
shader9 = "../../../deblur/shaders/deblur.slang"
filter_linear9 = "true"
wrap_mode9 = "clamp_to_border"
srgb_framebuffer9 = "true"
scale_type9 = "source"
scale9 = "1.000000"
shader10 = "../../shaders/mixed-res/output.slang"
filter_linear10 = false
wrap_mode10 = "clamp_to_border"
mipmap_input10 = "false"
alias10 = ""
float_framebuffer10 = "false"
srgb_framebuffer10 = "false"
scale_type_x10 = "source"
scale_x10 = "1.000000"
scale_type_y10 = "source"
scale_y10 = "1.000000"
shader11 = "../../../film/shaders/film-grain.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
scale_type11 = source
scale11 = 1.0
IR_SCALE = "2.0"
B_TRESH = "0.20"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
B = "0.330000"
C = "0.330000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "3.000000"
SMART = "1.000000"
GRAIN_AMOUNT = "0.050000"
GRAIN_SIZE = "2.500000"

View file

@ -0,0 +1,127 @@
shaders = "12"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false"
alias0 = ""
float_framebuffer0 = "false"
srgb_framebuffer0 = "false"
scale_type_x0 = "source"
scale_x0 = "1.000000"
scale_type_y0 = "source"
scale_y0 = "1.000000"
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"
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
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
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = ""
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.5
shader5 = "../../../film/shaders/film-grain.slang"
filter_linear5 = false
alias5 = "XbrSource"
wrap_mode5 = "clamp_to_border"
scale_type5 = source
scale5 = 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"
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"
shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear9 = true
wrap_mode9 = "clamp_to_edge"
srgb_framebuffer9 = "true"
scale_type9 = viewport
scale9 = 1.0
shader10 = "../../../deblur/shaders/deblur.slang"
filter_linear10 = "true"
wrap_mode10 = "clamp_to_border"
srgb_framebuffer10 = "true"
scale_type10 = "source"
scale10 = "1.000000"
shader11 = "../../shaders/mixed-res/output.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
mipmap_input11 = "false"
alias11 = ""
float_framebuffer11 = "false"
srgb_framebuffer11 = "false"
scale_type_x11 = "source"
scale_x11 = "1.000000"
scale_type_y11 = "source"
scale_y11 = "1.000000"
IR_SCALE = "2.0"
B_TRESH = "0.20"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
B = "0.330000"
C = "0.330000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "3.000000"
SMART = "1.000000"

View file

@ -1,4 +1,4 @@
shaders = "12"
shaders = "13"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
@ -39,23 +39,20 @@ scale_y3 = 1.0
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = "XbrSource"
alias4 = ""
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.5
shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear5 = "false"
wrap_mode5 = "clamp_to_edge"
mipmap_input5 = "false"
alias5 = ""
float_framebuffer5 = "false"
srgb_framebuffer5 = "true"
scale_type_x5 = "source"
scale_x5 = "1.000000"
scale_type_y5 = "source"
scale_y5 = "1.000000"
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
shader5 = "../../../denoisers/shaders/fast-bilateral.slang"
filter_linear5 = false
alias5 = "XbrSource"
wrap_mode5 = "clamp_to_border"
scale_type5 = source
scale5 = 1.0
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear6 = "false"
wrap_mode6 = "clamp_to_edge"
mipmap_input6 = "false"
@ -63,10 +60,11 @@ alias6 = ""
float_framebuffer6 = "false"
srgb_framebuffer6 = "true"
scale_type_x6 = "source"
scale_x6 = "2.000000"
scale_x6 = "1.000000"
scale_type_y6 = "source"
scale_y6 = "2.000000"
shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
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"
@ -74,52 +72,59 @@ alias7 = ""
float_framebuffer7 = "false"
srgb_framebuffer7 = "true"
scale_type_x7 = "source"
scale_x7 = "1.000000"
scale_x7 = "2.000000"
scale_type_y7 = "source"
scale_y7 = "1.000000"
scale_y7 = "2.000000"
shader8 = "../../../interpolation/shaders/bicubic-x.slang"
shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
filter_linear8 = "false"
wrap_mode8 = "clamp_to_edge"
mipmap_input8 = "false"
alias8 = ""
float_framebuffer8 = "false"
srgb_framebuffer8 = "true"
scale_type_x8 = "viewport"
scale_type_x8 = "source"
scale_x8 = "1.000000"
scale_type_y8 = "source"
scale_y8 = "1.000000"
shader9 = "../../../interpolation/shaders/bicubic-y.slang"
filter_linear9 = false
shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear9 = true
wrap_mode9 = "clamp_to_edge"
srgb_framebuffer9 = "true"
scale_type_x9 = viewport
scale_type_y9 = viewport
scale_type9 = viewport
scale9 = 1.0
shader10 = "../../../deblur/shaders/deblur.slang"
filter_linear10 = "true"
shader10 = "../../../warp/shaders/dilation.slang"
filter_linear10 = "false"
wrap_mode10 = "clamp_to_border"
srgb_framebuffer10 = "true"
scale_type10 = "source"
scale10 = "1.000000"
shader11 = "../../shaders/mixed-res/output.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
mipmap_input11 = "false"
alias11 = ""
float_framebuffer11 = "false"
srgb_framebuffer11 = "false"
scale_type_x11 = "source"
scale_x11 = "1.000000"
scale_type_y11 = "source"
scale_y11 = "1.000000"
shader11 = "../../../deblur/shaders/deblur.slang"
filter_linear11 = "true"
wrap_mode11 = "clamp_to_border"
srgb_framebuffer11 = "true"
scale_type11 = "source"
scale11 = "1.000000"
shader12 = "../../shaders/mixed-res/output.slang"
filter_linear12 = false
wrap_mode12 = "clamp_to_border"
scale_type12 = "source"
scale12 = "1.000000"
IR_SCALE = "2.0"
B_TRESH = "0.20"
XBR_EDGE_STR_P0 = "2.500000"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
XBR_EDGE_STR_P1 = "2.500000"
DILATION_STRENGTH = "0.300000"
B = "0.330000"
C = "0.330000"
OFFSET = "2.500000"
DEBLUR = "1.250000"
SMART = "0.400000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "2.000000"
SMART = "1.000000"

View file

@ -0,0 +1,126 @@
shaders = "12"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false"
alias0 = ""
float_framebuffer0 = "false"
srgb_framebuffer0 = "false"
scale_type_x0 = "source"
scale_x0 = "1.000000"
scale_type_y0 = "source"
scale_y0 = "1.000000"
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"
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
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
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = "XbrSource"
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.333333
shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear5 = "false"
wrap_mode5 = "clamp_to_edge"
mipmap_input5 = "false"
alias5 = ""
float_framebuffer5 = "false"
srgb_framebuffer5 = "true"
scale_type_x5 = "source"
scale_x5 = "1.000000"
scale_type_y5 = "source"
scale_y5 = "1.000000"
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.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 = "2.000000"
scale_type_y6 = "source"
scale_y6 = "2.000000"
shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.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 = "1.000000"
scale_type_y7 = "source"
scale_y7 = "1.000000"
shader8 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear8 = true
wrap_mode8 = "clamp_to_edge"
srgb_framebuffer8 = "true"
scale_type8 = viewport
scale8 = 1.0
shader9 = "../../../deblur/shaders/deblur.slang"
filter_linear9 = "true"
wrap_mode9 = "clamp_to_border"
srgb_framebuffer9 = "true"
scale_type9 = "source"
scale9 = "1.000000"
shader10 = "../../shaders/mixed-res/output.slang"
filter_linear10 = false
wrap_mode10 = "clamp_to_border"
mipmap_input10 = "false"
alias10 = ""
float_framebuffer10 = "false"
srgb_framebuffer10 = "false"
scale_type_x10 = "source"
scale_x10 = "1.000000"
scale_type_y10 = "source"
scale_y10 = "1.000000"
shader11 = "../../../film/shaders/film-grain.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
scale_type11 = source
scale11 = 1.0
IR_SCALE = "3.0"
B_TRESH = "0.20"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
B = "0.330000"
C = "0.330000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "3.000000"
SMART = "1.000000"
GRAIN_AMOUNT = "0.050000"
GRAIN_SIZE = "2.500000"

View file

@ -0,0 +1,127 @@
shaders = "12"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false"
alias0 = ""
float_framebuffer0 = "false"
srgb_framebuffer0 = "false"
scale_type_x0 = "source"
scale_x0 = "1.000000"
scale_type_y0 = "source"
scale_y0 = "1.000000"
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"
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
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
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = ""
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.333333
shader5 = "../../../film/shaders/film-grain.slang"
filter_linear5 = false
alias5 = "XbrSource"
wrap_mode5 = "clamp_to_border"
scale_type5 = source
scale5 = 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"
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"
shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear9 = true
wrap_mode9 = "clamp_to_edge"
srgb_framebuffer9 = "true"
scale_type9 = viewport
scale9 = 1.0
shader10 = "../../../deblur/shaders/deblur.slang"
filter_linear10 = "true"
wrap_mode10 = "clamp_to_border"
srgb_framebuffer10 = "true"
scale_type10 = "source"
scale10 = "1.000000"
shader11 = "../../shaders/mixed-res/output.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
mipmap_input11 = "false"
alias11 = ""
float_framebuffer11 = "false"
srgb_framebuffer11 = "false"
scale_type_x11 = "source"
scale_x11 = "1.000000"
scale_type_y11 = "source"
scale_y11 = "1.000000"
IR_SCALE = "3.0"
B_TRESH = "0.20"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
B = "0.330000"
C = "0.330000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "3.000000"
SMART = "1.000000"

View file

@ -1,4 +1,4 @@
shaders = "12"
shaders = "13"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
@ -39,23 +39,20 @@ scale_y3 = 1.0
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = "XbrSource"
alias4 = ""
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.333333
shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear5 = "false"
wrap_mode5 = "clamp_to_edge"
mipmap_input5 = "false"
alias5 = ""
float_framebuffer5 = "false"
srgb_framebuffer5 = "true"
scale_type_x5 = "source"
scale_x5 = "1.000000"
scale_type_y5 = "source"
scale_y5 = "1.000000"
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
shader5 = "../../../denoisers/shaders/fast-bilateral.slang"
filter_linear5 = false
alias5 = "XbrSource"
wrap_mode5 = "clamp_to_border"
scale_type5 = source
scale5 = 1.0
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear6 = "false"
wrap_mode6 = "clamp_to_edge"
mipmap_input6 = "false"
@ -63,10 +60,11 @@ alias6 = ""
float_framebuffer6 = "false"
srgb_framebuffer6 = "true"
scale_type_x6 = "source"
scale_x6 = "2.000000"
scale_x6 = "1.000000"
scale_type_y6 = "source"
scale_y6 = "2.000000"
shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
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"
@ -74,52 +72,59 @@ alias7 = ""
float_framebuffer7 = "false"
srgb_framebuffer7 = "true"
scale_type_x7 = "source"
scale_x7 = "1.000000"
scale_x7 = "2.000000"
scale_type_y7 = "source"
scale_y7 = "1.000000"
scale_y7 = "2.000000"
shader8 = "../../../interpolation/shaders/bicubic-x.slang"
shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
filter_linear8 = "false"
wrap_mode8 = "clamp_to_edge"
mipmap_input8 = "false"
alias8 = ""
float_framebuffer8 = "false"
srgb_framebuffer8 = "true"
scale_type_x8 = "viewport"
scale_type_x8 = "source"
scale_x8 = "1.000000"
scale_type_y8 = "source"
scale_y8 = "1.000000"
shader9 = "../../../interpolation/shaders/bicubic-y.slang"
filter_linear9 = false
shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear9 = true
wrap_mode9 = "clamp_to_edge"
srgb_framebuffer9 = "true"
scale_type_x9 = viewport
scale_type_y9 = viewport
scale_type9 = viewport
scale9 = 1.0
shader10 = "../../../deblur/shaders/deblur.slang"
filter_linear10 = "true"
shader10 = "../../../warp/shaders/dilation.slang"
filter_linear10 = "false"
wrap_mode10 = "clamp_to_border"
srgb_framebuffer10 = "true"
scale_type10 = "source"
scale10 = "1.000000"
shader11 = "../../shaders/mixed-res/output.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
mipmap_input11 = "false"
alias11 = ""
float_framebuffer11 = "false"
srgb_framebuffer11 = "false"
scale_type_x11 = "source"
scale_x11 = "1.000000"
scale_type_y11 = "source"
scale_y11 = "1.000000"
shader11 = "../../../deblur/shaders/deblur.slang"
filter_linear11 = "true"
wrap_mode11 = "clamp_to_border"
srgb_framebuffer11 = "true"
scale_type11 = "source"
scale11 = "1.000000"
shader12 = "../../shaders/mixed-res/output.slang"
filter_linear12 = false
wrap_mode12 = "clamp_to_border"
scale_type12 = "source"
scale12 = "1.000000"
IR_SCALE = "3.0"
B_TRESH = "0.20"
XBR_EDGE_STR_P0 = "2.500000"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
XBR_EDGE_STR_P1 = "2.500000"
DILATION_STRENGTH = "0.300000"
B = "0.330000"
C = "0.330000"
OFFSET = "2.500000"
DEBLUR = "1.250000"
SMART = "0.400000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "2.000000"
SMART = "1.000000"

View file

@ -0,0 +1,126 @@
shaders = "12"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false"
alias0 = ""
float_framebuffer0 = "false"
srgb_framebuffer0 = "false"
scale_type_x0 = "source"
scale_x0 = "1.000000"
scale_type_y0 = "source"
scale_y0 = "1.000000"
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"
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
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
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = "XbrSource"
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.25
shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear5 = "false"
wrap_mode5 = "clamp_to_edge"
mipmap_input5 = "false"
alias5 = ""
float_framebuffer5 = "false"
srgb_framebuffer5 = "true"
scale_type_x5 = "source"
scale_x5 = "1.000000"
scale_type_y5 = "source"
scale_y5 = "1.000000"
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.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 = "2.000000"
scale_type_y6 = "source"
scale_y6 = "2.000000"
shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.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 = "1.000000"
scale_type_y7 = "source"
scale_y7 = "1.000000"
shader8 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear8 = true
wrap_mode8 = "clamp_to_edge"
srgb_framebuffer8 = "true"
scale_type8 = viewport
scale8 = 1.0
shader9 = "../../../deblur/shaders/deblur.slang"
filter_linear9 = "true"
wrap_mode9 = "clamp_to_border"
srgb_framebuffer9 = "true"
scale_type9 = "source"
scale9 = "1.000000"
shader10 = "../../shaders/mixed-res/output.slang"
filter_linear10 = false
wrap_mode10 = "clamp_to_border"
mipmap_input10 = "false"
alias10 = ""
float_framebuffer10 = "false"
srgb_framebuffer10 = "false"
scale_type_x10 = "source"
scale_x10 = "1.000000"
scale_type_y10 = "source"
scale_y10 = "1.000000"
shader11 = "../../../film/shaders/film-grain.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
scale_type11 = source
scale11 = 1.0
IR_SCALE = "4.0"
B_TRESH = "0.10"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
B = "0.330000"
C = "0.330000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "3.000000"
SMART = "1.000000"
GRAIN_AMOUNT = "0.050000"
GRAIN_SIZE = "2.500000"

View file

@ -0,0 +1,127 @@
shaders = "12"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false"
alias0 = ""
float_framebuffer0 = "false"
srgb_framebuffer0 = "false"
scale_type_x0 = "source"
scale_x0 = "1.000000"
scale_type_y0 = "source"
scale_y0 = "1.000000"
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"
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
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
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = ""
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.25
shader5 = "../../../film/shaders/film-grain.slang"
filter_linear5 = false
alias5 = "XbrSource"
wrap_mode5 = "clamp_to_border"
scale_type5 = source
scale5 = 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"
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"
shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear9 = true
wrap_mode9 = "clamp_to_edge"
srgb_framebuffer9 = "true"
scale_type9 = viewport
scale9 = 1.0
shader10 = "../../../deblur/shaders/deblur.slang"
filter_linear10 = "true"
wrap_mode10 = "clamp_to_border"
srgb_framebuffer10 = "true"
scale_type10 = "source"
scale10 = "1.000000"
shader11 = "../../shaders/mixed-res/output.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
mipmap_input11 = "false"
alias11 = ""
float_framebuffer11 = "false"
srgb_framebuffer11 = "false"
scale_type_x11 = "source"
scale_x11 = "1.000000"
scale_type_y11 = "source"
scale_y11 = "1.000000"
IR_SCALE = "4.0"
B_TRESH = "0.10"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
B = "0.330000"
C = "0.330000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "3.000000"
SMART = "1.000000"

View file

@ -1,4 +1,4 @@
shaders = "12"
shaders = "13"
shader0 = "../../shaders/mixed-res/coder.slang"
wrap_mode0 = "clamp_to_border"
@ -39,23 +39,20 @@ scale_y3 = 1.0
shader4 = "../../shaders/mixed-res/cheap-sharpen-tweaked.slang"
filter_linear4 = true
alias4 = "XbrSource"
alias4 = ""
wrap_mode4 = "clamp_to_edge"
scale_type4 = source
scale4 = 0.25
shader5 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear5 = "false"
wrap_mode5 = "clamp_to_edge"
mipmap_input5 = "false"
alias5 = ""
float_framebuffer5 = "false"
srgb_framebuffer5 = "true"
scale_type_x5 = "source"
scale_x5 = "1.000000"
scale_type_y5 = "source"
scale_y5 = "1.000000"
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang"
shader5 = "../../../denoisers/shaders/fast-bilateral.slang"
filter_linear5 = false
alias5 = "XbrSource"
wrap_mode5 = "clamp_to_border"
scale_type5 = source
scale5 = 1.0
shader6 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang"
filter_linear6 = "false"
wrap_mode6 = "clamp_to_edge"
mipmap_input6 = "false"
@ -63,10 +60,11 @@ alias6 = ""
float_framebuffer6 = "false"
srgb_framebuffer6 = "true"
scale_type_x6 = "source"
scale_x6 = "2.000000"
scale_x6 = "1.000000"
scale_type_y6 = "source"
scale_y6 = "2.000000"
shader7 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
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"
@ -74,52 +72,59 @@ alias7 = ""
float_framebuffer7 = "false"
srgb_framebuffer7 = "true"
scale_type_x7 = "source"
scale_x7 = "1.000000"
scale_x7 = "2.000000"
scale_type_y7 = "source"
scale_y7 = "1.000000"
scale_y7 = "2.000000"
shader8 = "../../../interpolation/shaders/bicubic-x.slang"
shader8 = "../../../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang"
filter_linear8 = "false"
wrap_mode8 = "clamp_to_edge"
mipmap_input8 = "false"
alias8 = ""
float_framebuffer8 = "false"
srgb_framebuffer8 = "true"
scale_type_x8 = "viewport"
scale_type_x8 = "source"
scale_x8 = "1.000000"
scale_type_y8 = "source"
scale_y8 = "1.000000"
shader9 = "../../../interpolation/shaders/bicubic-y.slang"
filter_linear9 = false
shader9 = "../../../interpolation/shaders/bicubic-5-taps.slang"
filter_linear9 = true
wrap_mode9 = "clamp_to_edge"
srgb_framebuffer9 = "true"
scale_type_x9 = viewport
scale_type_y9 = viewport
scale_type9 = viewport
scale9 = 1.0
shader10 = "../../../deblur/shaders/deblur.slang"
filter_linear10 = "true"
shader10 = "../../../warp/shaders/dilation.slang"
filter_linear10 = "false"
wrap_mode10 = "clamp_to_border"
srgb_framebuffer10 = "true"
scale_type10 = "source"
scale10 = "1.000000"
shader11 = "../../shaders/mixed-res/output.slang"
filter_linear11 = false
wrap_mode11 = "clamp_to_border"
mipmap_input11 = "false"
alias11 = ""
float_framebuffer11 = "false"
srgb_framebuffer11 = "false"
scale_type_x11 = "source"
scale_x11 = "1.000000"
scale_type_y11 = "source"
scale_y11 = "1.000000"
shader11 = "../../../deblur/shaders/deblur.slang"
filter_linear11 = "true"
wrap_mode11 = "clamp_to_border"
srgb_framebuffer11 = "true"
scale_type11 = "source"
scale11 = "1.000000"
shader12 = "../../shaders/mixed-res/output.slang"
filter_linear12 = false
wrap_mode12 = "clamp_to_border"
scale_type12 = "source"
scale12 = "1.000000"
IR_SCALE = "4.0"
B_TRESH = "0.10"
XBR_EDGE_STR_P0 = "2.500000"
XBR_WEIGHT = "1.000000"
XBR_EDGE_STR_P1 = "5.000000"
XBR_EDGE_STR_P1 = "2.500000"
DILATION_STRENGTH = "0.300000"
B = "0.330000"
C = "0.330000"
OFFSET = "2.500000"
DEBLUR = "1.250000"
SMART = "0.400000"
CS_SHARPNESS = "0.200000"
OFFSET = "3.000000"
DEBLUR = "2.000000"
SMART = "1.000000"

View file

@ -46,9 +46,9 @@ layout(push_constant) uniform Push
const float wp1 = 1.0;
const float wp2 = 0.0;
const float wp3 = 0.0;
const float wp4 = 2.0;
const float wp5 =-1.0;
const float wp6 = 0.0;
const float wp4 = 4.0;
const float wp5 = 0.0;
const float wp6 = 1.0;
const vec3 Y = vec3(.2126, .7152, .0722);
@ -175,7 +175,7 @@ void main()
vec3 c2 = mat4x3( P0, E, I, P3 ) * fw;
/* Smoothly blends the two strongest directions. */
vec3 color = mix(c1, c2, smoothstep(-limits, limits, d_edge));
vec3 color = d_edge == 0.0 ? 0.5*(c1 + c2) : mix(c1, c2, smoothstep(-limits, limits, d_edge));
/* Anti-ringing code. */
vec3 min_sample = min4( E, F, H, I );

View file

@ -38,15 +38,15 @@ layout(push_constant) uniform Push
#define XBR_WEIGHT_P1 0.0
#define XBR_ANTI_RINGING 1.0
#define XBR_EDGE_STR_P1 3.0
#define XBR_EDGE_STR_P1 0.0
#define weight (XBR_WEIGHT_P1*1.29633/10.0)
const float wp1 = 1.0;
const float wp2 = 0.0;
const float wp3 = 0.0;
const float wp4 = 2.0;
const float wp5 =-1.0;
const float wp6 = 0.0;
const float wp4 = 4.0;
const float wp5 = 0.0;
const float wp6 = 1.0;
layout(std140, set = 0, binding = 0) uniform UBO
{
@ -173,7 +173,7 @@ void main()
vec3 c2 = mat4x3( P0, E, I, P3 ) * fw;
/* Smoothly blends the two strongest directions. */
vec3 color = mix(c1, c2, smoothstep(-limits, limits, d_edge));
vec3 color = d_edge == 0.0 ? 0.5*(c1 + c2) : mix(c1, c2, smoothstep(-limits, limits, d_edge));
/* Anti-ringing code. */
vec3 min_sample = min4( E, F, H, I );

View file

@ -36,15 +36,15 @@ layout(push_constant) uniform Push
#define XBR_WEIGHT_P2 1.0
#define XBR_ANTI_RINGING 1.0
#define XBR_EDGE_STR_P2 3.0
#define XBR_EDGE_STR_P2 2.0
#define weight (XBR_WEIGHT_P2*1.29633/10.0)
const float wp1 = 1.0;
const float wp2 = 0.0;
const float wp3 = 0.0;
const float wp4 =-2.0;
const float wp5 =-1.0;
const float wp6 = 0.0;
const float wp4 =-4.0;
const float wp5 = 0.0;
const float wp6 = 1.0;
layout(std140, set = 0, binding = 0) uniform UBO
{
@ -182,7 +182,7 @@ void main()
vec3 c2 = mat4x3( P0, E, I, P3 ) * fw;
/* Smoothly blends the two strongest directions. */
vec3 color = mix(c1, c2, smoothstep(-limits, limits, d_edge));
vec3 color = d_edge == 0.0 ? 0.5*(c1 + c2) : mix(c1, c2, smoothstep(-limits, limits, d_edge));
/* Anti-ringing code. */
vec3 min_sample = min4( E, F, H, I );

View file

@ -9,7 +9,7 @@ layout(push_constant) uniform Push
float OutputGamma;
} params;
#pragma parameter OutputGamma "OUTPUT GAMMA" 2.0 1.0 3.0 0.05
#pragma parameter OutputGamma "OUTPUT GAMMA" 1.0 1.0 3.0 0.05
#define OutputGamma params.OutputGamma
#define GAMMA_OUT(color) pow(color, vec3(1.0 / OutputGamma, 1.0 / OutputGamma, 1.0 / OutputGamma))

View file

@ -9,7 +9,7 @@ layout(push_constant) uniform Push
float InputGamma;
} params;
#pragma parameter InputGamma "INPUT GAMMA" 2.0 1.0 3.0 0.05
#pragma parameter InputGamma "INPUT GAMMA" 1.0 1.0 3.0 0.05
#define InputGamma params.InputGamma

View file

@ -1,37 +1,40 @@
shaders = "7"
shaders = "6"
shader0 = "shaders/support/linearize.slang"
filter_linear0 = false
srgb_framebuffer0 = true
scale_type0 = "source"
scale0 = "1.000000"
alias0 = XbrSource
shader1 = "shaders/super-xbr/super-xbr-fast-pass0.slang"
filter_linear1 = false
wrap_mode1 = clamp_to_edge
srgb_framebuffer1 = true
scale_type1 = "source"
scale1 = "1.000000"
shader2 = "shaders/super-xbr/super-xbr-fast-pass1.slang"
filter_linear2 = false
wrap_mode2 = clamp_to_edge
srgb_framebuffer2 = true
scale_type2 = "source"
scale2 = "2.000000"
shader3 = "shaders/super-xbr/super-xbr-fast-pass2.slang"
filter_linear3 = false
wrap_mode3 = clamp_to_edge
srgb_framebuffer3 = true
scale_type3 = "source"
scale3 = "1.000000"
shader4 = "shaders/support/spline16-x.slang"
shader4 = "shaders/super-xbr/custom-jinc2-sharper.slang"
filter_linear4 = false
scale_type_x4 = "viewport"
scale_type_y4 = "source"
wrap_mode4 = clamp_to_edge
srgb_framebuffer4 = true
scale_type4 = "viewport"
scale4 = "1.000000"
shader5 = "shaders/support/spline16-y.slang"
shader5 = "shaders/support/delinearize.slang"
filter_linear5 = false
scale_type5 = "viewport"
scale5 = "1.000000"
shader6 = "shaders/support/delinearize.slang"
filter_linear6 = false

View file

@ -1,37 +1,40 @@
shaders = "7"
shaders = "6"
shader0 = "shaders/support/linearize.slang"
filter_linear0 = false
srgb_framebuffer0 = true
scale_type0 = "source"
scale0 = "1.000000"
alias0 = XbrSource
shader1 = "shaders/super-xbr/super-xbr-pass0.slang"
filter_linear1 = false
wrap_mode1 = clamp_to_edge
srgb_framebuffer1 = true
scale_type1 = "source"
scale1 = "1.000000"
shader2 = "shaders/super-xbr/super-xbr-pass1.slang"
filter_linear2 = false
wrap_mode2 = clamp_to_edge
srgb_framebuffer2 = true
scale_type2 = "source"
scale2 = "2.000000"
shader3 = "shaders/super-xbr/super-xbr-pass2.slang"
filter_linear3 = false
wrap_mode3 = clamp_to_edge
srgb_framebuffer3 = true
scale_type3 = "source"
scale3 = "1.000000"
shader4 = "shaders/support/spline16-x.slang"
shader4 = "shaders/super-xbr/custom-jinc2-sharper.slang"
filter_linear4 = false
scale_type_x4 = "viewport"
scale_type_y4 = "source"
wrap_mode4 = clamp_to_edge
srgb_framebuffer4 = true
scale_type4 = "viewport"
scale4 = "1.000000"
shader5 = "shaders/support/spline16-y.slang"
shader5 = "shaders/support/delinearize.slang"
filter_linear5 = false
scale_type5 = "viewport"
scale5 = "1.000000"
shader6 = "shaders/support/delinearize.slang"
filter_linear6 = false