From fe11f79a067d043e5b06b1e57fba33c6a4524ec8 Mon Sep 17 00:00:00 2001 From: hunterk Date: Thu, 19 Jan 2023 13:17:43 -0600 Subject: [PATCH] fix old scalefx reference passes in presets (#351) * fix reference pass for old scalefx in sh1nra ntsc * fix reference pass for scalefx in sh1nra vibrance * fix reference pass for old scalefx * fix reference pass for old scalefx-9x --- ...calefx9-aa-blur-hazy-ntsc-sh1nra358.slangp | 81 ++++++++++--------- ...fx9-aa-blur-hazy-vibrance-sh1nra358.slangp | 81 ++++++++++--------- scalefx/shaders/old/scalefx-9x.slangp | 49 +++++------ scalefx/shaders/old/scalefx.slangp | 21 ++--- 4 files changed, 122 insertions(+), 110 deletions(-) diff --git a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp index 2e09750..22679f7 100644 --- a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp +++ b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp @@ -1,93 +1,96 @@ -shaders = 16 +shaders = 17 -shader0 = ../scalefx/shaders/old/scalefx-pass0.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 -alias0 = sfxp0 +shader0 = ../stock.slang +alias0 = scalefx_old_refpass -shader1 = ../scalefx/shaders/old/scalefx-pass1.slang +shader1 = ../scalefx/shaders/old/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 -alias1 = sfxp1 +alias1 = sfxp0 -shader2 = ../scalefx/shaders/old/scalefx-pass2.slang +shader2 = ../scalefx/shaders/old/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 -alias2 = sfxp2 +alias2 = sfxp1 -shader3 = ../scalefx/shaders/old/scalefx-pass3.slang +shader3 = ../scalefx/shaders/old/scalefx-pass2.slang filter_linear3 = false scale_type3 = source -scale3 = 3.0 -alias3 = sfxp3 +scale3 = 1.0 +alias3 = sfxp2 -shader4 = ../scalefx/shaders/old/scalefx-pass0.slang +shader4 = ../scalefx/shaders/old/scalefx-pass3.slang filter_linear4 = false scale_type4 = source -scale4 = 1.0 -alias4 = sfxp4 +scale4 = 3.0 +alias4 = sfxp3 -shader5 = ../scalefx/shaders/old/scalefx-pass1.slang +shader5 = ../scalefx/shaders/old/scalefx-pass0.slang filter_linear5 = false scale_type5 = source scale5 = 1.0 -alias5 = sfxp5 +alias5 = sfxp4 -shader6 = ../scalefx/shaders/old/scalefx-pass2.slang +shader6 = ../scalefx/shaders/old/scalefx-pass1.slang filter_linear6 = false scale_type6 = source scale6 = 1.0 -alias6 = sfxp6 +alias6 = sfxp5 -shader7 = ../scalefx/shaders/old/scalefx-pass7.slang +shader7 = ../scalefx/shaders/old/scalefx-pass2.slang filter_linear7 = false scale_type7 = source -scale7 = 3.0 -alias7 = sfxp7 +scale7 = 1.0 +alias7 = sfxp6 -shader8 = ../misc/shaders/image-adjustment.slang +shader8 = ../scalefx/shaders/old/scalefx-pass7.slang filter_linear8 = false scale_type8 = source -scale8 = 1.0 +scale8 = 3.0 +alias8 = sfxp7 -shader9 = ../anti-aliasing/shaders/aa-shader-4.0.slang -filter_linear9 = true -scale_type9 = viewport +shader9 = ../misc/shaders/image-adjustment.slang +filter_linear9 = false +scale_type9 = source scale9 = 1.0 -shader10 = ../reshade/shaders/scanlines.slang -filter_linear10 = false -scale_type10 = source +shader10 = ../anti-aliasing/shaders/aa-shader-4.0.slang +filter_linear10 = true +scale_type10 = viewport scale10 = 1.0 -alias10 = scanpass -shader11 = ../reshade/shaders/bloom-pass-sh1nra358.slang +shader11 = ../reshade/shaders/scanlines.slang filter_linear11 = false scale_type11 = source scale11 = 1.0 +alias11 = scanpass -shader12 = ../blurs/shaders/blur-gauss-h.slang -filter_linear12 = true +shader12 = ../reshade/shaders/bloom-pass-sh1nra358.slang +filter_linear12 = false scale_type12 = source scale12 = 1.0 -shader13 = ../blurs/shaders/blur-gauss-v.slang +shader13 = ../blurs/shaders/blur-gauss-h.slang filter_linear13 = true scale_type13 = source scale13 = 1.0 -shader14 = ../reshade/shaders/blur-haze-sh1nra358.slang +shader14 = ../blurs/shaders/blur-gauss-v.slang filter_linear14 = true scale_type14 = source scale14 = 1.0 -shader15 = ../misc/shaders/ntsc-colors.slang -filter_linear15 = false +shader15 = ../reshade/shaders/blur-haze-sh1nra358.slang +filter_linear15 = true scale_type15 = source scale15 = 1.0 +shader16 = ../misc/shaders/ntsc-colors.slang +filter_linear16 = false +scale_type16 = source +scale16 = 1.0 + parameters = "INTERNAL_RES" INTERNAL_RES = 6.0 diff --git a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp index 37514f8..c7301b2 100644 --- a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp +++ b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp @@ -1,93 +1,96 @@ -shaders = 16 +shaders = 17 -shader0 = ../scalefx/shaders/old/scalefx-pass0.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 -alias0 = sfxp0 +shader0 = ../stock.slang +alias0 = scalefx_old_refpass -shader1 = ../scalefx/shaders/old/scalefx-pass1.slang +shader1 = ../scalefx/shaders/old/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 -alias1 = sfxp1 +alias1 = sfxp0 -shader2 = ../scalefx/shaders/old/scalefx-pass2.slang +shader2 = ../scalefx/shaders/old/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 -alias2 = sfxp2 +alias2 = sfxp1 -shader3 = ../scalefx/shaders/old/scalefx-pass3.slang +shader3 = ../scalefx/shaders/old/scalefx-pass2.slang filter_linear3 = false scale_type3 = source -scale3 = 3.0 -alias3 = sfxp3 +scale3 = 1.0 +alias3 = sfxp2 -shader4 = ../scalefx/shaders/old/scalefx-pass0.slang +shader4 = ../scalefx/shaders/old/scalefx-pass3.slang filter_linear4 = false scale_type4 = source -scale4 = 1.0 -alias4 = sfxp4 +scale4 = 3.0 +alias4 = sfxp3 -shader5 = ../scalefx/shaders/old/scalefx-pass1.slang +shader5 = ../scalefx/shaders/old/scalefx-pass0.slang filter_linear5 = false scale_type5 = source scale5 = 1.0 -alias5 = sfxp5 +alias5 = sfxp4 -shader6 = ../scalefx/shaders/old/scalefx-pass2.slang +shader6 = ../scalefx/shaders/old/scalefx-pass1.slang filter_linear6 = false scale_type6 = source scale6 = 1.0 -alias6 = sfxp6 +alias6 = sfxp5 -shader7 = ../scalefx/shaders/old/scalefx-pass7.slang +shader7 = ../scalefx/shaders/old/scalefx-pass2.slang filter_linear7 = false scale_type7 = source -scale7 = 3.0 -alias7 = sfxp7 +scale7 = 1.0 +alias7 = sfxp6 -shader8 = ../misc/shaders/image-adjustment.slang +shader8 = ../scalefx/shaders/old/scalefx-pass7.slang filter_linear8 = false scale_type8 = source -scale8 = 1.0 +scale8 = 3.0 +alias8 = sfxp7 -shader9 = ../anti-aliasing/shaders/aa-shader-4.0.slang -filter_linear9 = true -scale_type9 = viewport +shader9 = ../misc/shaders/image-adjustment.slang +filter_linear9 = false +scale_type9 = source scale9 = 1.0 -shader10 = ../reshade/shaders/scanlines.slang -filter_linear10 = false -scale_type10 = source +shader10 = ../anti-aliasing/shaders/aa-shader-4.0.slang +filter_linear10 = true +scale_type10 = viewport scale10 = 1.0 -alias10 = scanpass -shader11 = ../reshade/shaders/bloom-pass-sh1nra358.slang +shader11 = ../reshade/shaders/scanlines.slang filter_linear11 = false scale_type11 = source scale11 = 1.0 +alias11 = scanpass -shader12 = ../blurs/shaders/blur-gauss-h.slang -filter_linear12 = true +shader12 = ../reshade/shaders/bloom-pass-sh1nra358.slang +filter_linear12 = false scale_type12 = source scale12 = 1.0 -shader13 = ../blurs/shaders/blur-gauss-v.slang +shader13 = ../blurs/shaders/blur-gauss-h.slang filter_linear13 = true scale_type13 = source scale13 = 1.0 -shader14 = ../reshade/shaders/blur-haze-sh1nra358.slang +shader14 = ../blurs/shaders/blur-gauss-v.slang filter_linear14 = true scale_type14 = source scale14 = 1.0 -shader15 = ../reshade/shaders/vibrance-pass-sh1nra358.slang -filter_linear15 = false +shader15 = ../reshade/shaders/blur-haze-sh1nra358.slang +filter_linear15 = true scale_type15 = source scale15 = 1.0 +shader16 = ../reshade/shaders/vibrance-pass-sh1nra358.slang +filter_linear16 = false +scale_type16 = source +scale16 = 1.0 + parameters = "INTERNAL_RES" INTERNAL_RES = 6.0 diff --git a/scalefx/shaders/old/scalefx-9x.slangp b/scalefx/shaders/old/scalefx-9x.slangp index a97f1bc..f4c5d58 100644 --- a/scalefx/shaders/old/scalefx-9x.slangp +++ b/scalefx/shaders/old/scalefx-9x.slangp @@ -1,49 +1,52 @@ -shaders = 8 +shaders = 9 -shader0 = scalefx-pass0.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 -alias0 = sfxp0 +shader0 = ../../../../stock.slang +alias0 = scalefx_old_refpass -shader1 = scalefx-pass1.slang +shader1 = scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 -alias1 = sfxp1 +alias1 = sfxp0 -shader2 = scalefx-pass2.slang +shader2 = scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 -alias2 = sfxp2 +alias2 = sfxp1 -shader3 = scalefx-pass3.slang +shader3 = scalefx-pass2.slang filter_linear3 = false scale_type3 = source -scale3 = 3.0 -alias3 = sfxp3 +scale3 = 1.0 +alias3 = sfxp2 -shader4 = scalefx-pass0.slang +shader4 = scalefx-pass3.slang filter_linear4 = false scale_type4 = source -scale4 = 1.0 -alias4 = sfxp4 +scale4 = 3.0 +alias4 = sfxp3 -shader5 = scalefx-pass1.slang +shader5 = scalefx-pass0.slang filter_linear5 = false scale_type5 = source scale5 = 1.0 -alias5 = sfxp5 +alias5 = sfxp4 -shader6 = scalefx-pass2.slang +shader6 = scalefx-pass1.slang filter_linear6 = false scale_type6 = source scale6 = 1.0 -alias6 = sfxp6 +alias6 = sfxp5 -shader7 = scalefx-pass7.slang +shader7 = scalefx-pass2.slang filter_linear7 = false scale_type7 = source -scale7 = 3.0 -alias7 = sfxp7 +scale7 = 1.0 +alias7 = sfxp6 + +shader8 = scalefx-pass7.slang +filter_linear8 = false +scale_type8 = source +scale8 = 3.0 +alias8 = sfxp7 diff --git a/scalefx/shaders/old/scalefx.slangp b/scalefx/shaders/old/scalefx.slangp index b407032..6dd9a79 100644 --- a/scalefx/shaders/old/scalefx.slangp +++ b/scalefx/shaders/old/scalefx.slangp @@ -1,21 +1,24 @@ -shaders = 4 +shaders = 5 -shader0 = scalefx-pass0.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 +shader0 = ../../../../stock.slang +alias0 = scalefx_old_refpass -shader1 = scalefx-pass1.slang +shader1 = scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 -shader2 = scalefx-pass2.slang +shader2 = scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 -shader3 = scalefx-pass3.slang +shader3 = scalefx-pass2.slang filter_linear3 = false scale_type3 = source -scale3 = 3.0 +scale3 = 1.0 + +shader4 = scalefx-pass3.slang +filter_linear4 = false +scale_type4 = source +scale4 = 3.0