From 4ea81932a9e680659fab4c3744ce81242ae4e992 Mon Sep 17 00:00:00 2001 From: HyperspaceMadness Date: Wed, 25 Jan 2023 12:59:48 -0500 Subject: [PATCH] Mega Bezel Version V1.9.0_2023-01-22 --- .../MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp | 308 +++++++------- .../MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp | 302 ++++++------- .../MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp | 350 ++++++++-------- .../MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp | 342 ++++++++------- .../MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp | 294 +++++++------ ..._0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp | 332 ++++++++------- .../MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp | 320 +++++++------- ..._0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp | 296 +++++++------ .../MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp | 288 +++++++------ ...MOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp | 274 ++++++------ ..._0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp | 262 ++++++------ ...0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp | 276 ++++++------ ...MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp | 268 ++++++------ ...OOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp | 254 +++++------ ...0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp | 242 ++++++----- .../MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp | 290 +++++++------ .../MBZ__0__SMOOTH-ADV__GDV.slangp | 282 +++++++------ .../MBZ__0__SMOOTH-ADV__LCD-GRID.slangp | 244 ++++++----- .../MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp | 274 ++++++------ .../MBZ__0__SMOOTH-ADV__MEGATRON.slangp | 262 ++++++------ .../MBZ__1__ADV-RESHADE-FX__GDV.slangp | 318 +++++++------- .../MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp | 336 ++++++++------- .../MBZ__1__ADV-SUPER-XBR__GDV.slangp | 326 +++++++------- .../MBZ__1__ADV__EASYMODE.slangp | 216 +++++----- .../MBZ__1__ADV__GDV-MINI-NTSC.slangp | 217 +++++----- .../MBZ__1__ADV__GDV-MINI.slangp | 210 +++++----- .../MBZ__1__ADV__GDV-NTSC.slangp | 251 ++++++----- .../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp | 240 ++++++----- .../MBZ__1__ADV__LCD-GRID.slangp | 204 ++++----- .../MBZ__1__ADV__MEGATRON-NTSC.slangp | 235 ++++++----- .../MBZ__1__ADV__MEGATRON.slangp | 220 +++++----- .../MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp | 378 +++++++++-------- ...Z__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp | 396 +++++++++--------- .../MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp | 386 +++++++++-------- .../MBZ__2__ADV-GLASS__EASYMODE.slangp | 266 ++++++------ .../MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp | 267 ++++++------ .../MBZ__2__ADV-GLASS__GDV-MINI.slangp | 260 ++++++------ .../MBZ__2__ADV-GLASS__GDV-NTSC.slangp | 311 +++++++------- .../MBZ__2__ADV-GLASS__GDV.slangp | 300 ++++++------- .../MBZ__2__ADV-GLASS__LCD-GRID.slangp | 254 +++++------ .../MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp | 293 +++++++------ .../MBZ__2__ADV-GLASS__MEGATRON.slangp | 278 ++++++------ ..._ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp | 342 ++++++++------- ...Z__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp | 332 ++++++++------- .../MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp | 257 ++++++------ .../MBZ__2__ADV-NO-REFLECT__GDV.slangp | 246 ++++++----- ...Z__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp | 235 ++++++----- .../MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp | 220 +++++----- ...ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp | 322 +++++++------- ...__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp | 312 +++++++------- ...__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp | 279 ++++++++++++ .../MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp | 260 ++++++++++++ .../MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp | 237 ++++++----- .../MBZ__2__ADV-SCREEN-ONLY__GDV.slangp | 226 +++++----- ...__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp | 215 +++++----- .../MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp | 200 +++++---- ...Z__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp | 394 ++++++++--------- .../MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp | 362 ++++++++-------- .../MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp | 4 + .../MBZ__3__STD-GLASS__GDV-MINI.slangp | 1 + .../MBZ__3__STD-GLASS__GDV-NTSC.slangp | 6 +- .../MBZ__3__STD-GLASS__GDV.slangp | 1 + .../MBZ__3__STD-GLASS__LCD-GRID.slangp | 1 + .../MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp | 4 + .../MBZ__3__STD-GLASS__MEGATRON.slangp | 1 + .../MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp | 111 ++--- .../MBZ__3__STD-SUPER-XBR__GDV.slangp | 107 ++--- .../MBZ__3__STD__EASYMODE.slangp | 105 ++--- .../MBZ__3__STD__GDV-MINI-NTSC.slangp | 108 ++--- .../MBZ__3__STD__GDV-MINI.slangp | 105 ++--- .../MBZ__3__STD__GDV-NTSC.slangp | 110 ++--- .../Base_CRT_Presets/MBZ__3__STD__GDV.slangp | 105 ++--- .../MBZ__3__STD__LCD-GRID.slangp | 105 ++--- .../MBZ__3__STD__MEGATRON-NTSC.slangp | 108 ++--- .../MBZ__3__STD__MEGATRON.slangp | 105 ++--- ..._STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp | 340 ++++++++------- ...Z__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp | 308 +++++++------- .../MBZ__4__STD-NO-REFLECT__EASYMODE.slangp | 1 + ...Z__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp | 4 + .../MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp | 1 + .../MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp | 4 + .../MBZ__4__STD-NO-REFLECT__GDV.slangp | 1 + .../MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp | 1 + ...Z__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp | 4 + .../MBZ__4__STD-NO-REFLECT__MEGATRON.slangp | 1 + ...STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp | 320 +++++++------- ...__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp | 288 +++++++------ .../MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp | 1 + ...__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp | 4 + .../MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp | 1 + .../MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp | 4 + .../MBZ__4__STD-SCREEN-ONLY__GDV.slangp | 1 + .../MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp | 1 + ...__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp | 4 + .../MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp | 1 + .../MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp | 314 +++++++------- .../MBZ__5__POTATO-SUPER-XBR__GDV.slangp | 282 +++++++------ .../MBZ__5__POTATO__EASYMODE.slangp | 1 + .../MBZ__5__POTATO__GDV-MINI-NTSC.slangp | 4 + .../MBZ__5__POTATO__GDV-MINI.slangp | 1 + .../MBZ__5__POTATO__GDV-NTSC.slangp | 6 +- .../MBZ__5__POTATO__GDV.slangp | 1 + .../MBZ__5__POTATO__LCD-GRID.slangp | 1 + .../MBZ__5__POTATO__MEGATRON-NTSC.slangp | 4 + .../MBZ__5__POTATO__MEGATRON.slangp | 1 + ..._0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp | 290 +++++++------ ..._0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp | 290 +++++++------ ...__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp | 282 +++++++------ .../MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp | 282 +++++++------ .../MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp | 251 ++++++----- .../MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp | 251 ++++++----- .../MBZ__1__ADV__GDV__DREZ-1080p.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-224p.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-240p.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-480p.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp | 240 ++++++----- .../MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp | 240 ++++++----- ..._1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp | 204 ++++----- ..._1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp | 204 ++++----- ..._1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp | 204 ++++----- ...Z__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp | 108 ++--- ...Z__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp | 108 ++--- .../MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp | 105 ++--- .../MBZ__3__STD__GDV-MINI__DREZ-240p.slangp | 105 ++--- .../MBZ__3__STD__GDV-MINI__DREZ-480p.slangp | 105 ++--- .../MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp | 110 ++--- .../MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp | 110 ++--- .../MBZ__3__STD__GDV__DREZ-1080p.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-224p.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-240p.slangp | 105 ++--- ...BZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-480p.slangp | 105 ++--- ...BZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp | 105 ++--- .../MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp | 105 ++--- ..._3__STD__LCD-GRID__DREZ-3DS-400x480.slangp | 105 ++--- ..._3__STD__LCD-GRID__DREZ-NDS-256x384.slangp | 105 ++--- ..._3__STD__LCD-GRID__DREZ-PSP-480x272.slangp | 105 ++--- ...5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp | 4 + ...MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp | 1 + ...MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp | 6 +- .../MBZ__5__POTATO__GDV__DREZ-480p.slangp | 1 + .../Newpixie-Clone__STD__GDV.slangp | 2 +- ...en_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp | 6 + .../Lightgun/Sinden_Border_1__ADV.slangp | 3 + .../Sinden_Border_2__ADV-GLASS.slangp | 5 + .../Sinden_Border_2__ADV-SCREEN-ONLY.slangp | 4 + .../Lightgun/Sinden_Border_3__STD.slangp | 3 + .../Sinden_Border_5__POTATO-GDV-MINI.slangp | 5 + ...den_Border_5__POTATO-GDV-MINI_No-BG.slangp | 6 + bezel/Mega_Bezel/README.md | 141 +++++-- .../lightgun/sinden-border-basic.params | 6 + .../smooth/no-smooth-crt-flavor.params | 2 +- .../smooth/smooth-adv-antialias.params | 2 +- .../smooth/smooth-adv-extra-smooth.params | 2 +- ...ooth-adv-super-smooth-big-scanlines.params | 2 +- .../smooth/smooth-adv-super-smooth.params | 2 +- bezel/Mega_Bezel/shaders/ShaderTodo.txt | 42 +- .../Mega_Bezel/shaders/base/bezel-images.inc | 102 ++++- bezel/Mega_Bezel/shaders/base/cache-info.inc | 29 +- .../shaders/base/combine-passes.inc | 11 + .../shaders/base/common/common-functions.inc | 25 +- .../shaders/base/common/globals.inc | 27 +- .../base/common/params-0-screen-scale.inc | 86 ++-- .../base/common/params-2-reflection-mask.inc | 59 +++ .../base/common/params-2-reflection.inc | 30 +- .../base/common/params-4-image-layers.inc | 10 +- .../Mega_Bezel/shaders/base/linearize-crt.inc | 8 +- .../shaders/base/post-crt-prep-potato.inc | 11 +- .../Mega_Bezel/shaders/base/post-crt-prep.inc | 7 +- bezel/Mega_Bezel/shaders/base/reflection.inc | 19 +- bezel/Mega_Bezel/shaders/base/text.inc | 67 ++- .../dedither-gamma-prep-1-before.slang | 12 +- .../dedither-gamma-prep-2-after.slang | 12 +- .../guest/extras/hsm-g-sharp_resampler.slang | 15 +- .../hsm-crt-dariusg-gdv-mini-potato.slang | 2 + .../hsm-crt-guest-advanced-ntsc-pass1.inc | 30 +- .../hsm-sgenpt-mix-pass2.slang | 0 .../hsm-sgenpt-mix.slang | 0 .../hyllian/sgenpt-mix/sgenpt-mix-pass1.slang | 111 +++++ .../hyllian/sgenpt-mix/sgenpt-mix-pass2.slang | 141 +++++++ .../hyllian/sgenpt-mix/sgenpt-mix-pass3.slang | 156 +++++++ .../hyllian/sgenpt-mix/sgenpt-mix-pass4.slang | 108 +++++ .../hyllian/sgenpt-mix/sgenpt-mix-pass5.slang | 160 +++++++ .../ps1dither/hsm-PS1-Undither-BoxBlur.slang | 11 +- .../shaders/scalefx/hsm-scalefx-pass0.slang | 10 +- .../shaders/scalefx/hsm-scalefx-pass1.slang | 17 +- .../shaders/scalefx/hsm-scalefx-pass2.slang | 11 +- .../shaders/scalefx/hsm-scalefx-pass3.slang | 13 - .../scalefx/hsm-scalefx-pass4-hybrid.slang | 10 - .../shaders/scalefx/hsm-scalefx-pass4.slang | 11 +- .../shaders/scalefx/hsm-scalefx.inc | 32 +- 196 files changed, 15147 insertions(+), 12098 deletions(-) create mode 100644 bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp create mode 100644 bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp create mode 100644 bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp create mode 100644 bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params create mode 100644 bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc rename bezel/Mega_Bezel/shaders/hyllian/{sgenpt-mix => sgenpt-mix-old}/hsm-sgenpt-mix-pass2.slang (100%) rename bezel/Mega_Bezel/shaders/hyllian/{sgenpt-mix => sgenpt-mix-old}/hsm-sgenpt-mix.slang (100%) create mode 100644 bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang create mode 100644 bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang create mode 100644 bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang create mode 100644 bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang create mode 100644 bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp index 3e2d749..01a8dd5 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__EASYMODE.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,206 +43,222 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang +shader32 = ../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang +filter_linear32 = false +srgb_framebuffer32 = true + +shader33 = ../../shaders/easymode/hsm-crt-easymode-blur_vert.slang +filter_linear33 = false +srgb_framebuffer33 = true + +shader34 = ../../shaders/easymode/hsm-crt-easymode-threshold.slang filter_linear34 = false srgb_framebuffer34 = true -shader35 = ../../shaders/easymode/hsm-crt-easymode-blur_vert.slang -filter_linear35 = false -srgb_framebuffer35 = true - -shader36 = ../../shaders/easymode/hsm-crt-easymode-threshold.slang -filter_linear36 = false -srgb_framebuffer36 = true - // Easymode's Shader! -shader37 = ../../shaders/easymode/hsm-crt-easymode-halation.slang -filter_linear37 = true -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "CRTPass" +shader35 = ../../shaders/easymode/hsm-crt-easymode-halation.slang +filter_linear35 = true +scale_type35 = viewport +float_framebuffer35 = true +alias35 = "CRTPass" g_gamma_out = 2.45 -shader38 = ../../shaders/base/post-crt-prep-glass.slang -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "PostCRTPass" +shader36 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input36 = true +scale_type36 = viewport +float_framebuffer36 = true +alias36 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader39 = ../../shaders/base/linearize-crt.slang -mipmap_input39 = true -filter_linear39 = true -scale_type39 = absolute -// scale_x39 = 480 -// scale_y39 = 270 -// scale_x39 = 960 -// scale_y39 = 540 -scale_x39 = 800 -scale_y39 = 600 -float_framebuffer39 = true -alias39 = "BR_MirrorLowResPass" +shader37 = ../../shaders/base/linearize-crt.slang +mipmap_input37 = true +filter_linear37 = true +scale_type37 = absolute +// scale_x37 = 480 +// scale_y37 = 270 +// scale_x37 = 960 +// scale_y37 = 540 +scale_x37 = 800 +scale_y37 = 600 +float_framebuffer37 = true +alias37 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader40 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input40 = true -filter_linear40 = true -float_framebuffer40 = true +shader38 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input38 = true +filter_linear38 = true +float_framebuffer38 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader41 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear41 = true -float_framebuffer41 = true -alias41 = "BR_MirrorBlurredPass" +shader39 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear39 = true +float_framebuffer39 = true +alias39 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader42 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input42 = true -filter_linear42 = true -scale_type42 = absolute -scale_x42 = 128 -scale_y42 = 128 -float_framebuffer42 = true -alias42 = "BR_MirrorReflectionDiffusedPass" +shader40 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input40 = true +filter_linear40 = true +scale_type40 = absolute +scale_x40 = 128 +scale_y40 = 128 +float_framebuffer40 = true +alias40 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader43 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input43 = true -filter_linear43 = true -scale_type43 = absolute -scale_x43 = 12 -scale_y43 = 12 -float_framebuffer43 = true -alias43 = "BR_MirrorFullscreenGlowPass" +shader41 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input41 = true +filter_linear41 = true +scale_type41 = absolute +scale_x41 = 12 +scale_y41 = 12 +float_framebuffer41 = true +alias41 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader44 = ../../shaders/base/reflection-glass.slang -scale_type44 = viewport -srgb_framebuffer44 = true -alias44 = "ReflectionPass" +shader42 = ../../shaders/base/reflection-glass.slang +scale_type42 = viewport +srgb_framebuffer42 = true +alias42 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -373,7 +389,7 @@ g_vignette = "0.0" // Easymode Parameters gamma_out = 2.2 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -382,7 +398,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp index 23599f5..98b8df8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-MINI.slangp @@ -1,4 +1,4 @@ -shaders = 43 +shaders = 41 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,200 +43,216 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" + +shader32 = ../../shaders/base/delinearize.slang +scale_type32 = source +float_framebuffer32 = "true" + +shader33 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" - -shader34 = ../../shaders/base/delinearize.slang -scale_type34 = source -float_framebuffer34 = "true" - -shader35 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang -scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 -filter_linear35 = true -float_framebuffer35 = "true" -alias35 = "CRTPass" +float_framebuffer33 = "true" +alias33 = "CRTPass" g_sat = 0.15 g_gamma_out = 2.45 -shader36 = ../../shaders/base/post-crt-prep-glass.slang -scale_type36 = viewport -float_framebuffer36 = true -alias36 = "PostCRTPass" +shader34 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input34 = true +scale_type34 = viewport +float_framebuffer34 = true +alias34 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader37 = ../../shaders/base/linearize-crt.slang -mipmap_input37 = true -filter_linear37 = true -scale_type37 = absolute -// scale_x37 = 480 -// scale_y37 = 270 -// scale_x37 = 960 -// scale_y37 = 540 -scale_x37 = 800 -scale_y37 = 600 -float_framebuffer37 = true -alias37 = "BR_MirrorLowResPass" +shader35 = ../../shaders/base/linearize-crt.slang +mipmap_input35 = true +filter_linear35 = true +scale_type35 = absolute +// scale_x35 = 480 +// scale_y35 = 270 +// scale_x35 = 960 +// scale_y35 = 540 +scale_x35 = 800 +scale_y35 = 600 +float_framebuffer35 = true +alias35 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader38 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input38 = true -filter_linear38 = true -float_framebuffer38 = true +shader36 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input36 = true +filter_linear36 = true +float_framebuffer36 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader39 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear39 = true -float_framebuffer39 = true -alias39 = "BR_MirrorBlurredPass" +shader37 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear37 = true +float_framebuffer37 = true +alias37 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader40 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input40 = true -filter_linear40 = true -scale_type40 = absolute -scale_x40 = 128 -scale_y40 = 128 -float_framebuffer40 = true -alias40 = "BR_MirrorReflectionDiffusedPass" +shader38 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input38 = true +filter_linear38 = true +scale_type38 = absolute +scale_x38 = 128 +scale_y38 = 128 +float_framebuffer38 = true +alias38 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader41 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -scale_x41 = 12 -scale_y41 = 12 -float_framebuffer41 = true -alias41 = "BR_MirrorFullscreenGlowPass" +shader39 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +scale_x39 = 12 +scale_y39 = 12 +float_framebuffer39 = true +alias39 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader42 = ../../shaders/base/reflection-glass.slang -scale_type42 = viewport -srgb_framebuffer42 = true -alias42 = "ReflectionPass" +shader40 = ../../shaders/base/reflection-glass.slang +scale_type40 = viewport +srgb_framebuffer40 = true +alias40 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -364,7 +380,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -373,7 +389,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp index 86f7b4f..09a62e2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 50 +shaders = 48 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,255 +43,271 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = GlowPass -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = GlowPass +alias38 = BloomPass -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = BloomPass +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-glass.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader44 = ../../shaders/base/linearize-crt.slang -mipmap_input44 = true -filter_linear44 = true -scale_type44 = absolute -// scale_x44 = 480 -// scale_y44 = 270 -// scale_x44 = 960 -// scale_y44 = 540 -scale_x44 = 800 -scale_y44 = 600 -float_framebuffer44 = true -alias44 = "BR_MirrorLowResPass" +shader42 = ../../shaders/base/linearize-crt.slang +mipmap_input42 = true +filter_linear42 = true +scale_type42 = absolute +// scale_x42 = 480 +// scale_y42 = 270 +// scale_x42 = 960 +// scale_y42 = 540 +scale_x42 = 800 +scale_y42 = 600 +float_framebuffer42 = true +alias42 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader45 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input45 = true -filter_linear45 = true -float_framebuffer45 = true +shader43 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input43 = true +filter_linear43 = true +float_framebuffer43 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader46 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear46 = true -float_framebuffer46 = true -alias46 = "BR_MirrorBlurredPass" +shader44 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear44 = true +float_framebuffer44 = true +alias44 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader47 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input47 = true -filter_linear47 = true -scale_type47 = absolute -scale_x47 = 128 -scale_y47 = 128 -float_framebuffer47 = true -alias47 = "BR_MirrorReflectionDiffusedPass" +shader45 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input45 = true +filter_linear45 = true +scale_type45 = absolute +scale_x45 = 128 +scale_y45 = 128 +float_framebuffer45 = true +alias45 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader48 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input48 = true -filter_linear48 = true -scale_type48 = absolute -scale_x48 = 12 -scale_y48 = 12 -float_framebuffer48 = true -alias48 = "BR_MirrorFullscreenGlowPass" +shader46 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input46 = true +filter_linear46 = true +scale_type46 = absolute +scale_x46 = 12 +scale_y46 = 12 +float_framebuffer46 = true +alias46 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader49 = ../../shaders/base/reflection-glass.slang -scale_type49 = viewport -srgb_framebuffer49 = true -alias49 = "ReflectionPass" +shader47 = ../../shaders/base/reflection-glass.slang +scale_type47 = viewport +srgb_framebuffer47 = true +alias47 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -419,7 +435,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -428,7 +444,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -440,3 +456,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp index 1646484..c5db8f8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,234 +43,250 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = GlowPass + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = GlowPass +alias35 = BloomPass -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = BloomPass +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true - -shader39 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear39 = true -scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 -float_framebuffer39 = true -alias39 = "CRTPass" - -shader40 = ../../shaders/base/post-crt-prep-glass.slang -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "PostCRTPass" +alias38 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader41 = ../../shaders/base/linearize-crt.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -// scale_x41 = 480 -// scale_y41 = 270 -// scale_x41 = 960 -// scale_y41 = 540 -scale_x41 = 800 -scale_y41 = 600 -float_framebuffer41 = true -alias41 = "BR_MirrorLowResPass" +shader39 = ../../shaders/base/linearize-crt.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +// scale_x39 = 480 +// scale_y39 = 270 +// scale_x39 = 960 +// scale_y39 = 540 +scale_x39 = 800 +scale_y39 = 600 +float_framebuffer39 = true +alias39 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader42 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input42 = true -filter_linear42 = true -float_framebuffer42 = true +shader40 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input40 = true +filter_linear40 = true +float_framebuffer40 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader43 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear43 = true -float_framebuffer43 = true -alias43 = "BR_MirrorBlurredPass" +shader41 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear41 = true +float_framebuffer41 = true +alias41 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader44 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input44 = true -filter_linear44 = true -scale_type44 = absolute -scale_x44 = 128 -scale_y44 = 128 -float_framebuffer44 = true -alias44 = "BR_MirrorReflectionDiffusedPass" +shader42 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input42 = true +filter_linear42 = true +scale_type42 = absolute +scale_x42 = 128 +scale_y42 = 128 +float_framebuffer42 = true +alias42 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader45 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input45 = true -filter_linear45 = true -scale_type45 = absolute -scale_x45 = 12 -scale_y45 = 12 -float_framebuffer45 = true -alias45 = "BR_MirrorFullscreenGlowPass" +shader43 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input43 = true +filter_linear43 = true +scale_type43 = absolute +scale_x43 = 12 +scale_y43 = 12 +float_framebuffer43 = true +alias43 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader46 = ../../shaders/base/reflection-glass.slang -scale_type46 = viewport -srgb_framebuffer46 = true -alias46 = "ReflectionPass" +shader44 = ../../shaders/base/reflection-glass.slang +scale_type44 = viewport +srgb_framebuffer44 = true +alias44 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -398,7 +414,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -407,7 +423,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp index 397f2bc..4abd6c6 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__LCD-GRID.slangp @@ -1,4 +1,4 @@ -shaders = 43 +shaders = 41 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,195 +43,211 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/base/delinearize.slang -float_framebuffer34 = "true" +shader32 = ../../shaders/base/delinearize.slang +float_framebuffer32 = "true" -shader35 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear35 = "false" -scale_type35 = "viewport" -scale35 = "1.0" -float_framebuffer35 = "true" -alias35 = "CRTPass" +shader33 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear33 = "false" +scale_type33 = "viewport" +scale33 = "1.0" +float_framebuffer33 = "true" +alias33 = "CRTPass" -shader36 = ../../shaders/base/post-crt-prep-glass.slang -scale_type36 = viewport -float_framebuffer36 = true -alias36 = "PostCRTPass" +shader34 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input34 = true +scale_type34 = viewport +float_framebuffer34 = true +alias34 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader37 = ../../shaders/base/linearize-crt.slang -mipmap_input37 = true -filter_linear37 = true -scale_type37 = absolute -// scale_x37 = 480 -// scale_y37 = 270 -// scale_x37 = 960 -// scale_y37 = 540 -scale_x37 = 800 -scale_y37 = 600 -float_framebuffer37 = true -alias37 = "BR_MirrorLowResPass" +shader35 = ../../shaders/base/linearize-crt.slang +mipmap_input35 = true +filter_linear35 = true +scale_type35 = absolute +// scale_x35 = 480 +// scale_y35 = 270 +// scale_x35 = 960 +// scale_y35 = 540 +scale_x35 = 800 +scale_y35 = 600 +float_framebuffer35 = true +alias35 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader38 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input38 = true -filter_linear38 = true -float_framebuffer38 = true +shader36 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input36 = true +filter_linear36 = true +float_framebuffer36 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader39 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear39 = true -float_framebuffer39 = true -alias39 = "BR_MirrorBlurredPass" +shader37 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear37 = true +float_framebuffer37 = true +alias37 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader40 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input40 = true -filter_linear40 = true -scale_type40 = absolute -scale_x40 = 128 -scale_y40 = 128 -float_framebuffer40 = true -alias40 = "BR_MirrorReflectionDiffusedPass" +shader38 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input38 = true +filter_linear38 = true +scale_type38 = absolute +scale_x38 = 128 +scale_y38 = 128 +float_framebuffer38 = true +alias38 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader41 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -scale_x41 = 12 -scale_y41 = 12 -float_framebuffer41 = true -alias41 = "BR_MirrorFullscreenGlowPass" +shader39 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +scale_x39 = 12 +scale_y39 = 12 +float_framebuffer39 = true +alias39 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader42 = ../../shaders/base/reflection-glass.slang -scale_type42 = viewport -srgb_framebuffer42 = true -alias42 = "ReflectionPass" +shader40 = ../../shaders/base/reflection-glass.slang +scale_type40 = viewport +srgb_framebuffer40 = true +alias40 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -359,7 +375,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // SMOOTH-ADV -HSM_DEDITHER_MODE = 1 +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp index 7a7f4c8..552ea39 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,226 +43,242 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 +shader31 = ../../shaders/base/stock.slang +float_framebuffer31 = true +alias31 = "PrePass" -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -float_framebuffer33 = true -alias33 = "PrePass" - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -float_framebuffer34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +float_framebuffer32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -float_framebuffer35 = true -alias35 = "LinearizePass" +shader33 = ../../shaders/guest/hsm-interlace.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader36 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear34 = "false" +scale_type34 = "source" +scale34 = "1.0" +wrap_mode34 = "clamp_to_border" +mipmap_input34 = "false" +alias34 = "SourceSDR" +float_framebuffer34 = "true" + +shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear35 = "false" +scale_type35 = "source" +scale35 = "1.0" +wrap_mode35 = "clamp_to_border" +mipmap_input35 = "false" +alias35 = "SourceHDR" +float_framebuffer35 = "true" + +shader36 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear36 = "false" -scale_type36 = "source" -scale36 = "1.0" wrap_mode36 = "clamp_to_border" mipmap_input36 = "false" -alias36 = "SourceSDR" +scale_type36 = "viewport" float_framebuffer36 = "true" +alias36 = "CRTPass" -shader37 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear37 = "false" -scale_type37 = "source" -scale37 = "1.0" -wrap_mode37 = "clamp_to_border" -mipmap_input37 = "false" -alias37 = "SourceHDR" -float_framebuffer37 = "true" - -shader38 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear38 = "false" -wrap_mode38 = "clamp_to_border" -mipmap_input38 = "false" -scale_type38 = "viewport" -float_framebuffer38 = "true" -alias38 = "CRTPass" - -shader39 = ../../shaders/base/post-crt-prep-glass.slang -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "PostCRTPass" +shader37 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader40 = ../../shaders/base/linearize-crt-hdr.slang -mipmap_input40 = true -filter_linear40 = true -scale_type40 = absolute -// scale_x40 = 480 -// scale_y40 = 270 -// scale_x40 = 960 -// scale_y40 = 540 -scale_x40 = 800 -scale_y40 = 600 -float_framebuffer40 = true -alias40 = "BR_MirrorLowResPass" +shader38 = ../../shaders/base/linearize-crt-hdr.slang +mipmap_input38 = true +filter_linear38 = true +scale_type38 = absolute +// scale_x38 = 480 +// scale_y38 = 270 +// scale_x38 = 960 +// scale_y38 = 540 +scale_x38 = 800 +scale_y38 = 600 +float_framebuffer38 = true +alias38 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader41 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input41 = true -filter_linear41 = true -float_framebuffer41 = true +shader39 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input39 = true +filter_linear39 = true +float_framebuffer39 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader42 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear42 = true -float_framebuffer42 = true -alias42 = "BR_MirrorBlurredPass" +shader40 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear40 = true +float_framebuffer40 = true +alias40 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader43 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input43 = true -filter_linear43 = true -scale_type43 = absolute -scale_x43 = 128 -scale_y43 = 128 -float_framebuffer43 = true -alias43 = "BR_MirrorReflectionDiffusedPass" +shader41 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input41 = true +filter_linear41 = true +scale_type41 = absolute +scale_x41 = 128 +scale_y41 = 128 +float_framebuffer41 = true +alias41 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader44 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input44 = true -filter_linear44 = true -scale_type44 = absolute -scale_x44 = 12 -scale_y44 = 12 -float_framebuffer44 = true -alias44 = "BR_MirrorFullscreenGlowPass" +shader42 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input42 = true +filter_linear42 = true +scale_type42 = absolute +scale_x42 = 12 +scale_y42 = 12 +float_framebuffer42 = true +alias42 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader45 = ../../shaders/base/reflection-glass-hdr.slang -scale_type45 = viewport -alias45 = "ReflectionPass" +shader43 = ../../shaders/base/reflection-glass-hdr.slang +scale_type43 = viewport +alias43 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- -shader46 = ../../shaders/base/output-hdr.slang -scale_type46 = viewport -alias46 = "OutputPass" +shader44 = ../../shaders/base/output-hdr.slang +scale_type44 = viewport +alias44 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -398,7 +414,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -407,7 +423,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -419,3 +435,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp index f92c095..5d2611d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-GLASS__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,214 +43,230 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +float_framebuffer29 = true +alias29 = "PrePass" + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -float_framebuffer31 = true -alias31 = "PrePass" - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -float_framebuffer32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +float_framebuffer30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader32 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear32 = "false" +scale_type32 = "source" +scale32 = "1.0" +wrap_mode32 = "clamp_to_border" +mipmap_input32 = "false" +alias32 = "SourceSDR" +float_framebuffer32 = "true" + +shader33 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear33 = "false" +scale_type33 = "source" +scale33 = "1.0" +wrap_mode33 = "clamp_to_border" +mipmap_input33 = "false" +alias33 = "SourceHDR" +float_framebuffer33 = "true" + +shader34 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear34 = "false" -scale_type34 = "source" -scale34 = "1.0" wrap_mode34 = "clamp_to_border" mipmap_input34 = "false" -alias34 = "SourceSDR" +scale_type34 = "viewport" float_framebuffer34 = "true" +alias34 = "CRTPass" -shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear35 = "false" -scale_type35 = "source" -scale35 = "1.0" -wrap_mode35 = "clamp_to_border" -mipmap_input35 = "false" -alias35 = "SourceHDR" -float_framebuffer35 = "true" - -shader36 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear36 = "false" -wrap_mode36 = "clamp_to_border" -mipmap_input36 = "false" -scale_type36 = "viewport" -float_framebuffer36 = "true" -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-glass.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +shader35 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input35 = true +scale_type35 = viewport +float_framebuffer35 = true +alias35 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader38 = ../../shaders/base/linearize-crt-hdr.slang -mipmap_input38 = true -filter_linear38 = true -scale_type38 = absolute -// scale_x38 = 480 -// scale_y38 = 270 -// scale_x38 = 960 -// scale_y38 = 540 -scale_x38 = 800 -scale_y38 = 600 -float_framebuffer38 = true -alias38 = "BR_MirrorLowResPass" +shader36 = ../../shaders/base/linearize-crt-hdr.slang +mipmap_input36 = true +filter_linear36 = true +scale_type36 = absolute +// scale_x36 = 480 +// scale_y36 = 270 +// scale_x36 = 960 +// scale_y36 = 540 +scale_x36 = 800 +scale_y36 = 600 +float_framebuffer36 = true +alias36 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader39 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input39 = true -filter_linear39 = true -float_framebuffer39 = true +shader37 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input37 = true +filter_linear37 = true +float_framebuffer37 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader40 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear40 = true -float_framebuffer40 = true -alias40 = "BR_MirrorBlurredPass" +shader38 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear38 = true +float_framebuffer38 = true +alias38 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader41 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -scale_x41 = 128 -scale_y41 = 128 -float_framebuffer41 = true -alias41 = "BR_MirrorReflectionDiffusedPass" +shader39 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +scale_x39 = 128 +scale_y39 = 128 +float_framebuffer39 = true +alias39 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader42 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input42 = true -filter_linear42 = true -scale_type42 = absolute -scale_x42 = 12 -scale_y42 = 12 -float_framebuffer42 = true -alias42 = "BR_MirrorFullscreenGlowPass" +shader40 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input40 = true +filter_linear40 = true +scale_type40 = absolute +scale_x40 = 12 +scale_y40 = 12 +float_framebuffer40 = true +alias40 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader43 = ../../shaders/base/reflection-glass-hdr.slang -scale_type43 = viewport -alias43 = "ReflectionPass" +shader41 = ../../shaders/base/reflection-glass-hdr.slang +scale_type41 = viewport +alias41 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/output-hdr.slang -scale_type44 = viewport -alias44 = "OutputPass" +shader42 = ../../shaders/base/output-hdr.slang +scale_type42 = viewport +alias42 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -386,7 +402,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -395,7 +411,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp index 32b3056..ff24b65 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,215 +43,231 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = "GlowPass" -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = "GlowPass" +alias38 = "BloomPass" -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = "BloomPass" +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader44 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear44 = true -scale_type44 = viewport -float_framebuffer44 = true -alias44 = "BR_LayersUnderCRTPass" +shader42 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear42 = true +scale_type42 = viewport +float_framebuffer42 = true +alias42 = "BR_LayersUnderCRTPass" -shader45 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear45 = true -scale_type45 = viewport -float_framebuffer45 = true -alias45 = "BR_LayersOverCRTPass" +shader43 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear43 = true +scale_type43 = viewport +float_framebuffer43 = true +alias43 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader46 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type46 = viewport -alias46 = "CombinePass" +shader44 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type44 = viewport +alias44 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -343,7 +359,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -352,7 +368,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -364,3 +380,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp index b7e00bf..82982b0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 44 +shaders = 42 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,194 +43,210 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = "GlowPass" + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "GlowPass" +alias35 = "BloomPass" -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = "BloomPass" +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true - -shader39 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear39 = true -scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 -float_framebuffer39 = true -alias39 = "CRTPass" - -shader40 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "PostCRTPass" +alias38 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader41 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear41 = true -scale_type41 = viewport -float_framebuffer41 = true -alias41 = "BR_LayersUnderCRTPass" +shader39 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear39 = true +scale_type39 = viewport +float_framebuffer39 = true +alias39 = "BR_LayersUnderCRTPass" -shader42 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersOverCRTPass" +shader40 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear40 = true +scale_type40 = viewport +float_framebuffer40 = true +alias40 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader43 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type43 = viewport -alias43 = "CombinePass" +shader41 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type41 = viewport +alias41 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -322,7 +338,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -331,7 +347,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp index 31ff4b7..47ebee2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 43 +shaders = 41 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,182 +43,198 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 +shader31 = ../../shaders/base/stock.slang +float_framebuffer31 = true +alias31 = "PrePass" -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -float_framebuffer33 = true -alias33 = "PrePass" - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -float_framebuffer34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +float_framebuffer32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -float_framebuffer35 = true -alias35 = "LinearizePass" +shader33 = ../../shaders/guest/hsm-interlace.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader36 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear34 = "false" +scale_type34 = "source" +scale34 = "1.0" +wrap_mode34 = "clamp_to_border" +mipmap_input34 = "false" +alias34 = "SourceSDR" +float_framebuffer34 = "true" + +shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear35 = "false" +scale_type35 = "source" +scale35 = "1.0" +wrap_mode35 = "clamp_to_border" +mipmap_input35 = "false" +alias35 = "SourceHDR" +float_framebuffer35 = "true" + +shader36 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear36 = "false" -scale_type36 = "source" -scale36 = "1.0" wrap_mode36 = "clamp_to_border" mipmap_input36 = "false" -alias36 = "SourceSDR" +scale_type36 = "viewport" float_framebuffer36 = "true" +alias36 = "CRTPass" -shader37 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear37 = "false" -scale_type37 = "source" -scale37 = "1.0" -wrap_mode37 = "clamp_to_border" -mipmap_input37 = "false" -alias37 = "SourceHDR" -float_framebuffer37 = "true" - -shader38 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear38 = "false" -wrap_mode38 = "clamp_to_border" -mipmap_input38 = "false" -scale_type38 = "viewport" -float_framebuffer38 = "true" -alias38 = "CRTPass" - -shader39 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "PostCRTPass" +shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader40 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear40 = true -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "BR_LayersUnderCRTPass" +shader38 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear38 = true +scale_type38 = viewport +float_framebuffer38 = true +alias38 = "BR_LayersUnderCRTPass" -shader41 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear41 = true -scale_type41 = viewport -float_framebuffer41 = true -alias41 = "BR_LayersOverCRTPass" +shader39 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear39 = true +scale_type39 = viewport +float_framebuffer39 = true +alias39 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader42 = ../../shaders/base/combine-passes-no-reflect-hdr.slang -scale_type42 = viewport -alias42 = "CombinePass" +shader40 = ../../shaders/base/combine-passes-no-reflect-hdr.slang +scale_type40 = viewport +alias40 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -318,7 +334,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -327,7 +343,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -339,3 +355,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp index 5c51c74..1783194 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-NO-REFLECT__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,170 +43,186 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +float_framebuffer29 = true +alias29 = "PrePass" + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -float_framebuffer31 = true -alias31 = "PrePass" - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -float_framebuffer32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +float_framebuffer30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader32 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear32 = "false" +scale_type32 = "source" +scale32 = "1.0" +wrap_mode32 = "clamp_to_border" +mipmap_input32 = "false" +alias32 = "SourceSDR" +float_framebuffer32 = "true" + +shader33 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear33 = "false" +scale_type33 = "source" +scale33 = "1.0" +wrap_mode33 = "clamp_to_border" +mipmap_input33 = "false" +alias33 = "SourceHDR" +float_framebuffer33 = "true" + +shader34 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear34 = "false" -scale_type34 = "source" -scale34 = "1.0" wrap_mode34 = "clamp_to_border" mipmap_input34 = "false" -alias34 = "SourceSDR" +scale_type34 = "viewport" float_framebuffer34 = "true" +alias34 = "CRTPass" -shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear35 = "false" -scale_type35 = "source" -scale35 = "1.0" -wrap_mode35 = "clamp_to_border" -mipmap_input35 = "false" -alias35 = "SourceHDR" -float_framebuffer35 = "true" - -shader36 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear36 = "false" -wrap_mode36 = "clamp_to_border" -mipmap_input36 = "false" -scale_type36 = "viewport" -float_framebuffer36 = "true" -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +shader35 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input35 = true +scale_type35 = viewport +float_framebuffer35 = true +alias35 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" +shader36 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear36 = true +scale_type36 = viewport +float_framebuffer36 = true +alias36 = "BR_LayersUnderCRTPass" -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" +shader37 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes-no-reflect-hdr.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes-no-reflect-hdr.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -306,7 +322,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -315,7 +331,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp index b1ff47c..b8e7b5d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,201 +43,217 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = "GlowPass" -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = "GlowPass" +alias38 = "BloomPass" -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = "BloomPass" +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/output-sdr.slang -scale_type44 = viewport -alias44 = "OutputPass" +shader42 = ../../shaders/base/output-sdr.slang +scale_type42 = viewport +alias42 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -329,7 +345,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -338,7 +354,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -350,3 +366,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp index 78faa3d..57ea745 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 42 +shaders = 40 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,180 +43,196 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = "GlowPass" + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "GlowPass" +alias35 = "BloomPass" -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = "BloomPass" +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true - -shader39 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear39 = true -scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 -float_framebuffer39 = true -alias39 = "CRTPass" - -shader40 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "PostCRTPass" +alias38 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader41 = ../../shaders/base/output-sdr.slang -scale_type41 = viewport -alias41 = "OutputPass" +shader39 = ../../shaders/base/output-sdr.slang +scale_type39 = viewport +alias39 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -308,7 +324,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -317,7 +333,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp index b7b73b4..1f9a176 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,168 +43,184 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 +shader31 = ../../shaders/base/stock.slang +float_framebuffer31 = true +alias31 = "PrePass" -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -float_framebuffer33 = true -alias33 = "PrePass" - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -float_framebuffer34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +float_framebuffer32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -float_framebuffer35 = true -alias35 = "LinearizePass" +shader33 = ../../shaders/guest/hsm-interlace.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader36 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear34 = "false" +scale_type34 = "source" +scale34 = "1.0" +wrap_mode34 = "clamp_to_border" +mipmap_input34 = "false" +alias34 = "SourceSDR" +float_framebuffer34 = "true" + +shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear35 = "false" +scale_type35 = "source" +scale35 = "1.0" +wrap_mode35 = "clamp_to_border" +mipmap_input35 = "false" +alias35 = "SourceHDR" +float_framebuffer35 = "true" + +shader36 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear36 = "false" -scale_type36 = "source" -scale36 = "1.0" wrap_mode36 = "clamp_to_border" mipmap_input36 = "false" -alias36 = "SourceSDR" +scale_type36 = "viewport" float_framebuffer36 = "true" +alias36 = "CRTPass" -shader37 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear37 = "false" -scale_type37 = "source" -scale37 = "1.0" -wrap_mode37 = "clamp_to_border" -mipmap_input37 = "false" -alias37 = "SourceHDR" -float_framebuffer37 = "true" - -shader38 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear38 = "false" -wrap_mode38 = "clamp_to_border" -mipmap_input38 = "false" -scale_type38 = "viewport" -float_framebuffer38 = "true" -alias38 = "CRTPass" - -shader39 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "PostCRTPass" +shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/output-hdr.slang -scale_type40 = viewport -alias40 = "OutputPass" +shader38 = ../../shaders/base/output-hdr.slang +scale_type38 = viewport +alias38 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -304,7 +320,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -313,7 +329,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -325,3 +341,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp index 0959c20..9c77afe 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 39 +shaders = 37 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,156 +43,172 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +float_framebuffer29 = true +alias29 = "PrePass" + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -float_framebuffer31 = true -alias31 = "PrePass" - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -float_framebuffer32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +float_framebuffer30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader32 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear32 = "false" +scale_type32 = "source" +scale32 = "1.0" +wrap_mode32 = "clamp_to_border" +mipmap_input32 = "false" +alias32 = "SourceSDR" +float_framebuffer32 = "true" + +shader33 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear33 = "false" +scale_type33 = "source" +scale33 = "1.0" +wrap_mode33 = "clamp_to_border" +mipmap_input33 = "false" +alias33 = "SourceHDR" +float_framebuffer33 = "true" + +shader34 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear34 = "false" -scale_type34 = "source" -scale34 = "1.0" wrap_mode34 = "clamp_to_border" mipmap_input34 = "false" -alias34 = "SourceSDR" +scale_type34 = "viewport" float_framebuffer34 = "true" +alias34 = "CRTPass" -shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear35 = "false" -scale_type35 = "source" -scale35 = "1.0" -wrap_mode35 = "clamp_to_border" -mipmap_input35 = "false" -alias35 = "SourceHDR" -float_framebuffer35 = "true" - -shader36 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear36 = "false" -wrap_mode36 = "clamp_to_border" -mipmap_input36 = "false" -scale_type36 = "viewport" -float_framebuffer36 = "true" -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +shader35 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input35 = true +scale_type35 = viewport +float_framebuffer35 = true +alias35 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader38 = ../../shaders/base/output-hdr.slang -scale_type38 = viewport -alias38 = "OutputPass" +shader36 = ../../shaders/base/output-hdr.slang +scale_type36 = viewport +alias36 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -292,7 +308,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -301,7 +317,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp index c00aa1d..2d03572 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 53 +shaders = 51 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,196 +43,226 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = GlowPass -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = GlowPass +alias38 = BloomPass -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = BloomPass +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true +alias41 = "PostCRTPass" -shader42 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader42 = ../../shaders/base/bezel-images-under-crt.slang filter_linear42 = true scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 float_framebuffer42 = true -alias42 = "CRTPass" +alias42 = "BR_LayersUnderCRTPass" -shader43 = ../../shaders/base/post-crt-prep-image-layers.slang +shader43 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear43 = true scale_type43 = viewport float_framebuffer43 = true -alias43 = "PostCRTPass" +alias43 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -292,24 +322,10 @@ shader49 = ../../shaders/base/reflection.slang scale_type49 = viewport alias49 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader50 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear50 = true -scale_type50 = viewport -float_framebuffer50 = true -alias50 = "BR_LayersUnderCRTPass" - -shader51 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear51 = true -scale_type51 = viewport -float_framebuffer51 = true -alias51 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader52 = ../../shaders/base/combine-passes.slang -scale_type52 = viewport -alias52 = "CombinePass" +shader50 = ../../shaders/base/combine-passes.slang +scale_type50 = viewport +alias50 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -401,7 +417,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -410,7 +426,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -422,3 +438,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp index 09d7798..cc88d57 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 50 +shaders = 48 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,175 +43,205 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = GlowPass + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = GlowPass +alias35 = BloomPass -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = BloomPass +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true +alias38 = "PostCRTPass" -shader39 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader39 = ../../shaders/base/bezel-images-under-crt.slang filter_linear39 = true scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 float_framebuffer39 = true -alias39 = "CRTPass" +alias39 = "BR_LayersUnderCRTPass" -shader40 = ../../shaders/base/post-crt-prep-image-layers.slang +shader40 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear40 = true scale_type40 = viewport float_framebuffer40 = true -alias40 = "PostCRTPass" +alias40 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -271,24 +301,10 @@ shader46 = ../../shaders/base/reflection.slang scale_type46 = viewport alias46 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader47 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear47 = true -scale_type47 = viewport -float_framebuffer47 = true -alias47 = "BR_LayersUnderCRTPass" - -shader48 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear48 = true -scale_type48 = viewport -float_framebuffer48 = true -alias48 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader49 = ../../shaders/base/combine-passes.slang -scale_type49 = viewport -alias49 = "CombinePass" +shader47 = ../../shaders/base/combine-passes.slang +scale_type47 = viewport +alias47 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -380,7 +396,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -389,7 +405,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp index 8a718c8..1403d32 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__LCD-GRID.slangp @@ -1,4 +1,4 @@ -shaders = 46 +shaders = 44 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,136 +43,166 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/base/delinearize.slang -float_framebuffer34 = "true" +shader32 = ../../shaders/base/delinearize.slang +float_framebuffer32 = "true" -shader35 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear35 = "false" -scale_type35 = "viewport" -scale35 = "1.0" -float_framebuffer35 = "true" -alias35 = "CRTPass" +shader33 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear33 = "false" +scale_type33 = "viewport" +scale33 = "1.0" +float_framebuffer33 = "true" +alias33 = "CRTPass" -shader36 = ../../shaders/base/post-crt-prep-image-layers.slang +shader34 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input34 = true +scale_type34 = viewport +float_framebuffer34 = true +alias34 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader35 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear35 = true +scale_type35 = viewport +float_framebuffer35 = true +alias35 = "BR_LayersUnderCRTPass" + +shader36 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear36 = true scale_type36 = viewport float_framebuffer36 = true -alias36 = "PostCRTPass" +alias36 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -232,24 +262,10 @@ shader42 = ../../shaders/base/reflection.slang scale_type42 = viewport alias42 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader43 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersUnderCRTPass" - -shader44 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear44 = true -scale_type44 = viewport -float_framebuffer44 = true -alias44 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader45 = ../../shaders/base/combine-passes.slang -scale_type45 = viewport -alias45 = "CombinePass" +shader43 = ../../shaders/base/combine-passes.slang +scale_type43 = viewport +alias43 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -341,7 +357,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 1 +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp index 82f71c5..8505394 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 49 +shaders = 47 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,163 +43,193 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 +scale21 = 3 -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true scale_type23 = source -scale23 = 3 +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 +shader31 = ../../shaders/base/stock.slang +float_framebuffer31 = true +alias31 = "PrePass" -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -float_framebuffer33 = true -alias33 = "PrePass" - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -float_framebuffer34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +float_framebuffer32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -float_framebuffer35 = true -alias35 = "LinearizePass" +shader33 = ../../shaders/guest/hsm-interlace.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader36 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear34 = "false" +scale_type34 = "source" +scale34 = "1.0" +wrap_mode34 = "clamp_to_border" +mipmap_input34 = "false" +alias34 = "SourceSDR" +float_framebuffer34 = "true" + +shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear35 = "false" +scale_type35 = "source" +scale35 = "1.0" +wrap_mode35 = "clamp_to_border" +mipmap_input35 = "false" +alias35 = "SourceHDR" +float_framebuffer35 = "true" + +shader36 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear36 = "false" -scale_type36 = "source" -scale36 = "1.0" wrap_mode36 = "clamp_to_border" mipmap_input36 = "false" -alias36 = "SourceSDR" +scale_type36 = "viewport" float_framebuffer36 = "true" +alias36 = "CRTPass" -shader37 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear37 = "false" -scale_type37 = "source" -scale37 = "1.0" -wrap_mode37 = "clamp_to_border" -mipmap_input37 = "false" -alias37 = "SourceHDR" -float_framebuffer37 = "true" +shader37 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "PostCRTPass" -shader38 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear38 = "false" -wrap_mode38 = "clamp_to_border" -mipmap_input38 = "false" -scale_type38 = "viewport" -float_framebuffer38 = "true" -alias38 = "CRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader39 = ../../shaders/base/post-crt-prep-image-layers.slang +shader38 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear38 = true +scale_type38 = viewport +float_framebuffer38 = true +alias38 = "BR_LayersUnderCRTPass" + +shader39 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear39 = true scale_type39 = viewport float_framebuffer39 = true -alias39 = "PostCRTPass" +alias39 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -259,24 +289,10 @@ shader45 = ../../shaders/base/reflection.slang scale_type45 = viewport alias45 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader46 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear46 = true -scale_type46 = viewport -float_framebuffer46 = true -alias46 = "BR_LayersUnderCRTPass" - -shader47 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear47 = true -scale_type47 = viewport -float_framebuffer47 = true -alias47 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader48 = ../../shaders/base/combine-passes-hdr.slang -scale_type48 = viewport -alias48 = "CombinePass" +shader46 = ../../shaders/base/combine-passes-hdr.slang +scale_type46 = viewport +alias46 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -376,7 +392,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -385,7 +401,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -397,3 +413,5 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp index d8f8036..5f39b1b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__0__SMOOTH-ADV__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,151 +43,181 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = refpass +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = refpass + +shader17 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear17 = false +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true +alias17 = scalefx_pass0 + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer12 = true + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear19 = false scale_type19 = source scale19 = 1.0 -float_framebuffer19 = true -alias19 = scalefx_pass0 -shader20 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader20 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer12 = true -shader21 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear21 = false scale_type21 = source -scale21 = 1.0 - -shader22 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear22 = false -scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear23 = false -scale_type23 = source -scale23 = 3 +scale21 = 3 // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +float_framebuffer29 = true +alias29 = "PrePass" + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -float_framebuffer31 = true -alias31 = "PrePass" - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -float_framebuffer32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +float_framebuffer30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader34 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader32 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear32 = "false" +scale_type32 = "source" +scale32 = "1.0" +wrap_mode32 = "clamp_to_border" +mipmap_input32 = "false" +alias32 = "SourceSDR" +float_framebuffer32 = "true" + +shader33 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear33 = "false" +scale_type33 = "source" +scale33 = "1.0" +wrap_mode33 = "clamp_to_border" +mipmap_input33 = "false" +alias33 = "SourceHDR" +float_framebuffer33 = "true" + +shader34 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear34 = "false" -scale_type34 = "source" -scale34 = "1.0" wrap_mode34 = "clamp_to_border" mipmap_input34 = "false" -alias34 = "SourceSDR" +scale_type34 = "viewport" float_framebuffer34 = "true" +alias34 = "CRTPass" -shader35 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear35 = "false" -scale_type35 = "source" -scale35 = "1.0" -wrap_mode35 = "clamp_to_border" -mipmap_input35 = "false" -alias35 = "SourceHDR" -float_framebuffer35 = "true" +shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input35 = true +scale_type35 = viewport +float_framebuffer35 = true +alias35 = "PostCRTPass" -shader36 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear36 = "false" -wrap_mode36 = "clamp_to_border" -mipmap_input36 = "false" -scale_type36 = "viewport" -float_framebuffer36 = "true" -alias36 = "CRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader37 = ../../shaders/base/post-crt-prep-image-layers.slang +shader36 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear36 = true +scale_type36 = viewport +float_framebuffer36 = true +alias36 = "BR_LayersUnderCRTPass" + +shader37 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear37 = true scale_type37 = viewport float_framebuffer37 = true -alias37 = "PostCRTPass" +alias37 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -247,24 +277,10 @@ shader43 = ../../shaders/base/reflection.slang scale_type43 = viewport alias43 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader44 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear44 = true -scale_type44 = viewport -float_framebuffer44 = true -alias44 = "BR_LayersUnderCRTPass" - -shader45 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear45 = true -scale_type45 = viewport -float_framebuffer45 = true -alias45 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader46 = ../../shaders/base/combine-passes-hdr.slang -scale_type46 = viewport -alias46 = "CombinePass" +shader44 = ../../shaders/base/combine-passes-hdr.slang +scale_type44 = viewport +alias44 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -364,7 +380,7 @@ HSM_CRT_CURVATURE_SCALE = "0.000000" HSM_GLOBAL_GRAPHICS_BRIGHTNESS = "100.000000" HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -373,7 +389,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp index 4ee0b9b..cbb61ce 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-RESHADE-FX__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 53 +shaders = 51 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,217 +43,247 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = "../../../../reshade/shaders/bloom/BloomPass0.slang" +shader18 = "../../../../reshade/shaders/bloom/BloomPass0.slang" +filter_linear18 = "true" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "SamplerBloom1" +srgb_framebuffer18 = "false" +scale_type_x18 = "source" +scale_x18 = "4.000000" +scale_type_y18 = "source" +scale_y18 = "4.000000" +float_framebuffer18 = "true" + +shader19 = "../../../../reshade/shaders/bloom/BloomPass1.slang" +filter_linear19 = "true" +wrap_mode19 = "clamp_to_border" +mipmap_input19 = "false" +alias19 = "SamplerBloom2" +srgb_framebuffer19 = "false" +float_framebuffer19 = "true" + +shader20 = "../../../../reshade/shaders/bloom/BloomPass2.slang" filter_linear20 = "true" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" -alias20 = "SamplerBloom1" -srgb_framebuffer20 = "false" -scale_type_x20 = "source" -scale_x20 = "4.000000" -scale_type_y20 = "source" -scale_y20 = "4.000000" +alias20 = "SamplerBloom3" float_framebuffer20 = "true" -shader21 = "../../../../reshade/shaders/bloom/BloomPass1.slang" +shader21 = "../../../../reshade/shaders/bloom/BloomPass3.slang" filter_linear21 = "true" wrap_mode21 = "clamp_to_border" mipmap_input21 = "false" -alias21 = "SamplerBloom2" -srgb_framebuffer21 = "false" +alias21 = "SamplerBloom4" float_framebuffer21 = "true" -shader22 = "../../../../reshade/shaders/bloom/BloomPass2.slang" +shader22 = "../../../../reshade/shaders/bloom/BloomPass4.slang" filter_linear22 = "true" wrap_mode22 = "clamp_to_border" mipmap_input22 = "false" -alias22 = "SamplerBloom3" +alias22 = "SamplerBloom5" float_framebuffer22 = "true" -shader23 = "../../../../reshade/shaders/bloom/BloomPass3.slang" +shader23 = "../../../../reshade/shaders/bloom/LensFlarePass0.slang" filter_linear23 = "true" wrap_mode23 = "clamp_to_border" mipmap_input23 = "false" -alias23 = "SamplerBloom4" +alias23 = "LensFlare1" float_framebuffer23 = "true" -shader24 = "../../../../reshade/shaders/bloom/BloomPass4.slang" +shader24 = "../../../../reshade/shaders/bloom/LensFlarePass1.slang" filter_linear24 = "true" wrap_mode24 = "clamp_to_border" mipmap_input24 = "false" -alias24 = "SamplerBloom5" +alias24 = "LensFlare2" float_framebuffer24 = "true" -shader25 = "../../../../reshade/shaders/bloom/LensFlarePass0.slang" +shader25 = "../../../../reshade/shaders/bloom/LensFlarePass2.slang" filter_linear25 = "true" wrap_mode25 = "clamp_to_border" mipmap_input25 = "false" -alias25 = "LensFlare1" +alias25 = "LensFlare3" float_framebuffer25 = "true" -shader26 = "../../../../reshade/shaders/bloom/LensFlarePass1.slang" +shader26 = "../../../../reshade/shaders/bloom/LightingCombine.slang" filter_linear26 = "true" wrap_mode26 = "clamp_to_border" mipmap_input26 = "false" -alias26 = "LensFlare2" +alias26 = "" +scale_type_x26 = "source" +scale_x26 = "0.250000" +scale_type_y26 = "source" +scale_y26 = "0.250000" float_framebuffer26 = "true" -shader27 = "../../../../reshade/shaders/bloom/LensFlarePass2.slang" -filter_linear27 = "true" -wrap_mode27 = "clamp_to_border" -mipmap_input27 = "false" -alias27 = "LensFlare3" -float_framebuffer27 = "true" +shader27 = ../../shaders/base/stock.slang +alias27 = "PreCRTPass" -shader28 = "../../../../reshade/shaders/bloom/LightingCombine.slang" -filter_linear28 = "true" -wrap_mode28 = "clamp_to_border" -mipmap_input28 = "false" -alias28 = "" -scale_type_x28 = "source" -scale_x28 = "0.250000" -scale_type_y28 = "source" -scale_y28 = "0.250000" -float_framebuffer28 = "true" +shader28 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +alias28 = "AfterglowPass" -shader29 = ../../shaders/base/stock.slang -alias29 = "PreCRTPass" - -shader30 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear30 = true -scale_type30 = source -scale30 = 1.0 -alias30 = "AfterglowPass" - -shader31 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear31 = true -scale_type31 = source -mipmap_input31 = true -scale31 = 1.0 +shader29 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear29 = true +scale_type29 = source +mipmap_input29 = true +scale29 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader32 = ../../shaders/dogway/hsm-grade.slang -filter_linear32 = false -scale_type32 = source -scale32 = 1.0 -alias32 = "ColorCorrectPass" +shader30 = ../../shaders/dogway/hsm-grade.slang +filter_linear30 = false +scale_type30 = source +scale30 = 1.0 +alias30 = "ColorCorrectPass" -shader33 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear31 = true +scale_type31 = source +scale_x31 = 1.0 +scale_y31 = 1.0 + +shader32 = ../../shaders/base/stock.slang +filter_linear32 = true +scale_type32 = source +scale_x32 = 1.0 +scale_y32 = 1.0 +alias32 = "PrePass" +mipmap_input32 = true + +shader33 = ../../shaders/guest/hsm-avg-lum.slang filter_linear33 = true scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 - -shader34 = ../../shaders/base/stock.slang -filter_linear34 = true -scale_type34 = source -scale_x34 = 1.0 -scale_y34 = 1.0 -alias34 = "PrePass" -mipmap_input34 = true - -shader35 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -mipmap_input35 = true -alias35 = "AvgLumPass" +scale33 = 1.0 +mipmap_input33 = true +alias33 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader36 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear36 = true -scale_type36 = source -scale36 = 1.0 -float_framebuffer36 = true -alias36 = "LinearizePass" +shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear34 = true +scale_type34 = source +scale34 = 1.0 +float_framebuffer34 = true +alias34 = "LinearizePass" -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear35 = true +scale_type_x35 = absolute +scale_x35 = 800.0 +scale_type_y35 = source +scale_y35 = 1.0 +float_framebuffer35 = true + +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear36 = true +scale_type_x36 = absolute +scale_x36 = 800.0 +scale_type_y36 = absolute +scale_y36 = 600.0 +float_framebuffer36 = true +alias36 = GlowPass + +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 800.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 600.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true -scale_type_x38 = absolute -scale_x38 = 800.0 -scale_type_y38 = absolute -scale_y38 = 600.0 +scale_type_x38 = source +scale_x38 = 1.0 +scale_type_y38 = source +scale_y38 = 1.0 float_framebuffer38 = true -alias38 = GlowPass +alias38 = BloomPass -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 800.0 -scale_type_y39 = absolute -scale_y39 = 600.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = source +scale_type40 = viewport scale_x40 = 1.0 -scale_type_y40 = source scale_y40 = 1.0 float_framebuffer40 = true -alias40 = BloomPass +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true +alias41 = "PostCRTPass" -shader42 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader42 = ../../shaders/base/bezel-images-under-crt.slang filter_linear42 = true scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 float_framebuffer42 = true -alias42 = "CRTPass" +alias42 = "BR_LayersUnderCRTPass" -shader43 = ../../shaders/base/post-crt-prep-image-layers.slang +shader43 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear43 = true scale_type43 = viewport float_framebuffer43 = true -alias43 = "PostCRTPass" +alias43 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -313,24 +343,10 @@ shader49 = ../../shaders/base/reflection.slang scale_type49 = viewport alias49 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader50 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear50 = true -scale_type50 = viewport -float_framebuffer50 = true -alias50 = "BR_LayersUnderCRTPass" - -shader51 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear51 = true -scale_type51 = viewport -float_framebuffer51 = true -alias51 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader52 = ../../shaders/base/combine-passes.slang -scale_type52 = viewport -alias52 = "CombinePass" +shader50 = ../../shaders/base/combine-passes.slang +scale_type50 = viewport +alias50 = "CombinePass" // Define textures to be used by the different passes textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -431,7 +447,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // Reshade-FX -HSM_DEDITHER_MODE = 1 +SGPT_BLEND_OPTION = 1 bLensdirtEnable_toggle = "1.000000" bAnamFlareEnable_toggle = "1.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp index 96f61dc..46521a3 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 53 +shaders = 51 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,182 +124,173 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true +scale_type23 = source +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = GlowPass -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = GlowPass +alias38 = BloomPass -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = BloomPass +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true +alias41 = "PostCRTPass" -shader42 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader42 = ../../shaders/base/bezel-images-under-crt.slang filter_linear42 = true scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 float_framebuffer42 = true -alias42 = "CRTPass" +alias42 = "BR_LayersUnderCRTPass" -shader43 = ../../shaders/base/post-crt-prep-image-layers.slang +shader43 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear43 = true scale_type43 = viewport float_framebuffer43 = true -alias43 = "PostCRTPass" +alias43 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -320,24 +350,10 @@ shader49 = ../../shaders/base/reflection.slang scale_type49 = viewport alias49 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader50 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear50 = true -scale_type50 = viewport -float_framebuffer50 = true -alias50 = "BR_LayersUnderCRTPass" - -shader51 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear51 = true -scale_type51 = viewport -float_framebuffer51 = true -alias51 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader52 = ../../shaders/base/combine-passes.slang -scale_type52 = viewport -alias52 = "CombinePass" +shader50 = ../../shaders/base/combine-passes.slang +scale_type50 = viewport +alias50 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -432,9 +448,11 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp index 67cc283..00a4475 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 50 +shaders = 48 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,161 +124,152 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" - -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" - -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = GlowPass + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = GlowPass +alias35 = BloomPass -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = BloomPass +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true +alias38 = "PostCRTPass" -shader39 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader39 = ../../shaders/base/bezel-images-under-crt.slang filter_linear39 = true scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 float_framebuffer39 = true -alias39 = "CRTPass" +alias39 = "BR_LayersUnderCRTPass" -shader40 = ../../shaders/base/post-crt-prep-image-layers.slang +shader40 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear40 = true scale_type40 = viewport float_framebuffer40 = true -alias40 = "PostCRTPass" +alias40 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -299,24 +329,10 @@ shader46 = ../../shaders/base/reflection.slang scale_type46 = viewport alias46 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader47 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear47 = true -scale_type47 = viewport -float_framebuffer47 = true -alias47 = "BR_LayersUnderCRTPass" - -shader48 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear48 = true -scale_type48 = viewport -float_framebuffer48 = true -alias48 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader49 = ../../shaders/base/combine-passes.slang -scale_type49 = viewport -alias49 = "CombinePass" +shader47 = ../../shaders/base/combine-passes.slang +scale_type47 = viewport +alias47 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -409,7 +425,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp index 2832c70..f4de797 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__EASYMODE.slangp @@ -1,4 +1,4 @@ -shaders = 42 +shaders = 40 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,116 +43,146 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang +shader26 = ../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang +filter_linear26 = false +srgb_framebuffer26 = true + +shader27 = ../../shaders/easymode/hsm-crt-easymode-blur_vert.slang +filter_linear27 = false +srgb_framebuffer27 = true + +shader28 = ../../shaders/easymode/hsm-crt-easymode-threshold.slang filter_linear28 = false srgb_framebuffer28 = true -shader29 = ../../shaders/easymode/hsm-crt-easymode-blur_vert.slang -filter_linear29 = false -srgb_framebuffer29 = true - -shader30 = ../../shaders/easymode/hsm-crt-easymode-threshold.slang -filter_linear30 = false -srgb_framebuffer30 = true - // Easymode's Shader! -shader31 = ../../shaders/easymode/hsm-crt-easymode-halation.slang -filter_linear31 = true -scale_type31 = viewport -float_framebuffer31 = true -alias31 = "CRTPass" +shader29 = ../../shaders/easymode/hsm-crt-easymode-halation.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "CRTPass" g_gamma_out = 2.45 -shader32 = ../../shaders/base/post-crt-prep-image-layers.slang +shader30 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader31 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "BR_LayersUnderCRTPass" + +shader32 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear32 = true scale_type32 = viewport float_framebuffer32 = true -alias32 = "PostCRTPass" +alias32 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -212,24 +242,10 @@ shader38 = ../../shaders/base/reflection.slang scale_type38 = viewport alias38 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader39 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersUnderCRTPass" - -shader40 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear40 = true -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader41 = ../../shaders/base/combine-passes.slang -scale_type41 = viewport -alias41 = "CombinePass" +shader39 = ../../shaders/base/combine-passes.slang +scale_type39 = viewport +alias39 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp index 4e1dd66..b543676 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 42 +shaders = 40 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,122 +43,152 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader25 = ../../shaders/base/stock.slang filter_linear25 = true scale_type25 = source scale_x25 = 1.0 scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -filter_linear27 = true -scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 -alias27 = "PrePass" -mipmap_input27 = true - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/base/delinearize.slang +scale_type28 = source +float_framebuffer28 = "true" + +shader29 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang +scale_type29 = viewport +scale_x29 = 1.0 +scale_y29 = 1.0 filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -float_framebuffer29 = true -alias29 = "LinearizePass" - -shader30 = ../../shaders/base/delinearize.slang -scale_type30 = source -float_framebuffer30 = "true" - -shader31 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang -scale_type31 = viewport -scale_x31 = 1.0 -scale_y31 = 1.0 -filter_linear31 = true -float_framebuffer31 = "true" -alias31 = "CRTPass" +float_framebuffer29 = "true" +alias29 = "CRTPass" g_sat = 0.15 g_gamma_out = 2.45 -shader32 = ../../shaders/base/post-crt-prep-image-layers.slang +shader30 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader31 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "BR_LayersUnderCRTPass" + +shader32 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear32 = true scale_type32 = viewport float_framebuffer32 = true -alias32 = "PostCRTPass" +alias32 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -218,24 +248,10 @@ shader38 = ../../shaders/base/reflection.slang scale_type38 = viewport alias38 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader39 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersUnderCRTPass" - -shader40 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear40 = true -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader41 = ../../shaders/base/combine-passes.slang -scale_type41 = viewport -alias41 = "CombinePass" +shader39 = ../../shaders/base/combine-passes.slang +scale_type39 = viewport +alias39 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -330,3 +346,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp index a99e337..1431bc1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-MINI.slangp @@ -1,4 +1,4 @@ -shaders = 40 +shaders = 38 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,110 +43,140 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" + +shader26 = ../../shaders/base/delinearize.slang +scale_type26 = source +float_framebuffer26 = "true" + +shader27 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang +scale_type27 = viewport +scale_x27 = 1.0 +scale_y27 = 1.0 filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" - -shader28 = ../../shaders/base/delinearize.slang -scale_type28 = source -float_framebuffer28 = "true" - -shader29 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang -scale_type29 = viewport -scale_x29 = 1.0 -scale_y29 = 1.0 -filter_linear29 = true -float_framebuffer29 = "true" -alias29 = "CRTPass" +float_framebuffer27 = "true" +alias27 = "CRTPass" g_sat = 0.15 g_gamma_out = 2.45 -shader30 = ../../shaders/base/post-crt-prep-image-layers.slang +shader28 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader29 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "BR_LayersUnderCRTPass" + +shader30 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear30 = true scale_type30 = viewport float_framebuffer30 = true -alias30 = "PostCRTPass" +alias30 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -206,24 +236,10 @@ shader36 = ../../shaders/base/reflection.slang scale_type36 = viewport alias36 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader37 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear37 = true -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "BR_LayersUnderCRTPass" - -shader38 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader39 = ../../shaders/base/combine-passes.slang -scale_type39 = viewport -alias39 = "CombinePass" +shader37 = ../../shaders/base/combine-passes.slang +scale_type37 = viewport +alias37 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp index 59d954f..7387037 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,165 +43,195 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader25 = ../../shaders/base/stock.slang filter_linear25 = true scale_type25 = source scale_x25 = 1.0 scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -filter_linear27 = true -scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 -alias27 = "PrePass" -mipmap_input27 = true - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear28 = true +scale_type_x28 = viewport +scale_x28 = 1.0 +scale_type_y28 = source +scale_y28 = 1.0 +float_framebuffer28 = true +alias28 = Pass1 + +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear29 = true -scale_type29 = source -scale29 = 1.0 +scale_type_x29 = absolute +scale_x29 = 640.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = "LinearizePass" -shader30 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear30 = true -scale_type_x30 = viewport -scale_x30 = 1.0 -scale_type_y30 = source -scale_y30 = 1.0 +scale_type_x30 = absolute +scale_x30 = 640.0 +scale_type_y30 = absolute +scale_y30 = 480.0 float_framebuffer30 = true -alias30 = Pass1 +alias30 = GlowPass -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 640.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 480.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true scale_type_x32 = absolute scale_x32 = 640.0 scale_type_y32 = absolute scale_y32 = 480.0 float_framebuffer32 = true -alias32 = GlowPass +alias32 = BloomPass -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 640.0 -scale_type_y33 = absolute -scale_y33 = 480.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence.slang filter_linear34 = true -scale_type_x34 = absolute -scale_x34 = 640.0 -scale_type_y34 = absolute -scale_y34 = 480.0 +scale_type34 = viewport +scale_x34 = 1.0 +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = BloomPass +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true +alias35 = "PostCRTPass" -shader36 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader36 = ../../shaders/base/bezel-images-under-crt.slang filter_linear36 = true scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 float_framebuffer36 = true -alias36 = "CRTPass" +alias36 = "BR_LayersUnderCRTPass" -shader37 = ../../shaders/base/post-crt-prep-image-layers.slang +shader37 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear37 = true scale_type37 = viewport float_framebuffer37 = true -alias37 = "PostCRTPass" +alias37 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -261,24 +291,10 @@ shader43 = ../../shaders/base/reflection.slang scale_type43 = viewport alias43 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader44 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear44 = true -scale_type44 = viewport -float_framebuffer44 = true -alias44 = "BR_LayersUnderCRTPass" - -shader45 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear45 = true -scale_type45 = viewport -float_framebuffer45 = true -alias45 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader46 = ../../shaders/base/combine-passes.slang -scale_type46 = viewport -alias46 = "CombinePass" +shader44 = ../../shaders/base/combine-passes.slang +scale_type44 = viewport +alias44 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -373,3 +389,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp index 6506195..1cb871f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 44 +shaders = 42 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,144 +43,174 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader26 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear26 = true +scale_type_x26 = absolute +scale_x26 = 800.0 +scale_type_y26 = source +scale_y26 = 1.0 +float_framebuffer26 = true + +shader27 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = absolute +scale_y27 = 600.0 +float_framebuffer27 = true +alias27 = GlowPass + +shader28 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear28 = true scale_type_x28 = absolute scale_x28 = 800.0 -scale_type_y28 = source -scale_y28 = 1.0 +scale_type_y28 = absolute +scale_y28 = 600.0 float_framebuffer28 = true -shader29 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader29 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear29 = true -scale_type_x29 = absolute -scale_x29 = 800.0 -scale_type_y29 = absolute -scale_y29 = 600.0 +scale_type_x29 = source +scale_x29 = 1.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = GlowPass +alias29 = BloomPass -shader30 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader30 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type30 = viewport +scale_x30 = 1.0 +scale_y30 = 1.0 float_framebuffer30 = true -shader31 = ../../shaders/guest/hsm-bloom_vertical.slang +shader31 = ../../shaders/guest/hsm-deconvergence.slang filter_linear31 = true -scale_type_x31 = source +scale_type31 = viewport scale_x31 = 1.0 -scale_type_y31 = source scale_y31 = 1.0 float_framebuffer31 = true -alias31 = BloomPass +alias31 = "CRTPass" -shader32 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear32 = true +shader32 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input32 = true scale_type32 = viewport -scale_x32 = 1.0 -scale_y32 = 1.0 float_framebuffer32 = true +alias32 = "PostCRTPass" -shader33 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader33 = ../../shaders/base/bezel-images-under-crt.slang filter_linear33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true -alias33 = "CRTPass" +alias33 = "BR_LayersUnderCRTPass" -shader34 = ../../shaders/base/post-crt-prep-image-layers.slang +shader34 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear34 = true scale_type34 = viewport float_framebuffer34 = true -alias34 = "PostCRTPass" +alias34 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -240,24 +270,10 @@ shader40 = ../../shaders/base/reflection.slang scale_type40 = viewport alias40 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader41 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear41 = true -scale_type41 = viewport -float_framebuffer41 = true -alias41 = "BR_LayersUnderCRTPass" - -shader42 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader43 = ../../shaders/base/combine-passes.slang -scale_type43 = viewport -alias43 = "CombinePass" +shader41 = ../../shaders/base/combine-passes.slang +scale_type41 = viewport +alias41 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp index fcc35ab..b859cd1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__LCD-GRID.slangp @@ -1,4 +1,4 @@ -shaders = 40 +shaders = 38 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,105 +43,135 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/base/delinearize.slang -float_framebuffer28 = "true" +shader26 = ../../shaders/base/delinearize.slang +float_framebuffer26 = "true" -shader29 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear29 = "false" -scale_type29 = "viewport" -scale29 = "1.0" -float_framebuffer29 = "true" -alias29 = "CRTPass" +shader27 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear27 = "false" +scale_type27 = "viewport" +scale27 = "1.0" +float_framebuffer27 = "true" +alias27 = "CRTPass" -shader30 = ../../shaders/base/post-crt-prep-image-layers.slang +shader28 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader29 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "BR_LayersUnderCRTPass" + +shader30 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear30 = true scale_type30 = viewport float_framebuffer30 = true -alias30 = "PostCRTPass" +alias30 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -201,24 +231,10 @@ shader36 = ../../shaders/base/reflection.slang scale_type36 = viewport alias36 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader37 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear37 = true -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "BR_LayersUnderCRTPass" - -shader38 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader39 = ../../shaders/base/combine-passes.slang -scale_type39 = viewport -alias39 = "CombinePass" +shader37 = ../../shaders/base/combine-passes.slang +scale_type37 = viewport +alias37 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp index 8e31627..13af986 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 43 +shaders = 41 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,132 +43,162 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 +shader25 = ../../shaders/base/stock.slang +float_framebuffer25 = true +alias25 = "PrePass" -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -float_framebuffer27 = true -alias27 = "PrePass" - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -float_framebuffer28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +float_framebuffer26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -float_framebuffer29 = true -alias29 = "LinearizePass" +shader27 = ../../shaders/guest/hsm-interlace.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader30 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear28 = "false" +scale_type28 = "source" +scale28 = "1.0" +wrap_mode28 = "clamp_to_border" +mipmap_input28 = "false" +alias28 = "SourceSDR" +float_framebuffer28 = "true" + +shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear29 = "false" +scale_type29 = "source" +scale29 = "1.0" +wrap_mode29 = "clamp_to_border" +mipmap_input29 = "false" +alias29 = "SourceHDR" +float_framebuffer29 = "true" + +shader30 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear30 = "false" -scale_type30 = "source" -scale30 = "1.0" wrap_mode30 = "clamp_to_border" mipmap_input30 = "false" -alias30 = "SourceSDR" +scale_type30 = "viewport" float_framebuffer30 = "true" +alias30 = "CRTPass" -shader31 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear31 = "false" -scale_type31 = "source" -scale31 = "1.0" -wrap_mode31 = "clamp_to_border" -mipmap_input31 = "false" -alias31 = "SourceHDR" -float_framebuffer31 = "true" +shader31 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "PostCRTPass" -shader32 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear32 = "false" -wrap_mode32 = "clamp_to_border" -mipmap_input32 = "false" -scale_type32 = "viewport" -float_framebuffer32 = "true" -alias32 = "CRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +shader32 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear32 = true +scale_type32 = viewport +float_framebuffer32 = true +alias32 = "BR_LayersUnderCRTPass" + +shader33 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear33 = true scale_type33 = viewport float_framebuffer33 = true -alias33 = "PostCRTPass" +alias33 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -228,24 +258,10 @@ shader39 = ../../shaders/base/reflection.slang scale_type39 = viewport alias39 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader40 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear40 = true -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "BR_LayersUnderCRTPass" - -shader41 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear41 = true -scale_type41 = viewport -float_framebuffer41 = true -alias41 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader42 = ../../shaders/base/combine-passes-hdr.slang -scale_type42 = viewport -alias42 = "CombinePass" +shader40 = ../../shaders/base/combine-passes-hdr.slang +scale_type40 = viewport +alias40 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -348,3 +364,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp index 8119369..75408e3 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__1__ADV__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -43,120 +43,150 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +float_framebuffer23 = true +alias23 = "PrePass" + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -float_framebuffer25 = true -alias25 = "PrePass" - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -float_framebuffer26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +float_framebuffer24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader26 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear26 = "false" +scale_type26 = "source" +scale26 = "1.0" +wrap_mode26 = "clamp_to_border" +mipmap_input26 = "false" +alias26 = "SourceSDR" +float_framebuffer26 = "true" + +shader27 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear27 = "false" +scale_type27 = "source" +scale27 = "1.0" +wrap_mode27 = "clamp_to_border" +mipmap_input27 = "false" +alias27 = "SourceHDR" +float_framebuffer27 = "true" + +shader28 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear28 = "false" -scale_type28 = "source" -scale28 = "1.0" wrap_mode28 = "clamp_to_border" mipmap_input28 = "false" -alias28 = "SourceSDR" +scale_type28 = "viewport" float_framebuffer28 = "true" +alias28 = "CRTPass" -shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear29 = "false" -scale_type29 = "source" -scale29 = "1.0" -wrap_mode29 = "clamp_to_border" -mipmap_input29 = "false" -alias29 = "SourceHDR" -float_framebuffer29 = "true" +shader29 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" -shader30 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear30 = "false" -wrap_mode30 = "clamp_to_border" -mipmap_input30 = "false" -scale_type30 = "viewport" -float_framebuffer30 = "true" -alias30 = "CRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader31 = ../../shaders/base/post-crt-prep-image-layers.slang +shader30 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "BR_LayersUnderCRTPass" + +shader31 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear31 = true scale_type31 = viewport float_framebuffer31 = true -alias31 = "PostCRTPass" +alias31 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -216,24 +246,10 @@ shader37 = ../../shaders/base/reflection.slang scale_type37 = viewport alias37 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" - -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes-hdr.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes-hdr.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp index 40e9e3b..7298eae 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-RESHADE-FX__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 50 +shaders = 48 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,276 +43,292 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = "../../../../reshade/shaders/bloom/BloomPass0.slang" +shader18 = "../../../../reshade/shaders/bloom/BloomPass0.slang" +filter_linear18 = "true" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "SamplerBloom1" +srgb_framebuffer18 = "false" +scale_type_x18 = "source" +scale_x18 = "4.000000" +scale_type_y18 = "source" +scale_y18 = "4.000000" +float_framebuffer18 = "true" + +shader19 = "../../../../reshade/shaders/bloom/BloomPass1.slang" +filter_linear19 = "true" +wrap_mode19 = "clamp_to_border" +mipmap_input19 = "false" +alias19 = "SamplerBloom2" +srgb_framebuffer19 = "false" +float_framebuffer19 = "true" + +shader20 = "../../../../reshade/shaders/bloom/BloomPass2.slang" filter_linear20 = "true" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" -alias20 = "SamplerBloom1" -srgb_framebuffer20 = "false" -scale_type_x20 = "source" -scale_x20 = "4.000000" -scale_type_y20 = "source" -scale_y20 = "4.000000" +alias20 = "SamplerBloom3" float_framebuffer20 = "true" -shader21 = "../../../../reshade/shaders/bloom/BloomPass1.slang" +shader21 = "../../../../reshade/shaders/bloom/BloomPass3.slang" filter_linear21 = "true" wrap_mode21 = "clamp_to_border" mipmap_input21 = "false" -alias21 = "SamplerBloom2" -srgb_framebuffer21 = "false" +alias21 = "SamplerBloom4" float_framebuffer21 = "true" -shader22 = "../../../../reshade/shaders/bloom/BloomPass2.slang" +shader22 = "../../../../reshade/shaders/bloom/BloomPass4.slang" filter_linear22 = "true" wrap_mode22 = "clamp_to_border" mipmap_input22 = "false" -alias22 = "SamplerBloom3" +alias22 = "SamplerBloom5" float_framebuffer22 = "true" -shader23 = "../../../../reshade/shaders/bloom/BloomPass3.slang" +shader23 = "../../../../reshade/shaders/bloom/LensFlarePass0.slang" filter_linear23 = "true" wrap_mode23 = "clamp_to_border" mipmap_input23 = "false" -alias23 = "SamplerBloom4" +alias23 = "LensFlare1" float_framebuffer23 = "true" -shader24 = "../../../../reshade/shaders/bloom/BloomPass4.slang" +shader24 = "../../../../reshade/shaders/bloom/LensFlarePass1.slang" filter_linear24 = "true" wrap_mode24 = "clamp_to_border" mipmap_input24 = "false" -alias24 = "SamplerBloom5" +alias24 = "LensFlare2" float_framebuffer24 = "true" -shader25 = "../../../../reshade/shaders/bloom/LensFlarePass0.slang" +shader25 = "../../../../reshade/shaders/bloom/LensFlarePass2.slang" filter_linear25 = "true" wrap_mode25 = "clamp_to_border" mipmap_input25 = "false" -alias25 = "LensFlare1" +alias25 = "LensFlare3" float_framebuffer25 = "true" -shader26 = "../../../../reshade/shaders/bloom/LensFlarePass1.slang" +shader26 = "../../../../reshade/shaders/bloom/LightingCombine.slang" filter_linear26 = "true" wrap_mode26 = "clamp_to_border" mipmap_input26 = "false" -alias26 = "LensFlare2" +alias26 = "" +scale_type_x26 = "source" +scale_x26 = "0.250000" +scale_type_y26 = "source" +scale_y26 = "0.250000" float_framebuffer26 = "true" -shader27 = "../../../../reshade/shaders/bloom/LensFlarePass2.slang" -filter_linear27 = "true" -wrap_mode27 = "clamp_to_border" -mipmap_input27 = "false" -alias27 = "LensFlare3" -float_framebuffer27 = "true" +shader27 = ../../shaders/base/stock.slang +alias27 = "PreCRTPass" -shader28 = "../../../../reshade/shaders/bloom/LightingCombine.slang" -filter_linear28 = "true" -wrap_mode28 = "clamp_to_border" -mipmap_input28 = "false" -alias28 = "" -scale_type_x28 = "source" -scale_x28 = "0.250000" -scale_type_y28 = "source" -scale_y28 = "0.250000" -float_framebuffer28 = "true" +shader28 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +alias28 = "AfterglowPass" -shader29 = ../../shaders/base/stock.slang -alias29 = "PreCRTPass" - -shader30 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear30 = true -scale_type30 = source -scale30 = 1.0 -alias30 = "AfterglowPass" - -shader31 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear31 = true -scale_type31 = source -mipmap_input31 = true -scale31 = 1.0 +shader29 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear29 = true +scale_type29 = source +mipmap_input29 = true +scale29 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader32 = ../../shaders/dogway/hsm-grade.slang -filter_linear32 = false -scale_type32 = source -scale32 = 1.0 -alias32 = "ColorCorrectPass" +shader30 = ../../shaders/dogway/hsm-grade.slang +filter_linear30 = false +scale_type30 = source +scale30 = 1.0 +alias30 = "ColorCorrectPass" -shader33 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear31 = true +scale_type31 = source +scale_x31 = 1.0 +scale_y31 = 1.0 + +shader32 = ../../shaders/base/stock.slang +filter_linear32 = true +scale_type32 = source +scale_x32 = 1.0 +scale_y32 = 1.0 +alias32 = "PrePass" +mipmap_input32 = true + +shader33 = ../../shaders/guest/hsm-avg-lum.slang filter_linear33 = true scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 - -shader34 = ../../shaders/base/stock.slang -filter_linear34 = true -scale_type34 = source -scale_x34 = 1.0 -scale_y34 = 1.0 -alias34 = "PrePass" -mipmap_input34 = true - -shader35 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -mipmap_input35 = true -alias35 = "AvgLumPass" +scale33 = 1.0 +mipmap_input33 = true +alias33 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader36 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear36 = true -scale_type36 = source -scale36 = 1.0 -float_framebuffer36 = true -alias36 = "LinearizePass" +shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear34 = true +scale_type34 = source +scale34 = 1.0 +float_framebuffer34 = true +alias34 = "LinearizePass" -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear35 = true +scale_type_x35 = absolute +scale_x35 = 800.0 +scale_type_y35 = source +scale_y35 = 1.0 +float_framebuffer35 = true + +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear36 = true +scale_type_x36 = absolute +scale_x36 = 800.0 +scale_type_y36 = absolute +scale_y36 = 600.0 +float_framebuffer36 = true +alias36 = GlowPass + +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 800.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 600.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true -scale_type_x38 = absolute -scale_x38 = 800.0 -scale_type_y38 = absolute -scale_y38 = 600.0 +scale_type_x38 = source +scale_x38 = 1.0 +scale_type_y38 = source +scale_y38 = 1.0 float_framebuffer38 = true -alias38 = GlowPass +alias38 = BloomPass -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 800.0 -scale_type_y39 = absolute -scale_y39 = 600.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = source +scale_type40 = viewport scale_x40 = 1.0 -scale_type_y40 = source scale_y40 = 1.0 float_framebuffer40 = true -alias40 = BloomPass +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-glass.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader44 = ../../shaders/base/linearize-crt.slang -mipmap_input44 = true -filter_linear44 = true -scale_type44 = absolute -// scale_x44 = 480 -// scale_y44 = 270 -// scale_x44 = 960 -// scale_y44 = 540 -scale_x44 = 800 -scale_y44 = 600 -float_framebuffer44 = true -alias44 = "BR_MirrorLowResPass" +shader42 = ../../shaders/base/linearize-crt.slang +mipmap_input42 = true +filter_linear42 = true +scale_type42 = absolute +// scale_x42 = 480 +// scale_y42 = 270 +// scale_x42 = 960 +// scale_y42 = 540 +scale_x42 = 800 +scale_y42 = 600 +float_framebuffer42 = true +alias42 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader45 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input45 = true -filter_linear45 = true -float_framebuffer45 = true +shader43 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input43 = true +filter_linear43 = true +float_framebuffer43 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader46 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear46 = true -float_framebuffer46 = true -alias46 = "BR_MirrorBlurredPass" +shader44 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear44 = true +float_framebuffer44 = true +alias44 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader47 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input47 = true -filter_linear47 = true -scale_type47 = absolute -scale_x47 = 128 -scale_y47 = 128 -float_framebuffer47 = true -alias47 = "BR_MirrorReflectionDiffusedPass" +shader45 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input45 = true +filter_linear45 = true +scale_type45 = absolute +scale_x45 = 128 +scale_y45 = 128 +float_framebuffer45 = true +alias45 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader48 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input48 = true -filter_linear48 = true -scale_type48 = absolute -scale_x48 = 12 -scale_y48 = 12 -float_framebuffer48 = true -alias48 = "BR_MirrorFullscreenGlowPass" +shader46 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input46 = true +filter_linear46 = true +scale_type46 = absolute +scale_x46 = 12 +scale_y46 = 12 +float_framebuffer46 = true +alias46 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader49 = ../../shaders/base/reflection-glass.slang -scale_type49 = viewport -srgb_framebuffer49 = true -alias49 = "ReflectionPass" +shader47 = ../../shaders/base/reflection-glass.slang +scale_type47 = viewport +srgb_framebuffer47 = true +alias47 = "ReflectionPass" // Define textures to be used by the different passes textures = "Dirt;Sprite;SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -449,7 +465,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // Reshade-FX -HSM_DEDITHER_MODE = 1 +SGPT_BLEND_OPTION = 1 bLensdirtEnable_toggle = "1.000000" bAnamFlareEnable_toggle = "1.000000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp index 3d26f81..cdb2dc0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 50 +shaders = 48 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,241 +124,218 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true +scale_type23 = source +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = GlowPass -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = GlowPass +alias38 = BloomPass -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = BloomPass +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-glass.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader44 = ../../shaders/base/linearize-crt.slang -mipmap_input44 = true -filter_linear44 = true -scale_type44 = absolute -// scale_x44 = 480 -// scale_y44 = 270 -// scale_x44 = 960 -// scale_y44 = 540 -scale_x44 = 800 -scale_y44 = 600 -float_framebuffer44 = true -alias44 = "BR_MirrorLowResPass" +shader42 = ../../shaders/base/linearize-crt.slang +mipmap_input42 = true +filter_linear42 = true +scale_type42 = absolute +// scale_x42 = 480 +// scale_y42 = 270 +// scale_x42 = 960 +// scale_y42 = 540 +scale_x42 = 800 +scale_y42 = 600 +float_framebuffer42 = true +alias42 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader45 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input45 = true -filter_linear45 = true -float_framebuffer45 = true +shader43 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input43 = true +filter_linear43 = true +float_framebuffer43 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader46 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear46 = true -float_framebuffer46 = true -alias46 = "BR_MirrorBlurredPass" +shader44 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear44 = true +float_framebuffer44 = true +alias44 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader47 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input47 = true -filter_linear47 = true -scale_type47 = absolute -scale_x47 = 128 -scale_y47 = 128 -float_framebuffer47 = true -alias47 = "BR_MirrorReflectionDiffusedPass" +shader45 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input45 = true +filter_linear45 = true +scale_type45 = absolute +scale_x45 = 128 +scale_y45 = 128 +float_framebuffer45 = true +alias45 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader48 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input48 = true -filter_linear48 = true -scale_type48 = absolute -scale_x48 = 12 -scale_y48 = 12 -float_framebuffer48 = true -alias48 = "BR_MirrorFullscreenGlowPass" +shader46 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input46 = true +filter_linear46 = true +scale_type46 = absolute +scale_x46 = 12 +scale_y46 = 12 +float_framebuffer46 = true +alias46 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader49 = ../../shaders/base/reflection-glass.slang -scale_type49 = viewport -srgb_framebuffer49 = true -alias49 = "ReflectionPass" +shader47 = ../../shaders/base/reflection-glass.slang +scale_type47 = viewport +srgb_framebuffer47 = true +alias47 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -450,9 +466,11 @@ g_vignette = "0.0" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp index a4fb994..8a37905 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,220 +124,197 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" - -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" - -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = GlowPass + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = GlowPass +alias35 = BloomPass -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = BloomPass +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true - -shader39 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear39 = true -scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 -float_framebuffer39 = true -alias39 = "CRTPass" - -shader40 = ../../shaders/base/post-crt-prep-glass.slang -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "PostCRTPass" +alias38 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader41 = ../../shaders/base/linearize-crt.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -// scale_x41 = 480 -// scale_y41 = 270 -// scale_x41 = 960 -// scale_y41 = 540 -scale_x41 = 800 -scale_y41 = 600 -float_framebuffer41 = true -alias41 = "BR_MirrorLowResPass" +shader39 = ../../shaders/base/linearize-crt.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +// scale_x39 = 480 +// scale_y39 = 270 +// scale_x39 = 960 +// scale_y39 = 540 +scale_x39 = 800 +scale_y39 = 600 +float_framebuffer39 = true +alias39 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader42 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input42 = true -filter_linear42 = true -float_framebuffer42 = true +shader40 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input40 = true +filter_linear40 = true +float_framebuffer40 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader43 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear43 = true -float_framebuffer43 = true -alias43 = "BR_MirrorBlurredPass" +shader41 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear41 = true +float_framebuffer41 = true +alias41 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader44 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input44 = true -filter_linear44 = true -scale_type44 = absolute -scale_x44 = 128 -scale_y44 = 128 -float_framebuffer44 = true -alias44 = "BR_MirrorReflectionDiffusedPass" +shader42 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input42 = true +filter_linear42 = true +scale_type42 = absolute +scale_x42 = 128 +scale_y42 = 128 +float_framebuffer42 = true +alias42 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader45 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input45 = true -filter_linear45 = true -scale_type45 = absolute -scale_x45 = 12 -scale_y45 = 12 -float_framebuffer45 = true -alias45 = "BR_MirrorFullscreenGlowPass" +shader43 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input43 = true +filter_linear43 = true +scale_type43 = absolute +scale_x43 = 12 +scale_y43 = 12 +float_framebuffer43 = true +alias43 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader46 = ../../shaders/base/reflection-glass.slang -scale_type46 = viewport -srgb_framebuffer46 = true -alias46 = "ReflectionPass" +shader44 = ../../shaders/base/reflection-glass.slang +scale_type44 = viewport +srgb_framebuffer44 = true +alias44 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -427,7 +443,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp index cdf31fd..edf08b2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__EASYMODE.slangp @@ -1,4 +1,4 @@ -shaders = 39 +shaders = 37 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,175 +43,191 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang +shader26 = ../../shaders/easymode/hsm-crt-easymode-blur_horiz.slang +filter_linear26 = false +srgb_framebuffer26 = true + +shader27 = ../../shaders/easymode/hsm-crt-easymode-blur_vert.slang +filter_linear27 = false +srgb_framebuffer27 = true + +shader28 = ../../shaders/easymode/hsm-crt-easymode-threshold.slang filter_linear28 = false srgb_framebuffer28 = true -shader29 = ../../shaders/easymode/hsm-crt-easymode-blur_vert.slang -filter_linear29 = false -srgb_framebuffer29 = true - -shader30 = ../../shaders/easymode/hsm-crt-easymode-threshold.slang -filter_linear30 = false -srgb_framebuffer30 = true - // Easymode's Shader! -shader31 = ../../shaders/easymode/hsm-crt-easymode-halation.slang -filter_linear31 = true -scale_type31 = viewport -float_framebuffer31 = true -alias31 = "CRTPass" +shader29 = ../../shaders/easymode/hsm-crt-easymode-halation.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "CRTPass" g_gamma_out = 2.45 -shader32 = ../../shaders/base/post-crt-prep-glass.slang -scale_type32 = viewport -float_framebuffer32 = true -alias32 = "PostCRTPass" +shader30 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader33 = ../../shaders/base/linearize-crt.slang -mipmap_input33 = true -filter_linear33 = true -scale_type33 = absolute -// scale_x33 = 480 -// scale_y33 = 270 -// scale_x33 = 960 -// scale_y33 = 540 -scale_x33 = 800 -scale_y33 = 600 -float_framebuffer33 = true -alias33 = "BR_MirrorLowResPass" +shader31 = ../../shaders/base/linearize-crt.slang +mipmap_input31 = true +filter_linear31 = true +scale_type31 = absolute +// scale_x31 = 480 +// scale_y31 = 270 +// scale_x31 = 960 +// scale_y31 = 540 +scale_x31 = 800 +scale_y31 = 600 +float_framebuffer31 = true +alias31 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader34 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input34 = true -filter_linear34 = true -float_framebuffer34 = true +shader32 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input32 = true +filter_linear32 = true +float_framebuffer32 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader35 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear35 = true -float_framebuffer35 = true -alias35 = "BR_MirrorBlurredPass" +shader33 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear33 = true +float_framebuffer33 = true +alias33 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader36 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input36 = true -filter_linear36 = true -scale_type36 = absolute -scale_x36 = 128 -scale_y36 = 128 -float_framebuffer36 = true -alias36 = "BR_MirrorReflectionDiffusedPass" +shader34 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input34 = true +filter_linear34 = true +scale_type34 = absolute +scale_x34 = 128 +scale_y34 = 128 +float_framebuffer34 = true +alias34 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader37 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input37 = true -filter_linear37 = true -scale_type37 = absolute -scale_x37 = 12 -scale_y37 = 12 -float_framebuffer37 = true -alias37 = "BR_MirrorFullscreenGlowPass" +shader35 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input35 = true +filter_linear35 = true +scale_type35 = absolute +scale_x35 = 12 +scale_y35 = 12 +float_framebuffer35 = true +alias35 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader38 = ../../shaders/base/reflection-glass.slang -scale_type38 = viewport -srgb_framebuffer38 = true -alias38 = "ReflectionPass" +shader36 = ../../shaders/base/reflection-glass.slang +scale_type36 = viewport +srgb_framebuffer36 = true +alias36 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp index 9609c56..e0d5fb2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 39 +shaders = 37 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,181 +43,197 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader25 = ../../shaders/base/stock.slang filter_linear25 = true scale_type25 = source scale_x25 = 1.0 scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -filter_linear27 = true -scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 -alias27 = "PrePass" -mipmap_input27 = true - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/base/delinearize.slang +scale_type28 = source +float_framebuffer28 = "true" + +shader29 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang +scale_type29 = viewport +scale_x29 = 1.0 +scale_y29 = 1.0 filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -float_framebuffer29 = true -alias29 = "LinearizePass" - -shader30 = ../../shaders/base/delinearize.slang -scale_type30 = source -float_framebuffer30 = "true" - -shader31 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang -scale_type31 = viewport -scale_x31 = 1.0 -scale_y31 = 1.0 -filter_linear31 = true -float_framebuffer31 = "true" -alias31 = "CRTPass" +float_framebuffer29 = "true" +alias29 = "CRTPass" g_sat = 0.15 g_gamma_out = 2.45 -shader32 = ../../shaders/base/post-crt-prep-glass.slang -scale_type32 = viewport -float_framebuffer32 = true -alias32 = "PostCRTPass" +shader30 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader33 = ../../shaders/base/linearize-crt.slang -mipmap_input33 = true -filter_linear33 = true -scale_type33 = absolute -// scale_x33 = 480 -// scale_y33 = 270 -// scale_x33 = 960 -// scale_y33 = 540 -scale_x33 = 800 -scale_y33 = 600 -float_framebuffer33 = true -alias33 = "BR_MirrorLowResPass" +shader31 = ../../shaders/base/linearize-crt.slang +mipmap_input31 = true +filter_linear31 = true +scale_type31 = absolute +// scale_x31 = 480 +// scale_y31 = 270 +// scale_x31 = 960 +// scale_y31 = 540 +scale_x31 = 800 +scale_y31 = 600 +float_framebuffer31 = true +alias31 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader34 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input34 = true -filter_linear34 = true -float_framebuffer34 = true +shader32 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input32 = true +filter_linear32 = true +float_framebuffer32 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader35 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear35 = true -float_framebuffer35 = true -alias35 = "BR_MirrorBlurredPass" +shader33 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear33 = true +float_framebuffer33 = true +alias33 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader36 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input36 = true -filter_linear36 = true -scale_type36 = absolute -scale_x36 = 128 -scale_y36 = 128 -float_framebuffer36 = true -alias36 = "BR_MirrorReflectionDiffusedPass" +shader34 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input34 = true +filter_linear34 = true +scale_type34 = absolute +scale_x34 = 128 +scale_y34 = 128 +float_framebuffer34 = true +alias34 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader37 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input37 = true -filter_linear37 = true -scale_type37 = absolute -scale_x37 = 12 -scale_y37 = 12 -float_framebuffer37 = true -alias37 = "BR_MirrorFullscreenGlowPass" +shader35 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input35 = true +filter_linear35 = true +scale_type35 = absolute +scale_x35 = 12 +scale_y35 = 12 +float_framebuffer35 = true +alias35 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader38 = ../../shaders/base/reflection-glass.slang -scale_type38 = viewport -srgb_framebuffer38 = true -alias38 = "ReflectionPass" +shader36 = ../../shaders/base/reflection-glass.slang +scale_type36 = viewport +srgb_framebuffer36 = true +alias36 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -348,3 +364,6 @@ g_vignette = "0.0" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp index d0a8e67..4c8fa3c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-MINI.slangp @@ -1,4 +1,4 @@ -shaders = 37 +shaders = 35 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,169 +43,185 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" + +shader26 = ../../shaders/base/delinearize.slang +scale_type26 = source +float_framebuffer26 = "true" + +shader27 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang +scale_type27 = viewport +scale_x27 = 1.0 +scale_y27 = 1.0 filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" - -shader28 = ../../shaders/base/delinearize.slang -scale_type28 = source -float_framebuffer28 = "true" - -shader29 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini.slang -scale_type29 = viewport -scale_x29 = 1.0 -scale_y29 = 1.0 -filter_linear29 = true -float_framebuffer29 = "true" -alias29 = "CRTPass" +float_framebuffer27 = "true" +alias27 = "CRTPass" g_sat = 0.15 g_gamma_out = 2.45 -shader30 = ../../shaders/base/post-crt-prep-glass.slang -scale_type30 = viewport -float_framebuffer30 = true -alias30 = "PostCRTPass" +shader28 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader31 = ../../shaders/base/linearize-crt.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -// scale_x31 = 480 -// scale_y31 = 270 -// scale_x31 = 960 -// scale_y31 = 540 -scale_x31 = 800 -scale_y31 = 600 -float_framebuffer31 = true -alias31 = "BR_MirrorLowResPass" +shader29 = ../../shaders/base/linearize-crt.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +// scale_x29 = 480 +// scale_y29 = 270 +// scale_x29 = 960 +// scale_y29 = 540 +scale_x29 = 800 +scale_y29 = 600 +float_framebuffer29 = true +alias29 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader32 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input32 = true -filter_linear32 = true -float_framebuffer32 = true +shader30 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input30 = true +filter_linear30 = true +float_framebuffer30 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader33 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear33 = true -float_framebuffer33 = true -alias33 = "BR_MirrorBlurredPass" +shader31 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear31 = true +float_framebuffer31 = true +alias31 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader34 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input34 = true -filter_linear34 = true -scale_type34 = absolute -scale_x34 = 128 -scale_y34 = 128 -float_framebuffer34 = true -alias34 = "BR_MirrorReflectionDiffusedPass" +shader32 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input32 = true +filter_linear32 = true +scale_type32 = absolute +scale_x32 = 128 +scale_y32 = 128 +float_framebuffer32 = true +alias32 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader35 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input35 = true -filter_linear35 = true -scale_type35 = absolute -scale_x35 = 12 -scale_y35 = 12 -float_framebuffer35 = true -alias35 = "BR_MirrorFullscreenGlowPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 12 +scale_y33 = 12 +float_framebuffer33 = true +alias33 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader36 = ../../shaders/base/reflection-glass.slang -scale_type36 = viewport -srgb_framebuffer36 = true -alias36 = "ReflectionPass" +shader34 = ../../shaders/base/reflection-glass.slang +scale_type34 = viewport +srgb_framebuffer34 = true +alias34 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp index b35039c..604cb09 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 44 +shaders = 42 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,224 +43,240 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader25 = ../../shaders/base/stock.slang filter_linear25 = true scale_type25 = source scale_x25 = 1.0 scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -filter_linear27 = true -scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 -alias27 = "PrePass" -mipmap_input27 = true - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear28 = true +scale_type_x28 = viewport +scale_x28 = 1.0 +scale_type_y28 = source +scale_y28 = 1.0 +float_framebuffer28 = true +alias28 = Pass1 + +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear29 = true -scale_type29 = source -scale29 = 1.0 +scale_type_x29 = absolute +scale_x29 = 640.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = "LinearizePass" -shader30 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear30 = true -scale_type_x30 = viewport -scale_x30 = 1.0 -scale_type_y30 = source -scale_y30 = 1.0 +scale_type_x30 = absolute +scale_x30 = 640.0 +scale_type_y30 = absolute +scale_y30 = 480.0 float_framebuffer30 = true -alias30 = Pass1 +alias30 = GlowPass -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 640.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 480.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true scale_type_x32 = absolute scale_x32 = 640.0 scale_type_y32 = absolute scale_y32 = 480.0 float_framebuffer32 = true -alias32 = GlowPass +alias32 = BloomPass -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 640.0 -scale_type_y33 = absolute -scale_y33 = 480.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence.slang filter_linear34 = true -scale_type_x34 = absolute -scale_x34 = 640.0 -scale_type_y34 = absolute -scale_y34 = 480.0 +scale_type34 = viewport +scale_x34 = 1.0 +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = BloomPass +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-glass.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader38 = ../../shaders/base/linearize-crt.slang -mipmap_input38 = true -filter_linear38 = true -scale_type38 = absolute -// scale_x38 = 480 -// scale_y38 = 270 -// scale_x38 = 960 -// scale_y38 = 540 -scale_x38 = 800 -scale_y38 = 600 -float_framebuffer38 = true -alias38 = "BR_MirrorLowResPass" +shader36 = ../../shaders/base/linearize-crt.slang +mipmap_input36 = true +filter_linear36 = true +scale_type36 = absolute +// scale_x36 = 480 +// scale_y36 = 270 +// scale_x36 = 960 +// scale_y36 = 540 +scale_x36 = 800 +scale_y36 = 600 +float_framebuffer36 = true +alias36 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader39 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input39 = true -filter_linear39 = true -float_framebuffer39 = true +shader37 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input37 = true +filter_linear37 = true +float_framebuffer37 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader40 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear40 = true -float_framebuffer40 = true -alias40 = "BR_MirrorBlurredPass" +shader38 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear38 = true +float_framebuffer38 = true +alias38 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader41 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -scale_x41 = 128 -scale_y41 = 128 -float_framebuffer41 = true -alias41 = "BR_MirrorReflectionDiffusedPass" +shader39 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +scale_x39 = 128 +scale_y39 = 128 +float_framebuffer39 = true +alias39 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader42 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input42 = true -filter_linear42 = true -scale_type42 = absolute -scale_x42 = 12 -scale_y42 = 12 -float_framebuffer42 = true -alias42 = "BR_MirrorFullscreenGlowPass" +shader40 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input40 = true +filter_linear40 = true +scale_type40 = absolute +scale_x40 = 12 +scale_y40 = 12 +float_framebuffer40 = true +alias40 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader43 = ../../shaders/base/reflection-glass.slang -scale_type43 = viewport -srgb_framebuffer43 = true -alias43 = "ReflectionPass" +shader41 = ../../shaders/base/reflection-glass.slang +scale_type41 = viewport +srgb_framebuffer41 = true +alias41 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -391,3 +407,6 @@ g_vignette = "0.0" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp index a046621..8cffe1a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,203 +43,219 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader26 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear26 = true +scale_type_x26 = absolute +scale_x26 = 800.0 +scale_type_y26 = source +scale_y26 = 1.0 +float_framebuffer26 = true + +shader27 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = absolute +scale_y27 = 600.0 +float_framebuffer27 = true +alias27 = GlowPass + +shader28 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear28 = true scale_type_x28 = absolute scale_x28 = 800.0 -scale_type_y28 = source -scale_y28 = 1.0 +scale_type_y28 = absolute +scale_y28 = 600.0 float_framebuffer28 = true -shader29 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader29 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear29 = true -scale_type_x29 = absolute -scale_x29 = 800.0 -scale_type_y29 = absolute -scale_y29 = 600.0 +scale_type_x29 = source +scale_x29 = 1.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = GlowPass +alias29 = BloomPass -shader30 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader30 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type30 = viewport +scale_x30 = 1.0 +scale_y30 = 1.0 float_framebuffer30 = true -shader31 = ../../shaders/guest/hsm-bloom_vertical.slang +shader31 = ../../shaders/guest/hsm-deconvergence.slang filter_linear31 = true -scale_type_x31 = source +scale_type31 = viewport scale_x31 = 1.0 -scale_type_y31 = source scale_y31 = 1.0 float_framebuffer31 = true -alias31 = BloomPass +alias31 = "CRTPass" -shader32 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear32 = true +shader32 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input32 = true scale_type32 = viewport -scale_x32 = 1.0 -scale_y32 = 1.0 float_framebuffer32 = true - -shader33 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear33 = true -scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 -float_framebuffer33 = true -alias33 = "CRTPass" - -shader34 = ../../shaders/base/post-crt-prep-glass.slang -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "PostCRTPass" +alias32 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader35 = ../../shaders/base/linearize-crt.slang -mipmap_input35 = true -filter_linear35 = true -scale_type35 = absolute -// scale_x35 = 480 -// scale_y35 = 270 -// scale_x35 = 960 -// scale_y35 = 540 -scale_x35 = 800 -scale_y35 = 600 -float_framebuffer35 = true -alias35 = "BR_MirrorLowResPass" +shader33 = ../../shaders/base/linearize-crt.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +// scale_x33 = 480 +// scale_y33 = 270 +// scale_x33 = 960 +// scale_y33 = 540 +scale_x33 = 800 +scale_y33 = 600 +float_framebuffer33 = true +alias33 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader36 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input36 = true -filter_linear36 = true -float_framebuffer36 = true +shader34 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input34 = true +filter_linear34 = true +float_framebuffer34 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader37 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear37 = true -float_framebuffer37 = true -alias37 = "BR_MirrorBlurredPass" +shader35 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear35 = true +float_framebuffer35 = true +alias35 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader38 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input38 = true -filter_linear38 = true -scale_type38 = absolute -scale_x38 = 128 -scale_y38 = 128 -float_framebuffer38 = true -alias38 = "BR_MirrorReflectionDiffusedPass" +shader36 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input36 = true +filter_linear36 = true +scale_type36 = absolute +scale_x36 = 128 +scale_y36 = 128 +float_framebuffer36 = true +alias36 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader39 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input39 = true -filter_linear39 = true -scale_type39 = absolute -scale_x39 = 12 -scale_y39 = 12 -float_framebuffer39 = true -alias39 = "BR_MirrorFullscreenGlowPass" +shader37 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input37 = true +filter_linear37 = true +scale_type37 = absolute +scale_x37 = 12 +scale_y37 = 12 +float_framebuffer37 = true +alias37 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader40 = ../../shaders/base/reflection-glass.slang -scale_type40 = viewport -srgb_framebuffer40 = true -alias40 = "ReflectionPass" +shader38 = ../../shaders/base/reflection-glass.slang +scale_type38 = viewport +srgb_framebuffer38 = true +alias38 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp index d2b9def..e8f1ec3 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__LCD-GRID.slangp @@ -1,4 +1,4 @@ -shaders = 37 +shaders = 35 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,164 +43,180 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/base/delinearize.slang -float_framebuffer28 = "true" +shader26 = ../../shaders/base/delinearize.slang +float_framebuffer26 = "true" -shader29 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear29 = "false" -scale_type29 = "viewport" -scale29 = "1.0" -float_framebuffer29 = "true" -alias29 = "CRTPass" +shader27 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear27 = "false" +scale_type27 = "viewport" +scale27 = "1.0" +float_framebuffer27 = "true" +alias27 = "CRTPass" -shader30 = ../../shaders/base/post-crt-prep-glass.slang -scale_type30 = viewport -float_framebuffer30 = true -alias30 = "PostCRTPass" +shader28 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader31 = ../../shaders/base/linearize-crt.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -// scale_x31 = 480 -// scale_y31 = 270 -// scale_x31 = 960 -// scale_y31 = 540 -scale_x31 = 800 -scale_y31 = 600 -float_framebuffer31 = true -alias31 = "BR_MirrorLowResPass" +shader29 = ../../shaders/base/linearize-crt.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +// scale_x29 = 480 +// scale_y29 = 270 +// scale_x29 = 960 +// scale_y29 = 540 +scale_x29 = 800 +scale_y29 = 600 +float_framebuffer29 = true +alias29 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader32 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input32 = true -filter_linear32 = true -float_framebuffer32 = true +shader30 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input30 = true +filter_linear30 = true +float_framebuffer30 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader33 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear33 = true -float_framebuffer33 = true -alias33 = "BR_MirrorBlurredPass" +shader31 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear31 = true +float_framebuffer31 = true +alias31 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader34 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input34 = true -filter_linear34 = true -scale_type34 = absolute -scale_x34 = 128 -scale_y34 = 128 -float_framebuffer34 = true -alias34 = "BR_MirrorReflectionDiffusedPass" +shader32 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input32 = true +filter_linear32 = true +scale_type32 = absolute +scale_x32 = 128 +scale_y32 = 128 +float_framebuffer32 = true +alias32 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader35 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input35 = true -filter_linear35 = true -scale_type35 = absolute -scale_x35 = 12 -scale_y35 = 12 -float_framebuffer35 = true -alias35 = "BR_MirrorFullscreenGlowPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 12 +scale_y33 = 12 +float_framebuffer33 = true +alias33 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader36 = ../../shaders/base/reflection-glass.slang -scale_type36 = viewport -srgb_framebuffer36 = true -alias36 = "ReflectionPass" +shader34 = ../../shaders/base/reflection-glass.slang +scale_type34 = viewport +srgb_framebuffer34 = true +alias34 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp index 4fa0062..1eb09e5 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,195 +43,211 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 +shader25 = ../../shaders/base/stock.slang +float_framebuffer25 = true +alias25 = "PrePass" -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -float_framebuffer27 = true -alias27 = "PrePass" - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -float_framebuffer28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +float_framebuffer26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -float_framebuffer29 = true -alias29 = "LinearizePass" +shader27 = ../../shaders/guest/hsm-interlace.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader30 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear28 = "false" +scale_type28 = "source" +scale28 = "1.0" +wrap_mode28 = "clamp_to_border" +mipmap_input28 = "false" +alias28 = "SourceSDR" +float_framebuffer28 = "true" + +shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear29 = "false" +scale_type29 = "source" +scale29 = "1.0" +wrap_mode29 = "clamp_to_border" +mipmap_input29 = "false" +alias29 = "SourceHDR" +float_framebuffer29 = "true" + +shader30 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear30 = "false" -scale_type30 = "source" -scale30 = "1.0" wrap_mode30 = "clamp_to_border" mipmap_input30 = "false" -alias30 = "SourceSDR" +scale_type30 = "viewport" float_framebuffer30 = "true" +alias30 = "CRTPass" -shader31 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear31 = "false" -scale_type31 = "source" -scale31 = "1.0" -wrap_mode31 = "clamp_to_border" -mipmap_input31 = "false" -alias31 = "SourceHDR" -float_framebuffer31 = "true" - -shader32 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear32 = "false" -wrap_mode32 = "clamp_to_border" -mipmap_input32 = "false" -scale_type32 = "viewport" -float_framebuffer32 = "true" -alias32 = "CRTPass" - -shader33 = ../../shaders/base/post-crt-prep-glass.slang -scale_type33 = viewport -float_framebuffer33 = true -alias33 = "PostCRTPass" +shader31 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader34 = ../../shaders/base/linearize-crt-hdr.slang -mipmap_input34 = true -filter_linear34 = true -scale_type34 = absolute -// scale_x34 = 480 -// scale_y34 = 270 -// scale_x34 = 960 -// scale_y34 = 540 -scale_x34 = 800 -scale_y34 = 600 -float_framebuffer34 = true -alias34 = "BR_MirrorLowResPass" +shader32 = ../../shaders/base/linearize-crt-hdr.slang +mipmap_input32 = true +filter_linear32 = true +scale_type32 = absolute +// scale_x32 = 480 +// scale_y32 = 270 +// scale_x32 = 960 +// scale_y32 = 540 +scale_x32 = 800 +scale_y32 = 600 +float_framebuffer32 = true +alias32 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader35 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input35 = true -filter_linear35 = true -float_framebuffer35 = true +shader33 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input33 = true +filter_linear33 = true +float_framebuffer33 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader36 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear36 = true -float_framebuffer36 = true -alias36 = "BR_MirrorBlurredPass" +shader34 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear34 = true +float_framebuffer34 = true +alias34 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader37 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input37 = true -filter_linear37 = true -scale_type37 = absolute -scale_x37 = 128 -scale_y37 = 128 -float_framebuffer37 = true -alias37 = "BR_MirrorReflectionDiffusedPass" +shader35 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input35 = true +filter_linear35 = true +scale_type35 = absolute +scale_x35 = 128 +scale_y35 = 128 +float_framebuffer35 = true +alias35 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader38 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input38 = true -filter_linear38 = true -scale_type38 = absolute -scale_x38 = 12 -scale_y38 = 12 -float_framebuffer38 = true -alias38 = "BR_MirrorFullscreenGlowPass" +shader36 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input36 = true +filter_linear36 = true +scale_type36 = absolute +scale_x36 = 12 +scale_y36 = 12 +float_framebuffer36 = true +alias36 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader39 = ../../shaders/base/reflection-glass-hdr.slang -scale_type39 = viewport -alias39 = "ReflectionPass" +shader37 = ../../shaders/base/reflection-glass-hdr.slang +scale_type37 = viewport +alias37 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/output-hdr.slang -scale_type40 = viewport -alias40 = "OutputPass" +shader38 = ../../shaders/base/output-hdr.slang +scale_type38 = viewport +alias38 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -370,3 +386,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp index 4fa7062..ae2be15 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-GLASS__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 39 +shaders = 37 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,183 +43,199 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +float_framebuffer23 = true +alias23 = "PrePass" + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -float_framebuffer25 = true -alias25 = "PrePass" - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -float_framebuffer26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +float_framebuffer24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader26 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear26 = "false" +scale_type26 = "source" +scale26 = "1.0" +wrap_mode26 = "clamp_to_border" +mipmap_input26 = "false" +alias26 = "SourceSDR" +float_framebuffer26 = "true" + +shader27 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear27 = "false" +scale_type27 = "source" +scale27 = "1.0" +wrap_mode27 = "clamp_to_border" +mipmap_input27 = "false" +alias27 = "SourceHDR" +float_framebuffer27 = "true" + +shader28 = "../../shaders/megatron/crt-sony-megatron.slang" filter_linear28 = "false" -scale_type28 = "source" -scale28 = "1.0" wrap_mode28 = "clamp_to_border" mipmap_input28 = "false" -alias28 = "SourceSDR" +scale_type28 = "viewport" float_framebuffer28 = "true" +alias28 = "CRTPass" -shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear29 = "false" -scale_type29 = "source" -scale29 = "1.0" -wrap_mode29 = "clamp_to_border" -mipmap_input29 = "false" -alias29 = "SourceHDR" -float_framebuffer29 = "true" - -shader30 = "../../shaders/megatron/crt-sony-megatron.slang" -filter_linear30 = "false" -wrap_mode30 = "clamp_to_border" -mipmap_input30 = "false" -scale_type30 = "viewport" -float_framebuffer30 = "true" -alias30 = "CRTPass" - -shader31 = ../../shaders/base/post-crt-prep-glass.slang -scale_type31 = viewport -float_framebuffer31 = true -alias31 = "PostCRTPass" +shader29 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader32 = ../../shaders/base/linearize-crt-hdr.slang -mipmap_input32 = true -filter_linear32 = true -scale_type32 = absolute -// scale_x32 = 480 -// scale_y32 = 270 -// scale_x32 = 960 -// scale_y32 = 540 -scale_x32 = 800 -scale_y32 = 600 -float_framebuffer32 = true -alias32 = "BR_MirrorLowResPass" +shader30 = ../../shaders/base/linearize-crt-hdr.slang +mipmap_input30 = true +filter_linear30 = true +scale_type30 = absolute +// scale_x30 = 480 +// scale_y30 = 270 +// scale_x30 = 960 +// scale_y30 = 540 +scale_x30 = 800 +scale_y30 = 600 +float_framebuffer30 = true +alias30 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader33 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input33 = true -filter_linear33 = true -float_framebuffer33 = true +shader31 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input31 = true +filter_linear31 = true +float_framebuffer31 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader34 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear34 = true -float_framebuffer34 = true -alias34 = "BR_MirrorBlurredPass" +shader32 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear32 = true +float_framebuffer32 = true +alias32 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader35 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input35 = true -filter_linear35 = true -scale_type35 = absolute -scale_x35 = 128 -scale_y35 = 128 -float_framebuffer35 = true -alias35 = "BR_MirrorReflectionDiffusedPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 128 +scale_y33 = 128 +float_framebuffer33 = true +alias33 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader36 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input36 = true -filter_linear36 = true -scale_type36 = absolute -scale_x36 = 12 -scale_y36 = 12 -float_framebuffer36 = true -alias36 = "BR_MirrorFullscreenGlowPass" +shader34 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input34 = true +filter_linear34 = true +scale_type34 = absolute +scale_x34 = 12 +scale_y34 = 12 +float_framebuffer34 = true +alias34 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader37 = ../../shaders/base/reflection-glass-hdr.slang -scale_type37 = viewport -alias37 = "ReflectionPass" +shader35 = ../../shaders/base/reflection-glass-hdr.slang +scale_type35 = viewport +alias35 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- -shader38 = ../../shaders/base/output-hdr.slang -scale_type38 = viewport -alias38 = "OutputPass" +shader36 = ../../shaders/base/output-hdr.slang +scale_type36 = viewport +alias36 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp index 0885104..46a3ba0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 47 +shaders = 45 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,201 +124,178 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true +scale_type23 = source +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = "GlowPass" -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = "GlowPass" +alias38 = "BloomPass" -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = "BloomPass" +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader44 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear44 = true -scale_type44 = viewport -float_framebuffer44 = true -alias44 = "BR_LayersUnderCRTPass" +shader42 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear42 = true +scale_type42 = viewport +float_framebuffer42 = true +alias42 = "BR_LayersUnderCRTPass" -shader45 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear45 = true -scale_type45 = viewport -float_framebuffer45 = true -alias45 = "BR_LayersOverCRTPass" +shader43 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear43 = true +scale_type43 = viewport +float_framebuffer43 = true +alias43 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader46 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type46 = viewport -alias46 = "CombinePass" +shader44 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type44 = viewport +alias44 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -374,9 +390,11 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp index 5c88116..492629e 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 44 +shaders = 42 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,180 +124,157 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" - -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" - -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = "GlowPass" + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "GlowPass" +alias35 = "BloomPass" -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = "BloomPass" +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true - -shader39 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear39 = true -scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 -float_framebuffer39 = true -alias39 = "CRTPass" - -shader40 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "PostCRTPass" +alias38 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader41 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear41 = true -scale_type41 = viewport -float_framebuffer41 = true -alias41 = "BR_LayersUnderCRTPass" +shader39 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear39 = true +scale_type39 = viewport +float_framebuffer39 = true +alias39 = "BR_LayersUnderCRTPass" -shader42 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersOverCRTPass" +shader40 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear40 = true +scale_type40 = viewport +float_framebuffer40 = true +alias40 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader43 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type43 = viewport -alias43 = "CombinePass" +shader41 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type41 = viewport +alias41 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -351,7 +367,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp index 4ec7b8c..c189919 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,184 +43,200 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader25 = ../../shaders/base/stock.slang filter_linear25 = true scale_type25 = source scale_x25 = 1.0 scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -filter_linear27 = true -scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 -alias27 = "PrePass" -mipmap_input27 = true - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear28 = true +scale_type_x28 = viewport +scale_x28 = 1.0 +scale_type_y28 = source +scale_y28 = 1.0 +float_framebuffer28 = true +alias28 = Pass1 + +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear29 = true -scale_type29 = source -scale29 = 1.0 +scale_type_x29 = absolute +scale_x29 = 640.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = "LinearizePass" -shader30 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear30 = true -scale_type_x30 = viewport -scale_x30 = 1.0 -scale_type_y30 = source -scale_y30 = 1.0 +scale_type_x30 = absolute +scale_x30 = 640.0 +scale_type_y30 = absolute +scale_y30 = 480.0 float_framebuffer30 = true -alias30 = Pass1 +alias30 = "GlowPass" -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 640.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 480.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true scale_type_x32 = absolute scale_x32 = 640.0 scale_type_y32 = absolute scale_y32 = 480.0 float_framebuffer32 = true -alias32 = "GlowPass" +alias32 = "BloomPass" -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 640.0 -scale_type_y33 = absolute -scale_y33 = 480.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence.slang filter_linear34 = true -scale_type_x34 = absolute -scale_x34 = 640.0 -scale_type_y34 = absolute -scale_y34 = 480.0 +scale_type34 = viewport +scale_x34 = 1.0 +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "BloomPass" +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" +shader36 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear36 = true +scale_type36 = viewport +float_framebuffer36 = true +alias36 = "BR_LayersUnderCRTPass" -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" +shader37 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -315,3 +331,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp index 609ef77..09a545f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 38 +shaders = 36 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,163 +43,179 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader26 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear26 = true +scale_type_x26 = absolute +scale_x26 = 800.0 +scale_type_y26 = source +scale_y26 = 1.0 +float_framebuffer26 = true + +shader27 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = absolute +scale_y27 = 600.0 +float_framebuffer27 = true +alias27 = "GlowPass" + +shader28 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear28 = true scale_type_x28 = absolute scale_x28 = 800.0 -scale_type_y28 = source -scale_y28 = 1.0 +scale_type_y28 = absolute +scale_y28 = 600.0 float_framebuffer28 = true -shader29 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader29 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear29 = true -scale_type_x29 = absolute -scale_x29 = 800.0 -scale_type_y29 = absolute -scale_y29 = 600.0 +scale_type_x29 = source +scale_x29 = 1.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = "GlowPass" +alias29 = "BloomPass" -shader30 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader30 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type30 = viewport +scale_x30 = 1.0 +scale_y30 = 1.0 float_framebuffer30 = true -shader31 = ../../shaders/guest/hsm-bloom_vertical.slang +shader31 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear31 = true -scale_type_x31 = source +scale_type31 = viewport scale_x31 = 1.0 -scale_type_y31 = source scale_y31 = 1.0 float_framebuffer31 = true -alias31 = "BloomPass" +alias31 = "CRTPass" -shader32 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear32 = true +shader32 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input32 = true scale_type32 = viewport -scale_x32 = 1.0 -scale_y32 = 1.0 float_framebuffer32 = true - -shader33 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear33 = true -scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 -float_framebuffer33 = true -alias33 = "CRTPass" - -shader34 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "PostCRTPass" +alias32 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader35 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear35 = true -scale_type35 = viewport -float_framebuffer35 = true -alias35 = "BR_LayersUnderCRTPass" +shader33 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear33 = true +scale_type33 = viewport +float_framebuffer33 = true +alias33 = "BR_LayersUnderCRTPass" -shader36 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear36 = true -scale_type36 = viewport -float_framebuffer36 = true -alias36 = "BR_LayersOverCRTPass" +shader34 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear34 = true +scale_type34 = viewport +float_framebuffer34 = true +alias34 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader37 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type37 = viewport -alias37 = "CombinePass" +shader35 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type35 = viewport +alias35 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp index 62fb92c..6c005c0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 37 +shaders = 35 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,151 +43,167 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 +shader25 = ../../shaders/base/stock.slang +float_framebuffer25 = true +alias25 = "PrePass" -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -float_framebuffer27 = true -alias27 = "PrePass" - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -float_framebuffer28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +float_framebuffer26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -float_framebuffer29 = true -alias29 = "LinearizePass" +shader27 = ../../shaders/guest/hsm-interlace.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader30 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear28 = "false" +scale_type28 = "source" +scale28 = "1.0" +wrap_mode28 = "clamp_to_border" +mipmap_input28 = "false" +alias28 = "SourceSDR" +float_framebuffer28 = "true" + +shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear29 = "false" +scale_type29 = "source" +scale29 = "1.0" +wrap_mode29 = "clamp_to_border" +mipmap_input29 = "false" +alias29 = "SourceHDR" +float_framebuffer29 = "true" + +shader30 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear30 = "false" -scale_type30 = "source" -scale30 = "1.0" wrap_mode30 = "clamp_to_border" mipmap_input30 = "false" -alias30 = "SourceSDR" +scale_type30 = "viewport" float_framebuffer30 = "true" +alias30 = "CRTPass" -shader31 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear31 = "false" -scale_type31 = "source" -scale31 = "1.0" -wrap_mode31 = "clamp_to_border" -mipmap_input31 = "false" -alias31 = "SourceHDR" -float_framebuffer31 = "true" - -shader32 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear32 = "false" -wrap_mode32 = "clamp_to_border" -mipmap_input32 = "false" -scale_type32 = "viewport" -float_framebuffer32 = "true" -alias32 = "CRTPass" - -shader33 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type33 = viewport -float_framebuffer33 = true -alias33 = "PostCRTPass" +shader31 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader34 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear34 = true -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "BR_LayersUnderCRTPass" +shader32 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear32 = true +scale_type32 = viewport +float_framebuffer32 = true +alias32 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear35 = true -scale_type35 = viewport -float_framebuffer35 = true -alias35 = "BR_LayersOverCRTPass" +shader33 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear33 = true +scale_type33 = viewport +float_framebuffer33 = true +alias33 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader36 = ../../shaders/base/combine-passes-no-reflect-hdr.slang -scale_type36 = viewport -alias36 = "CombinePass" +shader34 = ../../shaders/base/combine-passes-no-reflect-hdr.slang +scale_type34 = viewport +alias34 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -290,3 +306,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp index c911cc3..d87c707 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-NO-REFLECT__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 35 +shaders = 33 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,139 +43,155 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +float_framebuffer23 = true +alias23 = "PrePass" + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -float_framebuffer25 = true -alias25 = "PrePass" - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -float_framebuffer26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +float_framebuffer24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader26 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear26 = "false" +scale_type26 = "source" +scale26 = "1.0" +wrap_mode26 = "clamp_to_border" +mipmap_input26 = "false" +alias26 = "SourceSDR" +float_framebuffer26 = "true" + +shader27 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear27 = "false" +scale_type27 = "source" +scale27 = "1.0" +wrap_mode27 = "clamp_to_border" +mipmap_input27 = "false" +alias27 = "SourceHDR" +float_framebuffer27 = "true" + +shader28 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear28 = "false" -scale_type28 = "source" -scale28 = "1.0" wrap_mode28 = "clamp_to_border" mipmap_input28 = "false" -alias28 = "SourceSDR" +scale_type28 = "viewport" float_framebuffer28 = "true" +alias28 = "CRTPass" -shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear29 = "false" -scale_type29 = "source" -scale29 = "1.0" -wrap_mode29 = "clamp_to_border" -mipmap_input29 = "false" -alias29 = "SourceHDR" -float_framebuffer29 = "true" - -shader30 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear30 = "false" -wrap_mode30 = "clamp_to_border" -mipmap_input30 = "false" -scale_type30 = "viewport" -float_framebuffer30 = "true" -alias30 = "CRTPass" - -shader31 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type31 = viewport -float_framebuffer31 = true -alias31 = "PostCRTPass" +shader29 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader32 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear32 = true -scale_type32 = viewport -float_framebuffer32 = true -alias32 = "BR_LayersUnderCRTPass" +shader30 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "BR_LayersUnderCRTPass" -shader33 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear33 = true -scale_type33 = viewport -float_framebuffer33 = true -alias33 = "BR_LayersOverCRTPass" +shader31 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader34 = ../../shaders/base/combine-passes-no-reflect-hdr.slang -scale_type34 = viewport -alias34 = "CombinePass" +shader32 = ../../shaders/base/combine-passes-no-reflect-hdr.slang +scale_type32 = viewport +alias32 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp index 81fdc6e..712b091 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,187 +124,164 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" +shader22 = ../../shaders/base/stock.slang +alias22 = "PreCRTPass" -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader23 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear23 = true +scale_type23 = source +scale23 = 1.0 +alias23 = "AfterglowPass" -shader24 = ../../shaders/base/stock.slang -alias24 = "PreCRTPass" - -shader25 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear25 = true -scale_type25 = source -scale25 = 1.0 -alias25 = "AfterglowPass" - -shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear26 = true -scale_type26 = source -mipmap_input26 = true -scale26 = 1.0 +shader24 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear24 = true +scale_type24 = source +mipmap_input24 = true +scale24 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader27 = ../../shaders/dogway/hsm-grade.slang +shader25 = ../../shaders/dogway/hsm-grade.slang +filter_linear25 = false +scale_type25 = source +scale25 = 1.0 +alias25 = "ColorCorrectPass" + +shader26 = ../../shaders/base/stock.slang +alias26 = "PrePass0" + +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear27 = false -scale_type27 = source -scale27 = 1.0 -alias27 = "ColorCorrectPass" +float_framebuffer27 = true +scale_type_x27 = source +scale_type_y27 = source +scale_x27 = 4.0 +scale_y27 = 1.0 +frame_count_mod27 = 2 +alias27 = NPass1 -shader28 = ../../shaders/base/stock.slang -alias28 = "PrePass0" +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer28 = true +filter_linear28 = true +scale_type28 = source +scale_x28 = 0.5 +scale_y28 = 1.0 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear29 = false -float_framebuffer29 = true -scale_type_x29 = source -scale_type_y29 = source -scale_x29 = 4.0 +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 scale_y29 = 1.0 -frame_count_mod29 = 2 -alias29 = NPass1 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer30 = true +shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear30 = true scale_type30 = source -scale_x30 = 0.5 +scale_x30 = 1.0 scale_y30 = 1.0 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader31 = ../../shaders/base/stock.slang filter_linear31 = true scale_type31 = source scale_x31 = 1.0 scale_y31 = 1.0 +alias31 = "PrePass" +mipmap_input31 = true -shader32 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader32 = ../../shaders/guest/hsm-avg-lum.slang filter_linear32 = true scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 - -shader33 = ../../shaders/base/stock.slang -filter_linear33 = true -scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 -alias33 = "PrePass" -mipmap_input33 = true - -shader34 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -mipmap_input34 = true -alias34 = "AvgLumPass" +scale32 = 1.0 +mipmap_input32 = true +alias32 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader35 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear33 = true +scale_type33 = source +scale33 = 1.0 +float_framebuffer33 = true +alias33 = "LinearizePass" + +shader34 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear34 = true +scale_type_x34 = viewport +scale_x34 = 1.0 +scale_type_y34 = source +scale_y34 = 1.0 +float_framebuffer34 = true +alias34 = Pass1 + +shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear35 = true -scale_type35 = source -scale35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "LinearizePass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear36 = true -scale_type_x36 = viewport -scale_x36 = 1.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -alias36 = Pass1 +alias36 = "GlowPass" -shader37 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader38 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 scale_type_y38 = absolute scale_y38 = 480.0 float_framebuffer38 = true -alias38 = "GlowPass" +alias38 = "BloomPass" -shader39 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader39 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -shader40 = ../../shaders/guest/hsm-bloom_vertical.slang +shader40 = ../../shaders/guest/hsm-deconvergence.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -alias40 = "BloomPass" +alias40 = "CRTPass" -shader41 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear41 = true +shader41 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input41 = true scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 float_framebuffer41 = true - -shader42 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear42 = true -scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 -float_framebuffer42 = true -alias42 = "CRTPass" - -shader43 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "PostCRTPass" +alias41 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/output-sdr.slang -scale_type44 = viewport -alias44 = "OutputPass" +shader42 = ../../shaders/base/output-sdr.slang +scale_type42 = viewport +alias42 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -360,9 +376,11 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp index fb7dd29..e3b214b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 42 +shaders = 40 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,41 +43,80 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -// filter_linear18 = "false" -// wrap_mode18 = "clamp_to_border" -// mipmap_input18 = "false" -// float_framebuffer18 = "false" -// srgb_framebuffer18 = "true" -alias18 = XbrSource +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +// filter_linear16 = "false" +// wrap_mode16 = "clamp_to_border" +// mipmap_input16 = "false" +// float_framebuffer16 = "false" +// srgb_framebuffer16 = "true" +alias16 = XbrSource + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear18 = "false" +wrap_mode18 = "clamp_to_border" +mipmap_input18 = "false" +alias18 = "" +float_framebuffer18 = "false" +srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "2.000000" +scale_type_y18 = "source" +scale_y18 = "2.000000" + +shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" +alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" +scale_type_x19 = "source" +scale_x19 = "1.000000" +scale_type_y19 = "source" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" @@ -85,166 +124,143 @@ alias20 = "" float_framebuffer20 = "false" srgb_framebuffer20 = "true" scale_type_x20 = "source" -scale_x20 = "2.000000" +scale_x20 = "1.000000" scale_type_y20 = "source" -scale_y20 = "2.000000" +scale_y20 = "1.000000" -shader21 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" - -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear22 = "false" -wrap_mode22 = "clamp_to_border" -mipmap_input22 = "false" -alias22 = "" -float_framebuffer22 = "false" -srgb_framebuffer22 = "true" -scale_type_x22 = "source" -scale_x22 = "1.000000" -scale_type_y22 = "source" -scale_y22 = "1.000000" - -shader23 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear23 = false -scale_type_x23 = source -scale_x23 = 1 -scale_type_y23 = source -scale_y23 = 0.5 -wrap_mode23 = "clamp_to_edge" +shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear21 = false +scale_type_x21 = source +scale_x21 = 1 +scale_type_y21 = source +scale_y21 = 0.5 +wrap_mode21 = "clamp_to_edge" // GTU TV Processing -shader24 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type24 = source -scale24 = 1.0 -float_framebuffer24 = true +shader22 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type22 = source +scale22 = 1.0 +float_framebuffer22 = true -shader25 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x25 = source -scale_x25 = 1.0 -scale_type_y25 = source -scale_y25 = 1.0 -filter_linear25 = false -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x23 = source +scale_x23 = 1.0 +scale_type_y23 = source +scale_y23 = 1.0 +filter_linear23 = false +float_framebuffer23 = true -shader26 = ../../shaders/base/stock.slang -alias26 = "PreCRTPass" +shader24 = ../../shaders/base/stock.slang +alias24 = "PreCRTPass" -shader27 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -alias27 = "AfterglowPass" +shader25 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +alias25 = "AfterglowPass" -shader28 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear28 = true -scale_type28 = source -mipmap_input28 = true -scale28 = 1.0 +shader26 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear26 = true +scale_type26 = source +mipmap_input26 = true +scale26 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader29 = ../../shaders/dogway/hsm-grade.slang -filter_linear29 = false -scale_type29 = source -scale29 = 1.0 -alias29 = "ColorCorrectPass" +shader27 = ../../shaders/dogway/hsm-grade.slang +filter_linear27 = false +scale_type27 = source +scale27 = 1.0 +alias27 = "ColorCorrectPass" -shader30 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader28 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 +scale_y28 = 1.0 + +shader29 = ../../shaders/base/stock.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 +alias29 = "PrePass" +mipmap_input29 = true + +shader30 = ../../shaders/guest/hsm-avg-lum.slang filter_linear30 = true scale_type30 = source -scale_x30 = 1.0 -scale_y30 = 1.0 - -shader31 = ../../shaders/base/stock.slang -filter_linear31 = true -scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 -alias31 = "PrePass" -mipmap_input31 = true - -shader32 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear32 = true -scale_type32 = source -scale32 = 1.0 -mipmap_input32 = true -alias32 = "AvgLumPass" +scale30 = 1.0 +mipmap_input30 = true +alias30 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader33 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -float_framebuffer33 = true -alias33 = "LinearizePass" +shader31 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear31 = true +scale_type31 = source +scale31 = 1.0 +float_framebuffer31 = true +alias31 = "LinearizePass" -shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear32 = true +scale_type_x32 = absolute +scale_x32 = 800.0 +scale_type_y32 = source +scale_y32 = 1.0 +float_framebuffer32 = true + +shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = absolute +scale_y33 = 600.0 +float_framebuffer33 = true +alias33 = "GlowPass" + +shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear34 = true scale_type_x34 = absolute scale_x34 = 800.0 -scale_type_y34 = source -scale_y34 = 1.0 +scale_type_y34 = absolute +scale_y34 = 600.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader35 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 800.0 -scale_type_y35 = absolute -scale_y35 = 600.0 +scale_type_x35 = source +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = "GlowPass" +alias35 = "BloomPass" -shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader36 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type36 = viewport +scale_x36 = 1.0 +scale_y36 = 1.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-bloom_vertical.slang +shader37 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear37 = true -scale_type_x37 = source +scale_type37 = viewport scale_x37 = 1.0 -scale_type_y37 = source scale_y37 = 1.0 float_framebuffer37 = true -alias37 = "BloomPass" +alias37 = "CRTPass" -shader38 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear38 = true +shader38 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input38 = true scale_type38 = viewport -scale_x38 = 1.0 -scale_y38 = 1.0 float_framebuffer38 = true - -shader39 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear39 = true -scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 -float_framebuffer39 = true -alias39 = "CRTPass" - -shader40 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type40 = viewport -float_framebuffer40 = true -alias40 = "PostCRTPass" +alias38 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader41 = ../../shaders/base/output-sdr.slang -scale_type41 = viewport -alias41 = "OutputPass" +shader39 = ../../shaders/base/output-sdr.slang +scale_type39 = viewport +alias39 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -337,7 +353,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp new file mode 100644 index 0000000..cb903e1 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI-NTSC.slangp @@ -0,0 +1,279 @@ +shaders = 32 + +shader0 = ../../shaders/base/add-params-no-reflect.slang +alias0 = "CorePass" + +shader1 = ../../shaders/base/stock.slang +filter_linear1 = false +srgb_framebuffer1 = true +scale_type1 = source +scale_x1 = 1 +scale_y1 = 1 +alias1 = "DerezedPass" + +shader2 = ../../shaders/base/add-negative-crop-area.slang +filter_linear2 = false +mipmap_input2 = false +srgb_framebuffer2 = true +scale_type2 = source +scale_x2 = 1 +scale_y2 = 1 +alias2 = "NegativeCropAddedPass" + +shader3 = ../../shaders/base/cache-info-no-reflect-params.slang +filter_linear3 = false +scale_type3 = source +scale3 = 1.0 +alias3 = "InfoCachePass" + +shader4 = ../../shaders/base/text-adv-no-reflect.slang +filter_linear4 = false +float_framebuffer4 = true +scale_type4 = source +scale4 = 1.0 +alias4 = "TextPass" + +shader5 = ../../shaders/base/intro.slang +filter_linear5 = false +float_framebuffer5 = true +scale_type5 = source +scale5 = 1.0 +alias5 = "IntroPass" + +shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang +alias6 = LinearGamma + +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 + +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 + +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output + +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 + +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 + +// Color Correction with Dogway's awesome Grade shader +// Grade is after Afterglow so that brightening the black level does not break the afterglow +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang +filter_linear21 = false +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 + +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 + +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 + +shader25 = ../../shaders/base/stock.slang +filter_linear25 = true +scale_type25 = source +scale_x25 = 1.0 +scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true + +shader26 = ../../shaders/guest/hsm-avg-lum.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" + +// Pass referenced by subsequent blurring passes and crt pass +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/base/delinearize.slang +scale_type28 = source +float_framebuffer28 = "true" + +shader29 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang +scale_type29 = viewport +scale_x29 = 1.0 +scale_y29 = 1.0 +filter_linear29 = true +float_framebuffer29 = "true" +alias29 = "CRTPass" + +g_sat = 0.15 +g_gamma_out = 2.45 + +shader30 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "PostCRTPass" + +// Combine Passes ---------------------------------------------------------------- +shader31 = ../../shaders/base/output-sdr.slang +scale_type31 = viewport +alias31 = "OutputPass" +// Define textures to be used by the different passes +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" + +SamplerLUT1 = ../../shaders/guest/lut/trinitron-lut.png +SamplerLUT1_linear = true +SamplerLUT2 = ../../shaders/guest/lut/inv-trinitron-lut.png +SamplerLUT2_linear = true +SamplerLUT3 = ../../shaders/guest/lut/nec-lut.png +SamplerLUT3_linear = true +SamplerLUT4 = ../../shaders/guest/lut/ntsc-lut.png +SamplerLUT4_linear = true + +IntroImage = ../../shaders/textures/IntroImage_MegaBezelLogo.png +IntroImage_linear = true +IntroImage_mipmap = 1 + +ScreenPlacementImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +ScreenPlacementImage_linear = false + +TubeDiffuseImage = ../../shaders/textures/Tube_Diffuse_2390x1792.png +TubeDiffuseImage_linear = true +TubeDiffuseImage_mipmap = 1 + +TubeColoredGelImage = ../../shaders/textures/Colored_Gel_Rainbow.png +TubeColoredGelImage_linear = true +TubeColoredGelImage_mipmap = 1 + +TubeShadowImage = ../../shaders/textures/Tube_Shadow_1600x1200.png +TubeShadowImage_linear = true +TubeShadowImage_mipmap = 1 + +TubeStaticReflectionImage = ../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png +TubeStaticReflectionImage_linear = true +TubeStaticReflectionImage_mipmap = 1 + +ReflectionMaskImage = ../../shaders/textures/Placeholder_White_16x16.png +ReflectionMaskImage_linear = true +ReflectionMaskImage_mipmap = 1 + +FrameTextureImage = ../../shaders/textures/FrameTexture_2800x2120.png +FrameTextureImage_linear = true +FrameTextureImage_mipmap = 1 + +BackgroundImage = ../../shaders/textures/BackgroundImage_Carbon_3840x2160.png +BackgroundImage_linear = true +BackgroundImage_mipmap = 1 + +BackgroundVertImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +BackgroundVertImage_linear = true +BackgroundVertImage_mipmap = 1 + +CabinetGlassImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +CabinetGlassImage_linear = true +CabinetGlassImage_mipmap = 1 + +DeviceImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DeviceImage_linear = true +DeviceImage_mipmap = 1 + +DeviceVertImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DeviceVertImage_linear = true +DeviceVertImage_mipmap = 1 + +DeviceLEDImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DeviceLEDImage_linear = true +DeviceLEDImage_mipmap = 1 + +DecalImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DecalImage_linear = true +DecalImage_mipmap = 1 + +NightLightingImage = ../../shaders/textures/NightLightingClose_1920x1080.png +NightLightingImage_linear = true +NightLightingImage_mipmap = 1 + +NightLighting2Image = ../../shaders/textures/NightLightingFar_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + +LEDImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +LEDImage_linear = true +LEDImage_mipmap = 1 + +TopLayerImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +TopLayerImage_linear = true +TopLayerImage_mipmap = 1 + +// Use for matching vanilla GDV-Advanced +// HSM_ASPECT_RATIO_MODE = 6 +// HSM_CURVATURE_MODE = 0 + +// NTSC Parameters +GAMMA_INPUT = 2.0 +gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp new file mode 100644 index 0000000..5206f99 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-MINI.slangp @@ -0,0 +1,260 @@ +shaders = 30 + +shader0 = ../../shaders/base/add-params-no-reflect.slang +alias0 = "CorePass" + +shader1 = ../../shaders/base/stock.slang +filter_linear1 = false +srgb_framebuffer1 = true +scale_type1 = source +scale_x1 = 1 +scale_y1 = 1 +alias1 = "DerezedPass" + +shader2 = ../../shaders/base/add-negative-crop-area.slang +filter_linear2 = false +mipmap_input2 = false +srgb_framebuffer2 = true +scale_type2 = source +scale_x2 = 1 +scale_y2 = 1 +alias2 = "NegativeCropAddedPass" + +shader3 = ../../shaders/base/cache-info-no-reflect-params.slang +filter_linear3 = false +scale_type3 = source +scale3 = 1.0 +alias3 = "InfoCachePass" + +shader4 = ../../shaders/base/text-adv-no-reflect.slang +filter_linear4 = false +float_framebuffer4 = true +scale_type4 = source +scale4 = 1.0 +alias4 = "TextPass" + +shader5 = ../../shaders/base/intro.slang +filter_linear5 = false +float_framebuffer5 = true +scale_type5 = source +scale5 = 1.0 +alias5 = "IntroPass" + +shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang +alias6 = LinearGamma + +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 + +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 + +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output + +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 + +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +// GTU TV Processing +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true + +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true + +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" + +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" + +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 + +// Color Correction with Dogway's awesome Grade shader +// Grade is after Afterglow so that brightening the black level does not break the afterglow +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" + +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang +filter_linear24 = true +scale_type24 = source +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" + +// Pass referenced by subsequent blurring passes and crt pass +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" + +shader26 = ../../shaders/base/delinearize.slang +scale_type26 = source +float_framebuffer26 = "true" + +shader27 = ../../shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang +scale_type27 = viewport +scale_x27 = 1.0 +scale_y27 = 1.0 +filter_linear27 = true +float_framebuffer27 = "true" +alias27 = "CRTPass" + +g_sat = 0.15 +g_gamma_out = 2.45 + +shader28 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "PostCRTPass" + +// Combine Passes ---------------------------------------------------------------- +shader29 = ../../shaders/base/output-sdr.slang +scale_type29 = viewport +alias29 = "OutputPass" +// Define textures to be used by the different passes +textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" + +SamplerLUT1 = ../../shaders/guest/lut/trinitron-lut.png +SamplerLUT1_linear = true +SamplerLUT2 = ../../shaders/guest/lut/inv-trinitron-lut.png +SamplerLUT2_linear = true +SamplerLUT3 = ../../shaders/guest/lut/nec-lut.png +SamplerLUT3_linear = true +SamplerLUT4 = ../../shaders/guest/lut/ntsc-lut.png +SamplerLUT4_linear = true + +IntroImage = ../../shaders/textures/IntroImage_MegaBezelLogo.png +IntroImage_linear = true +IntroImage_mipmap = 1 + +ScreenPlacementImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +ScreenPlacementImage_linear = false + +TubeDiffuseImage = ../../shaders/textures/Tube_Diffuse_2390x1792.png +TubeDiffuseImage_linear = true +TubeDiffuseImage_mipmap = 1 + +TubeColoredGelImage = ../../shaders/textures/Colored_Gel_Rainbow.png +TubeColoredGelImage_linear = true +TubeColoredGelImage_mipmap = 1 + +TubeShadowImage = ../../shaders/textures/Tube_Shadow_1600x1200.png +TubeShadowImage_linear = true +TubeShadowImage_mipmap = 1 + +TubeStaticReflectionImage = ../../shaders/textures/TubeGlassOverlayImageCropped_1440x1080.png +TubeStaticReflectionImage_linear = true +TubeStaticReflectionImage_mipmap = 1 + +ReflectionMaskImage = ../../shaders/textures/Placeholder_White_16x16.png +ReflectionMaskImage_linear = true +ReflectionMaskImage_mipmap = 1 + +FrameTextureImage = ../../shaders/textures/FrameTexture_2800x2120.png +FrameTextureImage_linear = true +FrameTextureImage_mipmap = 1 + +BackgroundImage = ../../shaders/textures/BackgroundImage_Carbon_3840x2160.png +BackgroundImage_linear = true +BackgroundImage_mipmap = 1 + +BackgroundVertImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +BackgroundVertImage_linear = true +BackgroundVertImage_mipmap = 1 + +CabinetGlassImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +CabinetGlassImage_linear = true +CabinetGlassImage_mipmap = 1 + +DeviceImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DeviceImage_linear = true +DeviceImage_mipmap = 1 + +DeviceVertImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DeviceVertImage_linear = true +DeviceVertImage_mipmap = 1 + +DeviceLEDImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DeviceLEDImage_linear = true +DeviceLEDImage_mipmap = 1 + +DecalImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +DecalImage_linear = true +DecalImage_mipmap = 1 + +NightLightingImage = ../../shaders/textures/NightLightingClose_1920x1080.png +NightLightingImage_linear = true +NightLightingImage_mipmap = 1 + +NightLighting2Image = ../../shaders/textures/NightLightingFar_1920x1080.png +NightLighting2Image_linear = true +NightLighting2Image_mipmap = 1 + +LEDImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +LEDImage_linear = true +LEDImage_mipmap = 1 + +TopLayerImage = ../../shaders/textures/Placeholder_Transparent_16x16.png +TopLayerImage_linear = true +TopLayerImage_mipmap = 1 + +// Use for matching vanilla GDV-Advanced +// HSM_ASPECT_RATIO_MODE = 6 +// HSM_CURVATURE_MODE = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp index 8aacc4d..b91c4a7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 39 +shaders = 37 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,170 +43,186 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader25 = ../../shaders/base/stock.slang filter_linear25 = true scale_type25 = source scale_x25 = 1.0 scale_y25 = 1.0 +alias25 = "PrePass" +mipmap_input25 = true -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -filter_linear27 = true -scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 -alias27 = "PrePass" -mipmap_input27 = true - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" + +shader28 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear28 = true +scale_type_x28 = viewport +scale_x28 = 1.0 +scale_type_y28 = source +scale_y28 = 1.0 +float_framebuffer28 = true +alias28 = Pass1 + +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear29 = true -scale_type29 = source -scale29 = 1.0 +scale_type_x29 = absolute +scale_x29 = 640.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = "LinearizePass" -shader30 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear30 = true -scale_type_x30 = viewport -scale_x30 = 1.0 -scale_type_y30 = source -scale_y30 = 1.0 +scale_type_x30 = absolute +scale_x30 = 640.0 +scale_type_y30 = absolute +scale_y30 = 480.0 float_framebuffer30 = true -alias30 = Pass1 +alias30 = "GlowPass" -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 640.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 480.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true scale_type_x32 = absolute scale_x32 = 640.0 scale_type_y32 = absolute scale_y32 = 480.0 float_framebuffer32 = true -alias32 = "GlowPass" +alias32 = "BloomPass" -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 640.0 -scale_type_y33 = absolute -scale_y33 = 480.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence.slang filter_linear34 = true -scale_type_x34 = absolute -scale_x34 = 640.0 -scale_type_y34 = absolute -scale_y34 = 480.0 +scale_type34 = viewport +scale_x34 = 1.0 +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "BloomPass" +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader38 = ../../shaders/base/output-sdr.slang -scale_type38 = viewport -alias38 = "OutputPass" +shader36 = ../../shaders/base/output-sdr.slang +scale_type36 = viewport +alias36 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -301,3 +317,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp index e68ebb1..5399267 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 36 +shaders = 34 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,149 +43,165 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 +alias23 = "PrePass" +mipmap_input23 = true + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 -alias25 = "PrePass" -mipmap_input25 = true - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" -shader28 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader26 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear26 = true +scale_type_x26 = absolute +scale_x26 = 800.0 +scale_type_y26 = source +scale_y26 = 1.0 +float_framebuffer26 = true + +shader27 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = absolute +scale_y27 = 600.0 +float_framebuffer27 = true +alias27 = "GlowPass" + +shader28 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear28 = true scale_type_x28 = absolute scale_x28 = 800.0 -scale_type_y28 = source -scale_y28 = 1.0 +scale_type_y28 = absolute +scale_y28 = 600.0 float_framebuffer28 = true -shader29 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader29 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear29 = true -scale_type_x29 = absolute -scale_x29 = 800.0 -scale_type_y29 = absolute -scale_y29 = 600.0 +scale_type_x29 = source +scale_x29 = 1.0 +scale_type_y29 = source +scale_y29 = 1.0 float_framebuffer29 = true -alias29 = "GlowPass" +alias29 = "BloomPass" -shader30 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader30 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type30 = viewport +scale_x30 = 1.0 +scale_y30 = 1.0 float_framebuffer30 = true -shader31 = ../../shaders/guest/hsm-bloom_vertical.slang +shader31 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear31 = true -scale_type_x31 = source +scale_type31 = viewport scale_x31 = 1.0 -scale_type_y31 = source scale_y31 = 1.0 float_framebuffer31 = true -alias31 = "BloomPass" +alias31 = "CRTPass" -shader32 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear32 = true +shader32 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input32 = true scale_type32 = viewport -scale_x32 = 1.0 -scale_y32 = 1.0 float_framebuffer32 = true - -shader33 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear33 = true -scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 -float_framebuffer33 = true -alias33 = "CRTPass" - -shader34 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "PostCRTPass" +alias32 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader35 = ../../shaders/base/output-sdr.slang -scale_type35 = viewport -alias35 = "OutputPass" +shader33 = ../../shaders/base/output-sdr.slang +scale_type33 = viewport +alias33 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp index 8399192..67526ae 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 35 +shaders = 33 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,137 +43,153 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/base/stock.slang -alias18 = "PreCRTPass" +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader19 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear19 = true -scale_type19 = source -scale19 = 1.0 -alias19 = "AfterglowPass" +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear20 = true -scale_type20 = source -mipmap_input20 = true -scale20 = 1.0 +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" + +shader16 = ../../shaders/base/stock.slang +alias16 = "PreCRTPass" + +shader17 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear17 = true +scale_type17 = source +scale17 = 1.0 +alias17 = "AfterglowPass" + +shader18 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear18 = true +scale_type18 = source +mipmap_input18 = true +scale18 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader21 = ../../shaders/dogway/hsm-grade.slang +shader19 = ../../shaders/dogway/hsm-grade.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +alias19 = "ColorCorrectPass" + +shader20 = ../../shaders/base/stock.slang +alias20 = "PrePass0" + +shader21 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear21 = false -scale_type21 = source -scale21 = 1.0 -alias21 = "ColorCorrectPass" +float_framebuffer21 = true +scale_type_x21 = source +scale_type_y21 = source +scale_x21 = 4.0 +scale_y21 = 1.0 +frame_count_mod21 = 2 +alias21 = NPass1 -shader22 = ../../shaders/base/stock.slang -alias22 = "PrePass0" +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer22 = true +filter_linear22 = true +scale_type22 = source +scale_x22 = 0.5 +scale_y22 = 1.0 -shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear23 = false -float_framebuffer23 = true -scale_type_x23 = source -scale_type_y23 = source -scale_x23 = 4.0 +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 scale_y23 = 1.0 -frame_count_mod23 = 2 -alias23 = NPass1 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer24 = true +shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear24 = true scale_type24 = source -scale_x24 = 0.5 +scale_x24 = 1.0 scale_y24 = 1.0 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang -filter_linear25 = true -scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 +shader25 = ../../shaders/base/stock.slang +float_framebuffer25 = true +alias25 = "PrePass" -shader26 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader26 = ../../shaders/guest/hsm-avg-lum.slang filter_linear26 = true scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 - -shader27 = ../../shaders/base/stock.slang -float_framebuffer27 = true -alias27 = "PrePass" - -shader28 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -mipmap_input28 = true -float_framebuffer28 = true -alias28 = "AvgLumPass" +scale26 = 1.0 +mipmap_input26 = true +float_framebuffer26 = true +alias26 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader29 = ../../shaders/guest/hsm-interlace.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -float_framebuffer29 = true -alias29 = "LinearizePass" +shader27 = ../../shaders/guest/hsm-interlace.slang +filter_linear27 = true +scale_type27 = source +scale27 = 1.0 +float_framebuffer27 = true +alias27 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader30 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear28 = "false" +scale_type28 = "source" +scale28 = "1.0" +wrap_mode28 = "clamp_to_border" +mipmap_input28 = "false" +alias28 = "SourceSDR" +float_framebuffer28 = "true" + +shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear29 = "false" +scale_type29 = "source" +scale29 = "1.0" +wrap_mode29 = "clamp_to_border" +mipmap_input29 = "false" +alias29 = "SourceHDR" +float_framebuffer29 = "true" + +shader30 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear30 = "false" -scale_type30 = "source" -scale30 = "1.0" wrap_mode30 = "clamp_to_border" mipmap_input30 = "false" -alias30 = "SourceSDR" +scale_type30 = "viewport" float_framebuffer30 = "true" +alias30 = "CRTPass" -shader31 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear31 = "false" -scale_type31 = "source" -scale31 = "1.0" -wrap_mode31 = "clamp_to_border" -mipmap_input31 = "false" -alias31 = "SourceHDR" -float_framebuffer31 = "true" - -shader32 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear32 = "false" -wrap_mode32 = "clamp_to_border" -mipmap_input32 = "false" -scale_type32 = "viewport" -float_framebuffer32 = "true" -alias32 = "CRTPass" - -shader33 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type33 = viewport -float_framebuffer33 = true -alias33 = "PostCRTPass" +shader31 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input31 = true +scale_type31 = viewport +float_framebuffer31 = true +alias31 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader34 = ../../shaders/base/output-hdr.slang -scale_type34 = viewport -alias34 = "OutputPass" +shader32 = ../../shaders/base/output-hdr.slang +scale_type32 = viewport +alias32 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -276,3 +292,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp index 7aab6cc..ba19b03 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__MEGATRON.slangp @@ -1,4 +1,4 @@ -shaders = 33 +shaders = 31 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,125 +43,141 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias17 = "DeditherPass" +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false + +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader14 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias14 = "DeditherPass" + +shader15 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias15 = "DeditherPass" // GTU TV Processing -shader18 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type18 = source -scale18 = 1.0 -float_framebuffer18 = true +shader16 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type16 = source +scale16 = 1.0 +float_framebuffer16 = true -shader19 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x19 = source -scale_x19 = 1.0 -scale_type_y19 = source -scale_y19 = 1.0 -filter_linear19 = false -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x17 = source +scale_x17 = 1.0 +scale_type_y17 = source +scale_y17 = 1.0 +filter_linear17 = false +float_framebuffer17 = true -shader20 = ../../shaders/base/stock.slang -alias20 = "PreCRTPass" +shader18 = ../../shaders/base/stock.slang +alias18 = "PreCRTPass" -shader21 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear21 = true -scale_type21 = source -scale21 = 1.0 -alias21 = "AfterglowPass" +shader19 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear19 = true +scale_type19 = source +scale19 = 1.0 +alias19 = "AfterglowPass" -shader22 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear22 = true -scale_type22 = source -mipmap_input22 = true -scale22 = 1.0 +shader20 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear20 = true +scale_type20 = source +mipmap_input20 = true +scale20 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader23 = ../../shaders/dogway/hsm-grade.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 -alias23 = "ColorCorrectPass" +shader21 = ../../shaders/dogway/hsm-grade.slang +filter_linear21 = false +scale_type21 = source +scale21 = 1.0 +alias21 = "ColorCorrectPass" -shader24 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader22 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear22 = true +scale_type22 = source +scale_x22 = 1.0 +scale_y22 = 1.0 + +shader23 = ../../shaders/base/stock.slang +float_framebuffer23 = true +alias23 = "PrePass" + +shader24 = ../../shaders/guest/hsm-avg-lum.slang filter_linear24 = true scale_type24 = source -scale_x24 = 1.0 -scale_y24 = 1.0 - -shader25 = ../../shaders/base/stock.slang -float_framebuffer25 = true -alias25 = "PrePass" - -shader26 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -mipmap_input26 = true -float_framebuffer26 = true -alias26 = "AvgLumPass" +scale24 = 1.0 +mipmap_input24 = true +float_framebuffer24 = true +alias24 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader27 = ../../shaders/guest/hsm-interlace.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -float_framebuffer27 = true -alias27 = "LinearizePass" +shader25 = ../../shaders/guest/hsm-interlace.slang +filter_linear25 = true +scale_type25 = source +scale25 = 1.0 +float_framebuffer25 = true +alias25 = "LinearizePass" feedback_pass = "0" // Sony Megatron Colour Video Monitor by Major Pain The Cactus -shader28 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +shader26 = "../../shaders/megatron/crt-sony-megatron-source-pass.slang" +filter_linear26 = "false" +scale_type26 = "source" +scale26 = "1.0" +wrap_mode26 = "clamp_to_border" +mipmap_input26 = "false" +alias26 = "SourceSDR" +float_framebuffer26 = "true" + +shader27 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" +filter_linear27 = "false" +scale_type27 = "source" +scale27 = "1.0" +wrap_mode27 = "clamp_to_border" +mipmap_input27 = "false" +alias27 = "SourceHDR" +float_framebuffer27 = "true" + +shader28 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" filter_linear28 = "false" -scale_type28 = "source" -scale28 = "1.0" wrap_mode28 = "clamp_to_border" mipmap_input28 = "false" -alias28 = "SourceSDR" +scale_type28 = "viewport" float_framebuffer28 = "true" +alias28 = "CRTPass" -shader29 = "../../shaders/megatron/crt-sony-megatron-hdr-pass.slang" -filter_linear29 = "false" -scale_type29 = "source" -scale29 = "1.0" -wrap_mode29 = "clamp_to_border" -mipmap_input29 = "false" -alias29 = "SourceHDR" -float_framebuffer29 = "true" - -shader30 = "../../shaders/megatron/crt-sony-megatron-no-reflect.slang" -filter_linear30 = "false" -wrap_mode30 = "clamp_to_border" -mipmap_input30 = "false" -scale_type30 = "viewport" -float_framebuffer30 = "true" -alias30 = "CRTPass" - -shader31 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type31 = viewport -float_framebuffer31 = true -alias31 = "PostCRTPass" +shader29 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader32 = ../../shaders/base/output-hdr.slang -scale_type32 = viewport -alias32 = "OutputPass" +shader30 = ../../shaders/base/output-hdr.slang +scale_type30 = viewport +alias30 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp index 0446fce..0f5869b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 49 +shaders = 47 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,241 +122,218 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" + +shader25 = ../../shaders/base/stock.slang +alias25 = "PrePass0" + +shader26 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +float_framebuffer26 = true +scale_type_x26 = source +scale_type_y26 = source +scale_x26 = 4.0 +scale_y26 = 1.0 +frame_count_mod26 = 2 +alias26 = NPass1 -shader27 = ../../shaders/base/stock.slang -alias27 = "PrePass0" +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer27 = true +filter_linear27 = true +scale_type27 = source +scale_x27 = 0.5 +scale_y27 = 1.0 -shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear28 = false -float_framebuffer28 = true -scale_type_x28 = source -scale_type_y28 = source -scale_x28 = 4.0 +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 scale_y28 = 1.0 -frame_count_mod28 = 2 -alias28 = NPass1 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer29 = true +shader29 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear29 = true scale_type29 = source -scale_x29 = 0.5 +scale_x29 = 1.0 scale_y29 = 1.0 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader30 = ../../shaders/base/stock.slang filter_linear30 = true scale_type30 = source scale_x30 = 1.0 scale_y30 = 1.0 +alias30 = "PrePass" +mipmap_input30 = true -shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader31 = ../../shaders/guest/hsm-avg-lum.slang filter_linear31 = true scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 - -shader32 = ../../shaders/base/stock.slang -filter_linear32 = true -scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 -alias32 = "PrePass" -mipmap_input32 = true - -shader33 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -mipmap_input33 = true -alias33 = "AvgLumPass" +scale31 = 1.0 +mipmap_input31 = true +alias31 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader32 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear32 = true +scale_type32 = source +scale32 = 1.0 +float_framebuffer32 = true +alias32 = "LinearizePass" + +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear33 = true +scale_type_x33 = viewport +scale_x33 = 1.0 +scale_type_y33 = source +scale_y33 = 1.0 +float_framebuffer33 = true +alias33 = Pass1 + +shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear34 = true -scale_type34 = source -scale34 = 1.0 +scale_type_x34 = absolute +scale_x34 = 640.0 +scale_type_y34 = source +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "LinearizePass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear35 = true -scale_type_x35 = viewport -scale_x35 = 1.0 -scale_type_y35 = source -scale_y35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = absolute +scale_y35 = 480.0 float_framebuffer35 = true -alias35 = Pass1 +alias35 = GlowPass -shader36 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear36 = true scale_type_x36 = absolute scale_x36 = 640.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader37 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 scale_type_y37 = absolute scale_y37 = 480.0 float_framebuffer37 = true -alias37 = GlowPass +alias37 = BloomPass -shader38 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader38 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear38 = true -scale_type_x38 = absolute -scale_x38 = 640.0 -scale_type_y38 = absolute -scale_y38 = 480.0 +scale_type38 = viewport +scale_x38 = 1.0 +scale_y38 = 1.0 float_framebuffer38 = true -shader39 = ../../shaders/guest/hsm-bloom_vertical.slang +shader39 = ../../shaders/guest/hsm-deconvergence.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -alias39 = BloomPass +alias39 = "CRTPass" -shader40 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear40 = true +shader40 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input40 = true scale_type40 = viewport -scale_x40 = 1.0 -scale_y40 = 1.0 float_framebuffer40 = true - -shader41 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear41 = true -scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 -float_framebuffer41 = true -alias41 = "CRTPass" - -shader42 = ../../shaders/base/post-crt-prep-glass.slang -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "PostCRTPass" +alias40 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader43 = ../../shaders/base/linearize-crt.slang -mipmap_input43 = true -filter_linear43 = true -scale_type43 = absolute -// scale_x43 = 480 -// scale_y43 = 270 -// scale_x43 = 960 -// scale_y43 = 540 -scale_x43 = 800 -scale_y43 = 600 -float_framebuffer43 = true -alias43 = "BR_MirrorLowResPass" +shader41 = ../../shaders/base/linearize-crt.slang +mipmap_input41 = true +filter_linear41 = true +scale_type41 = absolute +// scale_x41 = 480 +// scale_y41 = 270 +// scale_x41 = 960 +// scale_y41 = 540 +scale_x41 = 800 +scale_y41 = 600 +float_framebuffer41 = true +alias41 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader44 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input44 = true -filter_linear44 = true -float_framebuffer44 = true +shader42 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input42 = true +filter_linear42 = true +float_framebuffer42 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader45 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear45 = true -float_framebuffer45 = true -alias45 = "BR_MirrorBlurredPass" +shader43 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear43 = true +float_framebuffer43 = true +alias43 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader46 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input46 = true -filter_linear46 = true -scale_type46 = absolute -scale_x46 = 128 -scale_y46 = 128 -float_framebuffer46 = true -alias46 = "BR_MirrorReflectionDiffusedPass" +shader44 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input44 = true +filter_linear44 = true +scale_type44 = absolute +scale_x44 = 128 +scale_y44 = 128 +float_framebuffer44 = true +alias44 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader47 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input47 = true -filter_linear47 = true -scale_type47 = absolute -scale_x47 = 12 -scale_y47 = 12 -float_framebuffer47 = true -alias47 = "BR_MirrorFullscreenGlowPass" +shader45 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input45 = true +filter_linear45 = true +scale_type45 = absolute +scale_x45 = 12 +scale_y45 = 12 +float_framebuffer45 = true +alias45 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader48 = ../../shaders/base/reflection-glass.slang -scale_type48 = viewport -srgb_framebuffer48 = true -alias48 = "ReflectionPass" +shader46 = ../../shaders/base/reflection-glass.slang +scale_type46 = viewport +srgb_framebuffer46 = true +alias46 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -448,9 +464,11 @@ g_vignette = "0.0" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp index 1a704dc..eb6d72f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 44 +shaders = 42 shader0 = ../../shaders/base/add-params-glass.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,206 +122,183 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang -filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" -shader27 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear25 = true +scale_type25 = source +scale_x25 = 1.0 +scale_y25 = 1.0 + +shader26 = ../../shaders/base/stock.slang +filter_linear26 = true +scale_type26 = source +scale_x26 = 1.0 +scale_y26 = 1.0 +alias26 = "PrePass" +mipmap_input26 = true + +shader27 = ../../shaders/guest/hsm-avg-lum.slang filter_linear27 = true scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 - -shader28 = ../../shaders/base/stock.slang -filter_linear28 = true -scale_type28 = source -scale_x28 = 1.0 -scale_y28 = 1.0 -alias28 = "PrePass" -mipmap_input28 = true - -shader29 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -mipmap_input29 = true -alias29 = "AvgLumPass" +scale27 = 1.0 +mipmap_input27 = true +alias27 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader30 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear30 = true -scale_type30 = source -scale30 = 1.0 -float_framebuffer30 = true -alias30 = "LinearizePass" +shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +float_framebuffer28 = true +alias28 = "LinearizePass" -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear29 = true +scale_type_x29 = absolute +scale_x29 = 800.0 +scale_type_y29 = source +scale_y29 = 1.0 +float_framebuffer29 = true + +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear30 = true +scale_type_x30 = absolute +scale_x30 = 800.0 +scale_type_y30 = absolute +scale_y30 = 600.0 +float_framebuffer30 = true +alias30 = GlowPass + +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 800.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 600.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true -scale_type_x32 = absolute -scale_x32 = 800.0 -scale_type_y32 = absolute -scale_y32 = 600.0 +scale_type_x32 = source +scale_x32 = 1.0 +scale_type_y32 = source +scale_y32 = 1.0 float_framebuffer32 = true -alias32 = GlowPass +alias32 = BloomPass -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 800.0 -scale_type_y33 = absolute -scale_y33 = 600.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence.slang filter_linear34 = true -scale_type_x34 = source +scale_type34 = viewport scale_x34 = 1.0 -scale_type_y34 = source scale_y34 = 1.0 float_framebuffer34 = true -alias34 = BloomPass +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-glass.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader38 = ../../shaders/base/linearize-crt.slang -mipmap_input38 = true -filter_linear38 = true -scale_type38 = absolute -// scale_x38 = 480 -// scale_y38 = 270 -// scale_x38 = 960 -// scale_y38 = 540 -scale_x38 = 800 -scale_y38 = 600 -float_framebuffer38 = true -alias38 = "BR_MirrorLowResPass" +shader36 = ../../shaders/base/linearize-crt.slang +mipmap_input36 = true +filter_linear36 = true +scale_type36 = absolute +// scale_x36 = 480 +// scale_y36 = 270 +// scale_x36 = 960 +// scale_y36 = 540 +scale_x36 = 800 +scale_y36 = 600 +float_framebuffer36 = true +alias36 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader39 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input39 = true -filter_linear39 = true -float_framebuffer39 = true +shader37 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input37 = true +filter_linear37 = true +float_framebuffer37 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader40 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear40 = true -float_framebuffer40 = true -alias40 = "BR_MirrorBlurredPass" +shader38 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear38 = true +float_framebuffer38 = true +alias38 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader41 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input41 = true -filter_linear41 = true -scale_type41 = absolute -scale_x41 = 128 -scale_y41 = 128 -float_framebuffer41 = true -alias41 = "BR_MirrorReflectionDiffusedPass" +shader39 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input39 = true +filter_linear39 = true +scale_type39 = absolute +scale_x39 = 128 +scale_y39 = 128 +float_framebuffer39 = true +alias39 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader42 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input42 = true -filter_linear42 = true -scale_type42 = absolute -scale_x42 = 12 -scale_y42 = 12 -float_framebuffer42 = true -alias42 = "BR_MirrorFullscreenGlowPass" +shader40 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input40 = true +filter_linear40 = true +scale_type40 = absolute +scale_x40 = 12 +scale_y40 = 12 +float_framebuffer40 = true +alias40 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader43 = ../../shaders/base/reflection-glass.slang -scale_type43 = viewport -srgb_framebuffer43 = true -alias43 = "ReflectionPass" +shader41 = ../../shaders/base/reflection-glass.slang +scale_type41 = viewport +srgb_framebuffer41 = true +alias41 = "ReflectionPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -411,7 +427,7 @@ HSM_SCREEN_VIGNETTE_IN_REFLECTION = "0.000000" g_vignette = "0.0" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp index 083d2a5..ffa0ec7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI-NTSC.slangp @@ -137,6 +137,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader21 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" @@ -329,3 +330,6 @@ g_vignette = "0.0" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp index bcf2505..7a58bda 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-MINI.slangp @@ -111,6 +111,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader17 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp index 1baea79..57152ae 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV-NTSC.slangp @@ -164,7 +164,7 @@ scale_y23 = 480.0 float_framebuffer23 = true alias23 = BloomPass -shader24 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang +shader24 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear24 = true scale_type24 = viewport scale_x24 = 1.0 @@ -180,6 +180,7 @@ float_framebuffer25 = true alias25 = "CRTPass" shader26 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input26 = true scale_type26 = viewport float_framebuffer26 = true alias26 = "PostCRTPass" @@ -372,3 +373,6 @@ g_vignette = "0.0" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp index 39a0488..26bed0b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__GDV.slangp @@ -145,6 +145,7 @@ float_framebuffer20 = true alias20 = "CRTPass" shader21 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp index 54aa304..7c27b2c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__LCD-GRID.slangp @@ -106,6 +106,7 @@ float_framebuffer16 = "true" alias16 = "CRTPass" shader17 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp index ca241a8..7cde32f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON-NTSC.slangp @@ -147,6 +147,7 @@ float_framebuffer21 = "true" alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" @@ -351,3 +352,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp index cca93d2..2bc9b86 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-GLASS__MEGATRON.slangp @@ -121,6 +121,7 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-glass.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp index b569276..8e375d9 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV-NTSC.slangp @@ -164,7 +164,7 @@ scale_y23 = 480.0 float_framebuffer23 = true alias23 = BloomPass -shader24 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang +shader24 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear24 = true scale_type24 = viewport scale_x24 = 1.0 @@ -180,81 +180,82 @@ float_framebuffer25 = true alias25 = "CRTPass" shader26 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input26 = true scale_type26 = viewport float_framebuffer26 = true alias26 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader27 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear27 = true +scale_type27 = viewport +float_framebuffer27 = true +alias27 = "BR_LayersUnderCRTPass" + +shader28 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader27 = ../../shaders/base/linearize-crt.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -// scale_x27 = 480 -// scale_y27 = 270 -// scale_x27 = 960 -// scale_y27 = 540 -scale_x27 = 800 -scale_y27 = 600 -float_framebuffer27 = true -alias27 = "BR_MirrorLowResPass" +shader29 = ../../shaders/base/linearize-crt.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +// scale_x29 = 480 +// scale_y29 = 270 +// scale_x29 = 960 +// scale_y29 = 540 +scale_x29 = 800 +scale_y29 = 600 +float_framebuffer29 = true +alias29 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader28 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input28 = true -filter_linear28 = true -float_framebuffer28 = true +shader30 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input30 = true +filter_linear30 = true +float_framebuffer30 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader29 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear29 = true -float_framebuffer29 = true -alias29 = "BR_MirrorBlurredPass" +shader31 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear31 = true +float_framebuffer31 = true +alias31 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader30 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input30 = true -filter_linear30 = true -scale_type30 = absolute -scale_x30 = 128 -scale_y30 = 128 -float_framebuffer30 = true -alias30 = "BR_MirrorReflectionDiffusedPass" +shader32 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input32 = true +filter_linear32 = true +scale_type32 = absolute +scale_x32 = 128 +scale_y32 = 128 +float_framebuffer32 = true +alias32 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader31 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -scale_x31 = 12 -scale_y31 = 12 -float_framebuffer31 = true -alias31 = "BR_MirrorFullscreenGlowPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 12 +scale_y33 = 12 +float_framebuffer33 = true +alias33 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader32 = ../../shaders/base/reflection.slang -scale_type32 = viewport -alias32 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader33 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear33 = true -scale_type33 = viewport -float_framebuffer33 = true -alias33 = "BR_LayersUnderCRTPass" - -shader34 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear34 = true +shader34 = ../../shaders/base/reflection.slang scale_type34 = viewport -float_framebuffer34 = true -alias34 = "BR_LayersOverCRTPass" +alias34 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader35 = ../../shaders/base/combine-passes.slang @@ -444,9 +445,11 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp index e836623..154b6e0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp @@ -204,81 +204,82 @@ float_framebuffer26 = true alias26 = "CRTPass" shader27 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input27 = true scale_type27 = viewport float_framebuffer27 = true alias27 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader28 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "BR_LayersUnderCRTPass" + +shader29 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader28 = ../../shaders/base/linearize-crt.slang -mipmap_input28 = true -filter_linear28 = true -scale_type28 = absolute -// scale_x28 = 480 -// scale_y28 = 270 -// scale_x28 = 960 -// scale_y28 = 540 -scale_x28 = 800 -scale_y28 = 600 -float_framebuffer28 = true -alias28 = "BR_MirrorLowResPass" +shader30 = ../../shaders/base/linearize-crt.slang +mipmap_input30 = true +filter_linear30 = true +scale_type30 = absolute +// scale_x30 = 480 +// scale_y30 = 270 +// scale_x30 = 960 +// scale_y30 = 540 +scale_x30 = 800 +scale_y30 = 600 +float_framebuffer30 = true +alias30 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader29 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input29 = true -filter_linear29 = true -float_framebuffer29 = true +shader31 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input31 = true +filter_linear31 = true +float_framebuffer31 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader30 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear30 = true -float_framebuffer30 = true -alias30 = "BR_MirrorBlurredPass" +shader32 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear32 = true +float_framebuffer32 = true +alias32 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader31 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -scale_x31 = 128 -scale_y31 = 128 -float_framebuffer31 = true -alias31 = "BR_MirrorReflectionDiffusedPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 128 +scale_y33 = 128 +float_framebuffer33 = true +alias33 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader32 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input32 = true -filter_linear32 = true -scale_type32 = absolute -scale_x32 = 12 -scale_y32 = 12 -float_framebuffer32 = true -alias32 = "BR_MirrorFullscreenGlowPass" +shader34 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input34 = true +filter_linear34 = true +scale_type34 = absolute +scale_x34 = 12 +scale_y34 = 12 +float_framebuffer34 = true +alias34 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader33 = ../../shaders/base/reflection.slang -scale_type33 = viewport -alias33 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader34 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear34 = true -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "BR_LayersUnderCRTPass" - -shader35 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear35 = true +shader35 = ../../shaders/base/reflection.slang scale_type35 = viewport -float_framebuffer35 = true -alias35 = "BR_LayersOverCRTPass" +alias35 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader36 = ../../shaders/base/combine-passes.slang @@ -376,7 +377,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp index b0c7841..8be00fd 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__EASYMODE.slangp @@ -117,81 +117,82 @@ alias18 = "CRTPass" g_gamma_out = 2.45 shader19 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input19 = true scale_type19 = viewport float_framebuffer19 = true alias19 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader20 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersUnderCRTPass" + +shader21 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear21 = true +scale_type21 = viewport +float_framebuffer21 = true +alias21 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader20 = ../../shaders/base/linearize-crt.slang -mipmap_input20 = true -filter_linear20 = true -scale_type20 = absolute -// scale_x20 = 480 -// scale_y20 = 270 -// scale_x20 = 960 -// scale_y20 = 540 -scale_x20 = 800 -scale_y20 = 600 -float_framebuffer20 = true -alias20 = "BR_MirrorLowResPass" +shader22 = ../../shaders/base/linearize-crt.slang +mipmap_input22 = true +filter_linear22 = true +scale_type22 = absolute +// scale_x22 = 480 +// scale_y22 = 270 +// scale_x22 = 960 +// scale_y22 = 540 +scale_x22 = 800 +scale_y22 = 600 +float_framebuffer22 = true +alias22 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input21 = true -filter_linear21 = true -float_framebuffer21 = true +shader23 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input23 = true +filter_linear23 = true +float_framebuffer23 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader22 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear22 = true -float_framebuffer22 = true -alias22 = "BR_MirrorBlurredPass" +shader24 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear24 = true +float_framebuffer24 = true +alias24 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 128 -scale_y23 = 128 -float_framebuffer23 = true -alias23 = "BR_MirrorReflectionDiffusedPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 128 +scale_y25 = 128 +float_framebuffer25 = true +alias25 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader24 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input24 = true -filter_linear24 = true -scale_type24 = absolute -scale_x24 = 12 -scale_y24 = 12 -float_framebuffer24 = true -alias24 = "BR_MirrorFullscreenGlowPass" +shader26 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input26 = true +filter_linear26 = true +scale_type26 = absolute +scale_x26 = 12 +scale_y26 = 12 +float_framebuffer26 = true +alias26 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader25 = ../../shaders/base/reflection.slang -scale_type25 = viewport -alias25 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader26 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear26 = true -scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersUnderCRTPass" - -shader27 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear27 = true +shader27 = ../../shaders/base/reflection.slang scale_type27 = viewport -float_framebuffer27 = true -alias27 = "BR_LayersOverCRTPass" +alias27 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader28 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp index f0463c7..d753306 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI-NTSC.slangp @@ -137,81 +137,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader21 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader22 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear22 = true +scale_type22 = viewport +float_framebuffer22 = true +alias22 = "BR_LayersUnderCRTPass" + +shader23 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader22 = ../../shaders/base/linearize-crt.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -// scale_x22 = 480 -// scale_y22 = 270 -// scale_x22 = 960 -// scale_y22 = 540 -scale_x22 = 800 -scale_y22 = 600 -float_framebuffer22 = true -alias22 = "BR_MirrorLowResPass" +shader24 = ../../shaders/base/linearize-crt.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +// scale_x24 = 480 +// scale_y24 = 270 +// scale_x24 = 960 +// scale_y24 = 540 +scale_x24 = 800 +scale_y24 = 600 +float_framebuffer24 = true +alias24 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader23 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input23 = true -filter_linear23 = true -float_framebuffer23 = true +shader25 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input25 = true +filter_linear25 = true +float_framebuffer25 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear24 = true -float_framebuffer24 = true -alias24 = "BR_MirrorBlurredPass" +shader26 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear26 = true +float_framebuffer26 = true +alias26 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader25 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input25 = true -filter_linear25 = true -scale_type25 = absolute -scale_x25 = 128 -scale_y25 = 128 -float_framebuffer25 = true -alias25 = "BR_MirrorReflectionDiffusedPass" +shader27 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input27 = true +filter_linear27 = true +scale_type27 = absolute +scale_x27 = 128 +scale_y27 = 128 +float_framebuffer27 = true +alias27 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 12 -scale_y26 = 12 -float_framebuffer26 = true -alias26 = "BR_MirrorFullscreenGlowPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 12 +scale_y28 = 12 +float_framebuffer28 = true +alias28 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader27 = ../../shaders/base/reflection.slang -scale_type27 = viewport -alias27 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader28 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear28 = true -scale_type28 = viewport -float_framebuffer28 = true -alias28 = "BR_LayersUnderCRTPass" - -shader29 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear29 = true +shader29 = ../../shaders/base/reflection.slang scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersOverCRTPass" +alias29 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader30 = ../../shaders/base/combine-passes.slang @@ -311,3 +312,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp index e07d393..ea464e9 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-MINI.slangp @@ -111,81 +111,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader17 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader18 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear18 = true +scale_type18 = viewport +float_framebuffer18 = true +alias18 = "BR_LayersUnderCRTPass" + +shader19 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader18 = ../../shaders/base/linearize-crt.slang -mipmap_input18 = true -filter_linear18 = true -scale_type18 = absolute -// scale_x18 = 480 -// scale_y18 = 270 -// scale_x18 = 960 -// scale_y18 = 540 -scale_x18 = 800 -scale_y18 = 600 -float_framebuffer18 = true -alias18 = "BR_MirrorLowResPass" +shader20 = ../../shaders/base/linearize-crt.slang +mipmap_input20 = true +filter_linear20 = true +scale_type20 = absolute +// scale_x20 = 480 +// scale_y20 = 270 +// scale_x20 = 960 +// scale_y20 = 540 +scale_x20 = 800 +scale_y20 = 600 +float_framebuffer20 = true +alias20 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader19 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input19 = true -filter_linear19 = true -float_framebuffer19 = true +shader21 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input21 = true +filter_linear21 = true +float_framebuffer21 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear20 = true -float_framebuffer20 = true -alias20 = "BR_MirrorBlurredPass" +shader22 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear22 = true +float_framebuffer22 = true +alias22 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader21 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input21 = true -filter_linear21 = true -scale_type21 = absolute -scale_x21 = 128 -scale_y21 = 128 -float_framebuffer21 = true -alias21 = "BR_MirrorReflectionDiffusedPass" +shader23 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input23 = true +filter_linear23 = true +scale_type23 = absolute +scale_x23 = 128 +scale_y23 = 128 +float_framebuffer23 = true +alias23 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 12 -scale_y22 = 12 -float_framebuffer22 = true -alias22 = "BR_MirrorFullscreenGlowPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 12 +scale_y24 = 12 +float_framebuffer24 = true +alias24 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader23 = ../../shaders/base/reflection.slang -scale_type23 = viewport -alias23 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader24 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear24 = true -scale_type24 = viewport -float_framebuffer24 = true -alias24 = "BR_LayersUnderCRTPass" - -shader25 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear25 = true +shader25 = ../../shaders/base/reflection.slang scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersOverCRTPass" +alias25 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader26 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp index e56de28..0df3a09 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV-NTSC.slangp @@ -164,7 +164,7 @@ scale_y23 = 480.0 float_framebuffer23 = true alias23 = BloomPass -shader24 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang +shader24 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear24 = true scale_type24 = viewport scale_x24 = 1.0 @@ -180,81 +180,82 @@ float_framebuffer25 = true alias25 = "CRTPass" shader26 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input26 = true scale_type26 = viewport float_framebuffer26 = true alias26 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader27 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear27 = true +scale_type27 = viewport +float_framebuffer27 = true +alias27 = "BR_LayersUnderCRTPass" + +shader28 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader27 = ../../shaders/base/linearize-crt.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -// scale_x27 = 480 -// scale_y27 = 270 -// scale_x27 = 960 -// scale_y27 = 540 -scale_x27 = 800 -scale_y27 = 600 -float_framebuffer27 = true -alias27 = "BR_MirrorLowResPass" +shader29 = ../../shaders/base/linearize-crt.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +// scale_x29 = 480 +// scale_y29 = 270 +// scale_x29 = 960 +// scale_y29 = 540 +scale_x29 = 800 +scale_y29 = 600 +float_framebuffer29 = true +alias29 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader28 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input28 = true -filter_linear28 = true -float_framebuffer28 = true +shader30 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input30 = true +filter_linear30 = true +float_framebuffer30 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader29 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear29 = true -float_framebuffer29 = true -alias29 = "BR_MirrorBlurredPass" +shader31 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear31 = true +float_framebuffer31 = true +alias31 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader30 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input30 = true -filter_linear30 = true -scale_type30 = absolute -scale_x30 = 128 -scale_y30 = 128 -float_framebuffer30 = true -alias30 = "BR_MirrorReflectionDiffusedPass" +shader32 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input32 = true +filter_linear32 = true +scale_type32 = absolute +scale_x32 = 128 +scale_y32 = 128 +float_framebuffer32 = true +alias32 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader31 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -scale_x31 = 12 -scale_y31 = 12 -float_framebuffer31 = true -alias31 = "BR_MirrorFullscreenGlowPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 12 +scale_y33 = 12 +float_framebuffer33 = true +alias33 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader32 = ../../shaders/base/reflection.slang -scale_type32 = viewport -alias32 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader33 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear33 = true -scale_type33 = viewport -float_framebuffer33 = true -alias33 = "BR_LayersUnderCRTPass" - -shader34 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear34 = true +shader34 = ../../shaders/base/reflection.slang scale_type34 = viewport -float_framebuffer34 = true -alias34 = "BR_LayersOverCRTPass" +alias34 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader35 = ../../shaders/base/combine-passes.slang @@ -444,3 +445,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp index 6c49161..5aa1491 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__GDV.slangp @@ -145,81 +145,82 @@ float_framebuffer20 = true alias20 = "CRTPass" shader21 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader22 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear22 = true +scale_type22 = viewport +float_framebuffer22 = true +alias22 = "BR_LayersUnderCRTPass" + +shader23 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader22 = ../../shaders/base/linearize-crt.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -// scale_x22 = 480 -// scale_y22 = 270 -// scale_x22 = 960 -// scale_y22 = 540 -scale_x22 = 800 -scale_y22 = 600 -float_framebuffer22 = true -alias22 = "BR_MirrorLowResPass" +shader24 = ../../shaders/base/linearize-crt.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +// scale_x24 = 480 +// scale_y24 = 270 +// scale_x24 = 960 +// scale_y24 = 540 +scale_x24 = 800 +scale_y24 = 600 +float_framebuffer24 = true +alias24 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader23 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input23 = true -filter_linear23 = true -float_framebuffer23 = true +shader25 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input25 = true +filter_linear25 = true +float_framebuffer25 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear24 = true -float_framebuffer24 = true -alias24 = "BR_MirrorBlurredPass" +shader26 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear26 = true +float_framebuffer26 = true +alias26 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader25 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input25 = true -filter_linear25 = true -scale_type25 = absolute -scale_x25 = 128 -scale_y25 = 128 -float_framebuffer25 = true -alias25 = "BR_MirrorReflectionDiffusedPass" +shader27 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input27 = true +filter_linear27 = true +scale_type27 = absolute +scale_x27 = 128 +scale_y27 = 128 +float_framebuffer27 = true +alias27 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 12 -scale_y26 = 12 -float_framebuffer26 = true -alias26 = "BR_MirrorFullscreenGlowPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 12 +scale_y28 = 12 +float_framebuffer28 = true +alias28 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader27 = ../../shaders/base/reflection.slang -scale_type27 = viewport -alias27 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader28 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear28 = true -scale_type28 = viewport -float_framebuffer28 = true -alias28 = "BR_LayersUnderCRTPass" - -shader29 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear29 = true +shader29 = ../../shaders/base/reflection.slang scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersOverCRTPass" +alias29 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader30 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp index c865cfd..a204e0e 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__LCD-GRID.slangp @@ -106,81 +106,82 @@ float_framebuffer16 = "true" alias16 = "CRTPass" shader17 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader18 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear18 = true +scale_type18 = viewport +float_framebuffer18 = true +alias18 = "BR_LayersUnderCRTPass" + +shader19 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader18 = ../../shaders/base/linearize-crt.slang -mipmap_input18 = true -filter_linear18 = true -scale_type18 = absolute -// scale_x18 = 480 -// scale_y18 = 270 -// scale_x18 = 960 -// scale_y18 = 540 -scale_x18 = 800 -scale_y18 = 600 -float_framebuffer18 = true -alias18 = "BR_MirrorLowResPass" +shader20 = ../../shaders/base/linearize-crt.slang +mipmap_input20 = true +filter_linear20 = true +scale_type20 = absolute +// scale_x20 = 480 +// scale_y20 = 270 +// scale_x20 = 960 +// scale_y20 = 540 +scale_x20 = 800 +scale_y20 = 600 +float_framebuffer20 = true +alias20 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader19 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input19 = true -filter_linear19 = true -float_framebuffer19 = true +shader21 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input21 = true +filter_linear21 = true +float_framebuffer21 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear20 = true -float_framebuffer20 = true -alias20 = "BR_MirrorBlurredPass" +shader22 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear22 = true +float_framebuffer22 = true +alias22 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader21 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input21 = true -filter_linear21 = true -scale_type21 = absolute -scale_x21 = 128 -scale_y21 = 128 -float_framebuffer21 = true -alias21 = "BR_MirrorReflectionDiffusedPass" +shader23 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input23 = true +filter_linear23 = true +scale_type23 = absolute +scale_x23 = 128 +scale_y23 = 128 +float_framebuffer23 = true +alias23 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 12 -scale_y22 = 12 -float_framebuffer22 = true -alias22 = "BR_MirrorFullscreenGlowPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 12 +scale_y24 = 12 +float_framebuffer24 = true +alias24 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader23 = ../../shaders/base/reflection.slang -scale_type23 = viewport -alias23 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader24 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear24 = true -scale_type24 = viewport -float_framebuffer24 = true -alias24 = "BR_LayersUnderCRTPass" - -shader25 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear25 = true +shader25 = ../../shaders/base/reflection.slang scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersOverCRTPass" +alias25 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader26 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp index b9444e3..446a94f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON-NTSC.slangp @@ -147,81 +147,82 @@ float_framebuffer21 = "true" alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt-hdr.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt-hdr.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes-hdr.slang @@ -329,3 +330,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp index d1b9022..8d2e05a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__3__STD__MEGATRON.slangp @@ -121,81 +121,82 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt-hdr.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt-hdr.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes-hdr.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp index 4541c9f..96833b7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 46 +shaders = 44 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,201 +122,178 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" + +shader25 = ../../shaders/base/stock.slang +alias25 = "PrePass0" + +shader26 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +float_framebuffer26 = true +scale_type_x26 = source +scale_type_y26 = source +scale_x26 = 4.0 +scale_y26 = 1.0 +frame_count_mod26 = 2 +alias26 = NPass1 -shader27 = ../../shaders/base/stock.slang -alias27 = "PrePass0" +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer27 = true +filter_linear27 = true +scale_type27 = source +scale_x27 = 0.5 +scale_y27 = 1.0 -shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear28 = false -float_framebuffer28 = true -scale_type_x28 = source -scale_type_y28 = source -scale_x28 = 4.0 +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 scale_y28 = 1.0 -frame_count_mod28 = 2 -alias28 = NPass1 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer29 = true +shader29 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear29 = true scale_type29 = source -scale_x29 = 0.5 +scale_x29 = 1.0 scale_y29 = 1.0 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader30 = ../../shaders/base/stock.slang filter_linear30 = true scale_type30 = source scale_x30 = 1.0 scale_y30 = 1.0 +alias30 = "PrePass" +mipmap_input30 = true -shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader31 = ../../shaders/guest/hsm-avg-lum.slang filter_linear31 = true scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 - -shader32 = ../../shaders/base/stock.slang -filter_linear32 = true -scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 -alias32 = "PrePass" -mipmap_input32 = true - -shader33 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -mipmap_input33 = true -alias33 = "AvgLumPass" +scale31 = 1.0 +mipmap_input31 = true +alias31 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader32 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear32 = true +scale_type32 = source +scale32 = 1.0 +float_framebuffer32 = true +alias32 = "LinearizePass" + +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear33 = true +scale_type_x33 = viewport +scale_x33 = 1.0 +scale_type_y33 = source +scale_y33 = 1.0 +float_framebuffer33 = true +alias33 = Pass1 + +shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear34 = true -scale_type34 = source -scale34 = 1.0 +scale_type_x34 = absolute +scale_x34 = 640.0 +scale_type_y34 = source +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "LinearizePass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear35 = true -scale_type_x35 = viewport -scale_x35 = 1.0 -scale_type_y35 = source -scale_y35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = absolute +scale_y35 = 480.0 float_framebuffer35 = true -alias35 = Pass1 +alias35 = "GlowPass" -shader36 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear36 = true scale_type_x36 = absolute scale_x36 = 640.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader37 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 scale_type_y37 = absolute scale_y37 = 480.0 float_framebuffer37 = true -alias37 = "GlowPass" +alias37 = "BloomPass" -shader38 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader38 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear38 = true -scale_type_x38 = absolute -scale_x38 = 640.0 -scale_type_y38 = absolute -scale_y38 = 480.0 +scale_type38 = viewport +scale_x38 = 1.0 +scale_y38 = 1.0 float_framebuffer38 = true -shader39 = ../../shaders/guest/hsm-bloom_vertical.slang +shader39 = ../../shaders/guest/hsm-deconvergence.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -alias39 = "BloomPass" +alias39 = "CRTPass" -shader40 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear40 = true +shader40 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input40 = true scale_type40 = viewport -scale_x40 = 1.0 -scale_y40 = 1.0 float_framebuffer40 = true - -shader41 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear41 = true -scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 -float_framebuffer41 = true -alias41 = "CRTPass" - -shader42 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "PostCRTPass" +alias40 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader43 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersUnderCRTPass" +shader41 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear41 = true +scale_type41 = viewport +float_framebuffer41 = true +alias41 = "BR_LayersUnderCRTPass" -shader44 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear44 = true -scale_type44 = viewport -float_framebuffer44 = true -alias44 = "BR_LayersOverCRTPass" +shader42 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear42 = true +scale_type42 = viewport +float_framebuffer42 = true +alias42 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader45 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type45 = viewport -alias45 = "CombinePass" +shader43 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type43 = viewport +alias43 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -372,9 +388,11 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp index 62f48f6..b05f36d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,166 +122,143 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang -filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" -shader27 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear25 = true +scale_type25 = source +scale_x25 = 1.0 +scale_y25 = 1.0 + +shader26 = ../../shaders/base/stock.slang +filter_linear26 = true +scale_type26 = source +scale_x26 = 1.0 +scale_y26 = 1.0 +alias26 = "PrePass" +mipmap_input26 = true + +shader27 = ../../shaders/guest/hsm-avg-lum.slang filter_linear27 = true scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 - -shader28 = ../../shaders/base/stock.slang -filter_linear28 = true -scale_type28 = source -scale_x28 = 1.0 -scale_y28 = 1.0 -alias28 = "PrePass" -mipmap_input28 = true - -shader29 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -mipmap_input29 = true -alias29 = "AvgLumPass" +scale27 = 1.0 +mipmap_input27 = true +alias27 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader30 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear30 = true -scale_type30 = source -scale30 = 1.0 -float_framebuffer30 = true -alias30 = "LinearizePass" +shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +float_framebuffer28 = true +alias28 = "LinearizePass" -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear29 = true +scale_type_x29 = absolute +scale_x29 = 800.0 +scale_type_y29 = source +scale_y29 = 1.0 +float_framebuffer29 = true + +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear30 = true +scale_type_x30 = absolute +scale_x30 = 800.0 +scale_type_y30 = absolute +scale_y30 = 600.0 +float_framebuffer30 = true +alias30 = "GlowPass" + +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 800.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 600.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true -scale_type_x32 = absolute -scale_x32 = 800.0 -scale_type_y32 = absolute -scale_y32 = 600.0 +scale_type_x32 = source +scale_x32 = 1.0 +scale_type_y32 = source +scale_y32 = 1.0 float_framebuffer32 = true -alias32 = "GlowPass" +alias32 = "BloomPass" -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 800.0 -scale_type_y33 = absolute -scale_y33 = 600.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear34 = true -scale_type_x34 = source +scale_type34 = viewport scale_x34 = 1.0 -scale_type_y34 = source scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "BloomPass" +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" +shader36 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear36 = true +scale_type36 = viewport +float_framebuffer36 = true +alias36 = "BR_LayersUnderCRTPass" -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" +shader37 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear37 = true +scale_type37 = viewport +float_framebuffer37 = true +alias37 = "BR_LayersOverCRTPass" // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes-no-reflect.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes-no-reflect.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -335,7 +351,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp index 1449e18..ee41983 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__EASYMODE.slangp @@ -117,6 +117,7 @@ alias18 = "CRTPass" g_gamma_out = 2.45 shader19 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input19 = true scale_type19 = viewport float_framebuffer19 = true alias19 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp index a7c379d..24fef4b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI-NTSC.slangp @@ -137,6 +137,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader21 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" @@ -253,3 +254,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp index 1229347..28ad59d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-MINI.slangp @@ -111,6 +111,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader17 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp index 16edfa3..c5deff6 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV-NTSC.slangp @@ -180,6 +180,7 @@ float_framebuffer25 = true alias25 = "CRTPass" shader26 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input26 = true scale_type26 = viewport float_framebuffer26 = true alias26 = "PostCRTPass" @@ -296,3 +297,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp index 735d76a..d9e5e22 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__GDV.slangp @@ -145,6 +145,7 @@ float_framebuffer20 = true alias20 = "CRTPass" shader21 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp index 4ee128f..f2cbc2c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__LCD-GRID.slangp @@ -106,6 +106,7 @@ float_framebuffer16 = "true" alias16 = "CRTPass" shader17 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp index 020698a..cf9c400 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON-NTSC.slangp @@ -147,6 +147,7 @@ float_framebuffer21 = "true" alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" @@ -271,3 +272,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp index b73eb65..dfaf9d8 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-NO-REFLECT__MEGATRON.slangp @@ -121,6 +121,7 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp index 6122733..7410d43 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 44 +shaders = 42 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,187 +122,164 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" + +shader25 = ../../shaders/base/stock.slang +alias25 = "PrePass0" + +shader26 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +float_framebuffer26 = true +scale_type_x26 = source +scale_type_y26 = source +scale_x26 = 4.0 +scale_y26 = 1.0 +frame_count_mod26 = 2 +alias26 = NPass1 -shader27 = ../../shaders/base/stock.slang -alias27 = "PrePass0" +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer27 = true +filter_linear27 = true +scale_type27 = source +scale_x27 = 0.5 +scale_y27 = 1.0 -shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear28 = false -float_framebuffer28 = true -scale_type_x28 = source -scale_type_y28 = source -scale_x28 = 4.0 +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 scale_y28 = 1.0 -frame_count_mod28 = 2 -alias28 = NPass1 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer29 = true +shader29 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear29 = true scale_type29 = source -scale_x29 = 0.5 +scale_x29 = 1.0 scale_y29 = 1.0 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader30 = ../../shaders/base/stock.slang filter_linear30 = true scale_type30 = source scale_x30 = 1.0 scale_y30 = 1.0 +alias30 = "PrePass" +mipmap_input30 = true -shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader31 = ../../shaders/guest/hsm-avg-lum.slang filter_linear31 = true scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 - -shader32 = ../../shaders/base/stock.slang -filter_linear32 = true -scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 -alias32 = "PrePass" -mipmap_input32 = true - -shader33 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -mipmap_input33 = true -alias33 = "AvgLumPass" +scale31 = 1.0 +mipmap_input31 = true +alias31 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader32 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear32 = true +scale_type32 = source +scale32 = 1.0 +float_framebuffer32 = true +alias32 = "LinearizePass" + +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear33 = true +scale_type_x33 = viewport +scale_x33 = 1.0 +scale_type_y33 = source +scale_y33 = 1.0 +float_framebuffer33 = true +alias33 = Pass1 + +shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear34 = true -scale_type34 = source -scale34 = 1.0 +scale_type_x34 = absolute +scale_x34 = 640.0 +scale_type_y34 = source +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "LinearizePass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear35 = true -scale_type_x35 = viewport -scale_x35 = 1.0 -scale_type_y35 = source -scale_y35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = absolute +scale_y35 = 480.0 float_framebuffer35 = true -alias35 = Pass1 +alias35 = "GlowPass" -shader36 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear36 = true scale_type_x36 = absolute scale_x36 = 640.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader37 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 scale_type_y37 = absolute scale_y37 = 480.0 float_framebuffer37 = true -alias37 = "GlowPass" +alias37 = "BloomPass" -shader38 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader38 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang filter_linear38 = true -scale_type_x38 = absolute -scale_x38 = 640.0 -scale_type_y38 = absolute -scale_y38 = 480.0 +scale_type38 = viewport +scale_x38 = 1.0 +scale_y38 = 1.0 float_framebuffer38 = true -shader39 = ../../shaders/guest/hsm-bloom_vertical.slang +shader39 = ../../shaders/guest/hsm-deconvergence.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -alias39 = "BloomPass" +alias39 = "CRTPass" -shader40 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-no-reflect.slang -filter_linear40 = true +shader40 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input40 = true scale_type40 = viewport -scale_x40 = 1.0 -scale_y40 = 1.0 float_framebuffer40 = true - -shader41 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear41 = true -scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 -float_framebuffer41 = true -alias41 = "CRTPass" - -shader42 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "PostCRTPass" +alias40 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader43 = ../../shaders/base/output-sdr.slang -scale_type43 = viewport -alias43 = "OutputPass" +shader41 = ../../shaders/base/output-sdr.slang +scale_type41 = viewport +alias41 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -358,9 +374,11 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp index 23c042a..e477198 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 39 +shaders = 37 shader0 = ../../shaders/base/add-params-no-reflect.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,152 +122,129 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang -filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" -shader27 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear25 = true +scale_type25 = source +scale_x25 = 1.0 +scale_y25 = 1.0 + +shader26 = ../../shaders/base/stock.slang +filter_linear26 = true +scale_type26 = source +scale_x26 = 1.0 +scale_y26 = 1.0 +alias26 = "PrePass" +mipmap_input26 = true + +shader27 = ../../shaders/guest/hsm-avg-lum.slang filter_linear27 = true scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 - -shader28 = ../../shaders/base/stock.slang -filter_linear28 = true -scale_type28 = source -scale_x28 = 1.0 -scale_y28 = 1.0 -alias28 = "PrePass" -mipmap_input28 = true - -shader29 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -mipmap_input29 = true -alias29 = "AvgLumPass" +scale27 = 1.0 +mipmap_input27 = true +alias27 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader30 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear30 = true -scale_type30 = source -scale30 = 1.0 -float_framebuffer30 = true -alias30 = "LinearizePass" +shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +float_framebuffer28 = true +alias28 = "LinearizePass" -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear29 = true +scale_type_x29 = absolute +scale_x29 = 800.0 +scale_type_y29 = source +scale_y29 = 1.0 +float_framebuffer29 = true + +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear30 = true +scale_type_x30 = absolute +scale_x30 = 800.0 +scale_type_y30 = absolute +scale_y30 = 600.0 +float_framebuffer30 = true +alias30 = "GlowPass" + +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 800.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 600.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true -scale_type_x32 = absolute -scale_x32 = 800.0 -scale_type_y32 = absolute -scale_y32 = 600.0 +scale_type_x32 = source +scale_x32 = 1.0 +scale_type_y32 = source +scale_y32 = 1.0 float_framebuffer32 = true -alias32 = "GlowPass" +alias32 = "BloomPass" -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 800.0 -scale_type_y33 = absolute -scale_y33 = 600.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang filter_linear34 = true -scale_type_x34 = source +scale_type34 = viewport scale_x34 = 1.0 -scale_type_y34 = source scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "BloomPass" +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-no-reflect.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence-no-reflect.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-no-reflect.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Combine Passes ---------------------------------------------------------------- -shader38 = ../../shaders/base/output-sdr.slang -scale_type38 = viewport -alias38 = "OutputPass" +shader36 = ../../shaders/base/output-sdr.slang +scale_type36 = viewport +alias36 = "OutputPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -321,7 +337,7 @@ TopLayerImage_mipmap = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp index 045d114..d1ab8e1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__EASYMODE.slangp @@ -117,6 +117,7 @@ alias18 = "CRTPass" g_gamma_out = 2.45 shader19 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input19 = true scale_type19 = viewport float_framebuffer19 = true alias19 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp index f3e4090..09d6423 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI-NTSC.slangp @@ -137,6 +137,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader21 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" @@ -239,3 +240,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp index 051d8c5..2b8bc02 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-MINI.slangp @@ -111,6 +111,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader17 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp index 2dde4ef..9905995 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV-NTSC.slangp @@ -180,6 +180,7 @@ float_framebuffer25 = true alias25 = "CRTPass" shader26 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input26 = true scale_type26 = viewport float_framebuffer26 = true alias26 = "PostCRTPass" @@ -282,3 +283,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp index 86ef8a3..f5b8121 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__GDV.slangp @@ -145,6 +145,7 @@ float_framebuffer20 = true alias20 = "CRTPass" shader21 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp index 8dda5d5..95209b0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__LCD-GRID.slangp @@ -106,6 +106,7 @@ float_framebuffer16 = "true" alias16 = "CRTPass" shader17 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp index fc5445f..b4f3052 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON-NTSC.slangp @@ -147,6 +147,7 @@ float_framebuffer21 = "true" alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" @@ -257,3 +258,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp index c4ad4ae..e4885cb 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__4__STD-SCREEN-ONLY__MEGATRON.slangp @@ -121,6 +121,7 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-no-reflect.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp index 7d9540e..2d917e7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp @@ -1,4 +1,4 @@ -shaders = 43 +shaders = 41 shader0 = ../../shaders/base/add-params-potato.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,182 +122,159 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" + +shader25 = ../../shaders/base/stock.slang +alias25 = "PrePass0" + +shader26 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +float_framebuffer26 = true +scale_type_x26 = source +scale_type_y26 = source +scale_x26 = 4.0 +scale_y26 = 1.0 +frame_count_mod26 = 2 +alias26 = NPass1 -shader27 = ../../shaders/base/stock.slang -alias27 = "PrePass0" +shader27 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer27 = true +filter_linear27 = true +scale_type27 = source +scale_x27 = 0.5 +scale_y27 = 1.0 -shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear28 = false -float_framebuffer28 = true -scale_type_x28 = source -scale_type_y28 = source -scale_x28 = 4.0 +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear28 = true +scale_type28 = source +scale_x28 = 1.0 scale_y28 = 1.0 -frame_count_mod28 = 2 -alias28 = NPass1 -shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer29 = true +shader29 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear29 = true scale_type29 = source -scale_x29 = 0.5 +scale_x29 = 1.0 scale_y29 = 1.0 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader30 = ../../shaders/base/stock.slang filter_linear30 = true scale_type30 = source scale_x30 = 1.0 scale_y30 = 1.0 +alias30 = "PrePass" +mipmap_input30 = true -shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader31 = ../../shaders/guest/hsm-avg-lum.slang filter_linear31 = true scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 - -shader32 = ../../shaders/base/stock.slang -filter_linear32 = true -scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 -alias32 = "PrePass" -mipmap_input32 = true - -shader33 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -mipmap_input33 = true -alias33 = "AvgLumPass" +scale31 = 1.0 +mipmap_input31 = true +alias31 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader32 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear32 = true +scale_type32 = source +scale32 = 1.0 +float_framebuffer32 = true +alias32 = "LinearizePass" + +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear33 = true +scale_type_x33 = viewport +scale_x33 = 1.0 +scale_type_y33 = source +scale_y33 = 1.0 +float_framebuffer33 = true +alias33 = Pass1 + +shader34 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear34 = true -scale_type34 = source -scale34 = 1.0 +scale_type_x34 = absolute +scale_x34 = 640.0 +scale_type_y34 = source +scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "LinearizePass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader35 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear35 = true -scale_type_x35 = viewport -scale_x35 = 1.0 -scale_type_y35 = source -scale_y35 = 1.0 +scale_type_x35 = absolute +scale_x35 = 640.0 +scale_type_y35 = absolute +scale_y35 = 480.0 float_framebuffer35 = true -alias35 = Pass1 +alias35 = GlowPass -shader36 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader36 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear36 = true scale_type_x36 = absolute scale_x36 = 640.0 -scale_type_y36 = source -scale_y36 = 1.0 +scale_type_y36 = absolute +scale_y36 = 480.0 float_framebuffer36 = true -shader37 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader37 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear37 = true scale_type_x37 = absolute scale_x37 = 640.0 scale_type_y37 = absolute scale_y37 = 480.0 float_framebuffer37 = true -alias37 = GlowPass +alias37 = BloomPass -shader38 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader38 = ../../shaders/guest/hsm-crt-guest-advanced-potato.slang filter_linear38 = true -scale_type_x38 = absolute -scale_x38 = 640.0 -scale_type_y38 = absolute -scale_y38 = 480.0 +scale_type38 = viewport +scale_x38 = 1.0 +scale_y38 = 1.0 float_framebuffer38 = true -shader39 = ../../shaders/guest/hsm-bloom_vertical.slang +shader39 = ../../shaders/guest/hsm-deconvergence.slang filter_linear39 = true -scale_type_x39 = absolute -scale_x39 = 640.0 -scale_type_y39 = absolute -scale_y39 = 480.0 +scale_type39 = viewport +scale_x39 = 1.0 +scale_y39 = 1.0 float_framebuffer39 = true -alias39 = BloomPass +alias39 = "CRTPass" -shader40 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang -filter_linear40 = true +shader40 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input40 = true scale_type40 = viewport -scale_x40 = 1.0 -scale_y40 = 1.0 float_framebuffer40 = true - -shader41 = ../../shaders/guest/hsm-deconvergence.slang -filter_linear41 = true -scale_type41 = viewport -scale_x41 = 1.0 -scale_y41 = 1.0 -float_framebuffer41 = true -alias41 = "CRTPass" - -shader42 = ../../shaders/base/post-crt-prep-potato.slang -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "PostCRTPass" +alias40 = "PostCRTPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage" @@ -292,9 +308,11 @@ HSM_ASPECT_RATIO_MODE = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp index b0bf26b..0920528 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp @@ -1,4 +1,4 @@ -shaders = 38 +shaders = 36 shader0 = ../../shaders/base/add-params-potato.slang alias0 = "CorePass" @@ -43,39 +43,78 @@ alias5 = "IntroPass" shader6 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias6 = LinearGamma -shader7 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias9 = "PreMdaptPass" +shader7 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear7 = false +scale_type7 = source +scale7 = 1.0 -// De-Dithering - Mdapt -shader10 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader11 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -shader15 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 +alias9 = CB_Output -shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias16 = "DeditherPass" +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 -shader17 = ../../shaders/base/stock.slang -// filter_linear17 = "false" -// wrap_mode17 = "clamp_to_border" -// mipmap_input17 = "false" -// float_framebuffer17 = "false" -// srgb_framebuffer17 = "true" -alias17 = XbrSource +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear11 = false -shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +shader12 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader13 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias13 = "DeditherPass" + +shader14 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias14 = "DeditherPass" + +shader15 = ../../shaders/base/stock.slang +// filter_linear15 = "false" +// wrap_mode15 = "clamp_to_border" +// mipmap_input15 = "false" +// float_framebuffer15 = "false" +// srgb_framebuffer15 = "true" +alias15 = XbrSource + +shader16 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass0.slang +filter_linear16 = "false" +wrap_mode16 = "clamp_to_border" +mipmap_input16 = "false" +float_framebuffer16 = "false" +srgb_framebuffer16 = "true" + +shader17 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +filter_linear17 = "false" +wrap_mode17 = "clamp_to_border" +mipmap_input17 = "false" +alias17 = "" +float_framebuffer17 = "false" +srgb_framebuffer17 = "true" +scale_type_x17 = "source" +scale_x17 = "2.000000" +scale_type_y17 = "source" +scale_y17 = "2.000000" + +shader18 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang filter_linear18 = "false" wrap_mode18 = "clamp_to_border" mipmap_input18 = "false" +alias18 = "" float_framebuffer18 = "false" srgb_framebuffer18 = "true" +scale_type_x18 = "source" +scale_x18 = "1.000000" +scale_type_y18 = "source" +scale_y18 = "1.000000" -shader19 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass1.slang +shader19 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" @@ -83,147 +122,124 @@ alias19 = "" float_framebuffer19 = "false" srgb_framebuffer19 = "true" scale_type_x19 = "source" -scale_x19 = "2.000000" +scale_x19 = "1.000000" scale_type_y19 = "source" -scale_y19 = "2.000000" +scale_y19 = "1.000000" -shader20 = ../../shaders/hyllian/crt-super-xbr/super-xbr-pass2.slang -filter_linear20 = "false" -wrap_mode20 = "clamp_to_border" -mipmap_input20 = "false" -alias20 = "" -float_framebuffer20 = "false" -srgb_framebuffer20 = "true" -scale_type_x20 = "source" -scale_x20 = "1.000000" -scale_type_y20 = "source" -scale_y20 = "1.000000" +shader20 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang +filter_linear20 = false +scale_type_x20 = source +scale_x20 = 1 +scale_type_y20 = source +scale_y20 = 0.5 +wrap_mode20 = "clamp_to_edge" -shader21 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang -filter_linear21 = "false" -wrap_mode21 = "clamp_to_border" -mipmap_input21 = "false" -alias21 = "" -float_framebuffer21 = "false" -srgb_framebuffer21 = "true" -scale_type_x21 = "source" -scale_x21 = "1.000000" -scale_type_y21 = "source" -scale_y21 = "1.000000" +shader21 = ../../shaders/base/stock.slang +alias21 = "PreCRTPass" -shader22 = ../../shaders/hyllian/crt-super-xbr/custom-bicubic-y.slang -filter_linear22 = false -scale_type_x22 = source -scale_x22 = 1 -scale_type_y22 = source -scale_y22 = 0.5 -wrap_mode22 = "clamp_to_edge" +shader22 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear22 = true +scale_type22 = source +scale22 = 1.0 +alias22 = "AfterglowPass" -shader23 = ../../shaders/base/stock.slang -alias23 = "PreCRTPass" - -shader24 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear24 = true -scale_type24 = source -scale24 = 1.0 -alias24 = "AfterglowPass" - -shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear25 = true -scale_type25 = source -mipmap_input25 = true -scale25 = 1.0 +shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear23 = true +scale_type23 = source +mipmap_input23 = true +scale23 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader26 = ../../shaders/dogway/hsm-grade.slang -filter_linear26 = false -scale_type26 = source -scale26 = 1.0 -alias26 = "ColorCorrectPass" +shader24 = ../../shaders/dogway/hsm-grade.slang +filter_linear24 = false +scale_type24 = source +scale24 = 1.0 +alias24 = "ColorCorrectPass" -shader27 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear25 = true +scale_type25 = source +scale_x25 = 1.0 +scale_y25 = 1.0 + +shader26 = ../../shaders/base/stock.slang +filter_linear26 = true +scale_type26 = source +scale_x26 = 1.0 +scale_y26 = 1.0 +alias26 = "PrePass" +mipmap_input26 = true + +shader27 = ../../shaders/guest/hsm-avg-lum.slang filter_linear27 = true scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 - -shader28 = ../../shaders/base/stock.slang -filter_linear28 = true -scale_type28 = source -scale_x28 = 1.0 -scale_y28 = 1.0 -alias28 = "PrePass" -mipmap_input28 = true - -shader29 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -mipmap_input29 = true -alias29 = "AvgLumPass" +scale27 = 1.0 +mipmap_input27 = true +alias27 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader30 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear30 = true -scale_type30 = source -scale30 = 1.0 -float_framebuffer30 = true -alias30 = "LinearizePass" +shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +float_framebuffer28 = true +alias28 = "LinearizePass" -shader31 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear29 = true +scale_type_x29 = absolute +scale_x29 = 800.0 +scale_type_y29 = source +scale_y29 = 1.0 +float_framebuffer29 = true + +shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear30 = true +scale_type_x30 = absolute +scale_x30 = 800.0 +scale_type_y30 = absolute +scale_y30 = 600.0 +float_framebuffer30 = true +alias30 = GlowPass + +shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear31 = true scale_type_x31 = absolute scale_x31 = 800.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_y31 = absolute +scale_y31 = 600.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader32 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear32 = true -scale_type_x32 = absolute -scale_x32 = 800.0 -scale_type_y32 = absolute -scale_y32 = 600.0 +scale_type_x32 = source +scale_x32 = 1.0 +scale_type_y32 = source +scale_y32 = 1.0 float_framebuffer32 = true -alias32 = GlowPass +alias32 = BloomPass -shader33 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader33 = ../../shaders/guest/hsm-crt-guest-advanced-potato.slang filter_linear33 = true -scale_type_x33 = absolute -scale_x33 = 800.0 -scale_type_y33 = absolute -scale_y33 = 600.0 +scale_type33 = viewport +scale_x33 = 1.0 +scale_y33 = 1.0 float_framebuffer33 = true -shader34 = ../../shaders/guest/hsm-bloom_vertical.slang +shader34 = ../../shaders/guest/hsm-deconvergence-potato.slang filter_linear34 = true -scale_type_x34 = source +scale_type34 = viewport scale_x34 = 1.0 -scale_type_y34 = source scale_y34 = 1.0 float_framebuffer34 = true -alias34 = BloomPass +alias34 = "CRTPass" -shader35 = ../../shaders/guest/hsm-crt-guest-advanced-potato.slang -filter_linear35 = true +shader35 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input35 = true scale_type35 = viewport -scale_x35 = 1.0 -scale_y35 = 1.0 float_framebuffer35 = true - -shader36 = ../../shaders/guest/hsm-deconvergence-potato.slang -filter_linear36 = true -scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 -float_framebuffer36 = true -alias36 = "CRTPass" - -shader37 = ../../shaders/base/post-crt-prep-potato.slang -scale_type37 = viewport -float_framebuffer37 = true -alias37 = "PostCRTPass" +alias35 = "PostCRTPass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;ScreenPlacementImage;BackgroundImage;BackgroundVertImage" @@ -255,7 +271,7 @@ HSM_ASPECT_RATIO_MODE = 1 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = 3 +SGPT_BLEND_OPTION = 1 SHARPSMOOTHER_ON = 1 max_w = 0.05 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp index fd4ca34..56d1ded 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__EASYMODE.slangp @@ -114,6 +114,7 @@ alias17 = "CRTPass" g_gamma_out = 2.45 shader18 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp index 8a15ecc..8d3bb6b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI-NTSC.slangp @@ -119,6 +119,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader17 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" @@ -146,3 +147,6 @@ HSM_ASPECT_RATIO_MODE = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp index 3289a22..d7f02e9 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp @@ -93,6 +93,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader13 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input13 = true scale_type13 = viewport float_framebuffer13 = true alias13 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp index 083b223..617b0d4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV-NTSC.slangp @@ -161,7 +161,7 @@ scale_y22 = 480.0 float_framebuffer22 = true alias22 = BloomPass -shader23 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang +shader23 = ../../shaders/guest/hsm-crt-guest-advanced-potato.slang filter_linear23 = true scale_type23 = viewport scale_x23 = 1.0 @@ -177,6 +177,7 @@ float_framebuffer24 = true alias24 = "CRTPass" shader25 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input25 = true scale_type25 = viewport float_framebuffer25 = true alias25 = "PostCRTPass" @@ -213,3 +214,6 @@ HSM_ASPECT_RATIO_MODE = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp index d349367..3cd3737 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__GDV.slangp @@ -142,6 +142,7 @@ float_framebuffer19 = true alias19 = "CRTPass" shader20 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input20 = true scale_type20 = viewport float_framebuffer20 = true alias20 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp index 1113580..7aab221 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__LCD-GRID.slangp @@ -103,6 +103,7 @@ float_framebuffer15 = "true" alias15 = "CRTPass" shader16 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input16 = true scale_type16 = viewport float_framebuffer16 = true alias16 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp index c5bb6b0..1838f8b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON-NTSC.slangp @@ -144,6 +144,7 @@ float_framebuffer20 = "true" alias20 = "CRTPass" shader21 = ../../shaders/base/post-crt-prep-potato-megatron.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" @@ -193,3 +194,6 @@ HSM_REFLECT_GLOBAL_AMOUNT = "40.000000" // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp index 18d5b22..e7c2b35 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/MBZ__5__POTATO__MEGATRON.slangp @@ -118,6 +118,7 @@ float_framebuffer16 = "true" alias16 = "CRTPass" shader17 = ../../shaders/base/post-crt-prep-potato-megatron.slang +mipmap_input17 = true scale_type17 = viewport float_framebuffer17 = true alias17 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp index c8526e9..8af9b07 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-240p.slangp @@ -1,4 +1,4 @@ -shaders = 54 +shaders = 52 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,196 +51,226 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false -shader19 = ../../shaders/base/stock.slang -alias19 = refpass +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader20 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" + +shader17 = ../../shaders/base/stock.slang +alias17 = refpass + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer18 = true +alias18 = scalefx_pass0 + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +float_framebuffer12 = true + +shader20 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer20 = true -alias20 = scalefx_pass0 -shader21 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear21 = false scale_type21 = source scale21 = 1.0 -float_framebuffer12 = true -shader22 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader22 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear22 = false scale_type22 = source -scale22 = 1.0 +scale22 = 3 -shader23 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 +shader23 = ../../shaders/base/stock.slang +alias23 = "PreCRTPass" -shader24 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear24 = false +shader24 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear24 = true scale_type24 = source -scale24 = 3 +scale24 = 1.0 +alias24 = "AfterglowPass" -shader25 = ../../shaders/base/stock.slang -alias25 = "PreCRTPass" - -shader26 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -alias26 = "AfterglowPass" - -shader27 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear27 = true -scale_type27 = source -mipmap_input27 = true -scale27 = 1.0 +shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear25 = true +scale_type25 = source +mipmap_input25 = true +scale25 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader28 = ../../shaders/dogway/hsm-grade.slang +shader26 = ../../shaders/dogway/hsm-grade.slang +filter_linear26 = false +scale_type26 = source +scale26 = 1.0 +alias26 = "ColorCorrectPass" + +shader27 = ../../shaders/base/stock.slang +alias27 = "PrePass0" + +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear28 = false -scale_type28 = source -scale28 = 1.0 -alias28 = "ColorCorrectPass" +float_framebuffer28 = true +scale_type_x28 = source +scale_type_y28 = source +scale_x28 = 4.0 +scale_y28 = 1.0 +frame_count_mod28 = 2 +alias28 = NPass1 -shader29 = ../../shaders/base/stock.slang -alias29 = "PrePass0" +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer29 = true +filter_linear29 = true +scale_type29 = source +scale_x29 = 0.5 +scale_y29 = 1.0 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear30 = false -float_framebuffer30 = true -scale_type_x30 = source -scale_type_y30 = source -scale_x30 = 4.0 +shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear30 = true +scale_type30 = source +scale_x30 = 1.0 scale_y30 = 1.0 -frame_count_mod30 = 2 -alias30 = NPass1 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer31 = true +shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear31 = true scale_type31 = source -scale_x31 = 0.5 +scale_x31 = 1.0 scale_y31 = 1.0 -shader32 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader32 = ../../shaders/base/stock.slang filter_linear32 = true scale_type32 = source scale_x32 = 1.0 scale_y32 = 1.0 +alias32 = "PrePass" +mipmap_input32 = true -shader33 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader33 = ../../shaders/guest/hsm-avg-lum.slang filter_linear33 = true scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 - -shader34 = ../../shaders/base/stock.slang -filter_linear34 = true -scale_type34 = source -scale_x34 = 1.0 -scale_y34 = 1.0 -alias34 = "PrePass" -mipmap_input34 = true - -shader35 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -mipmap_input35 = true -alias35 = "AvgLumPass" +scale33 = 1.0 +mipmap_input33 = true +alias33 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader36 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear34 = true +scale_type34 = source +scale34 = 1.0 +float_framebuffer34 = true +alias34 = "LinearizePass" + +shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear35 = true +scale_type_x35 = viewport +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 +float_framebuffer35 = true +alias35 = Pass1 + +shader36 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear36 = true -scale_type36 = source -scale36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = source +scale_y36 = 1.0 float_framebuffer36 = true -alias36 = "LinearizePass" -shader37 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader37 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear37 = true -scale_type_x37 = viewport -scale_x37 = 1.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_x37 = absolute +scale_x37 = 640.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -alias37 = Pass1 +alias37 = GlowPass -shader38 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader38 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 -scale_type_y38 = source -scale_y38 = 1.0 +scale_type_y38 = absolute +scale_y38 = 480.0 float_framebuffer38 = true -shader39 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader39 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear39 = true scale_type_x39 = absolute scale_x39 = 640.0 scale_type_y39 = absolute scale_y39 = 480.0 float_framebuffer39 = true -alias39 = GlowPass +alias39 = BloomPass -shader40 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader40 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -shader41 = ../../shaders/guest/hsm-bloom_vertical.slang +shader41 = ../../shaders/guest/hsm-deconvergence.slang filter_linear41 = true -scale_type_x41 = absolute -scale_x41 = 640.0 -scale_type_y41 = absolute -scale_y41 = 480.0 +scale_type41 = viewport +scale_x41 = 1.0 +scale_y41 = 1.0 float_framebuffer41 = true -alias41 = BloomPass +alias41 = "CRTPass" -shader42 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear42 = true +shader42 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input42 = true scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 float_framebuffer42 = true +alias42 = "PostCRTPass" -shader43 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader43 = ../../shaders/base/bezel-images-under-crt.slang filter_linear43 = true scale_type43 = viewport -scale_x43 = 1.0 -scale_y43 = 1.0 float_framebuffer43 = true -alias43 = "CRTPass" +alias43 = "BR_LayersUnderCRTPass" -shader44 = ../../shaders/base/post-crt-prep-image-layers.slang +shader44 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear44 = true scale_type44 = viewport float_framebuffer44 = true -alias44 = "PostCRTPass" +alias44 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -300,24 +330,10 @@ shader50 = ../../shaders/base/reflection.slang scale_type50 = viewport alias50 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader51 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear51 = true -scale_type51 = viewport -float_framebuffer51 = true -alias51 = "BR_LayersUnderCRTPass" - -shader52 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear52 = true -scale_type52 = viewport -float_framebuffer52 = true -alias52 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader53 = ../../shaders/base/combine-passes.slang -scale_type53 = viewport -alias53 = "CombinePass" +shader51 = ../../shaders/base/combine-passes.slang +scale_type51 = viewport +alias51 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -409,7 +425,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -418,7 +434,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -430,6 +446,8 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp index c28713e..c9d28d3 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV-NTSC__DREZ-480p.slangp @@ -1,4 +1,4 @@ -shaders = 54 +shaders = 52 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,196 +51,226 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false -shader19 = ../../shaders/base/stock.slang -alias19 = refpass +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader20 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" + +shader17 = ../../shaders/base/stock.slang +alias17 = refpass + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer18 = true +alias18 = scalefx_pass0 + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +float_framebuffer12 = true + +shader20 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer20 = true -alias20 = scalefx_pass0 -shader21 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear21 = false scale_type21 = source scale21 = 1.0 -float_framebuffer12 = true -shader22 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader22 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear22 = false scale_type22 = source -scale22 = 1.0 +scale22 = 3 -shader23 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 +shader23 = ../../shaders/base/stock.slang +alias23 = "PreCRTPass" -shader24 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear24 = false +shader24 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear24 = true scale_type24 = source -scale24 = 3 +scale24 = 1.0 +alias24 = "AfterglowPass" -shader25 = ../../shaders/base/stock.slang -alias25 = "PreCRTPass" - -shader26 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear26 = true -scale_type26 = source -scale26 = 1.0 -alias26 = "AfterglowPass" - -shader27 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear27 = true -scale_type27 = source -mipmap_input27 = true -scale27 = 1.0 +shader25 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear25 = true +scale_type25 = source +mipmap_input25 = true +scale25 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader28 = ../../shaders/dogway/hsm-grade.slang +shader26 = ../../shaders/dogway/hsm-grade.slang +filter_linear26 = false +scale_type26 = source +scale26 = 1.0 +alias26 = "ColorCorrectPass" + +shader27 = ../../shaders/base/stock.slang +alias27 = "PrePass0" + +shader28 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear28 = false -scale_type28 = source -scale28 = 1.0 -alias28 = "ColorCorrectPass" +float_framebuffer28 = true +scale_type_x28 = source +scale_type_y28 = source +scale_x28 = 4.0 +scale_y28 = 1.0 +frame_count_mod28 = 2 +alias28 = NPass1 -shader29 = ../../shaders/base/stock.slang -alias29 = "PrePass0" +shader29 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer29 = true +filter_linear29 = true +scale_type29 = source +scale_x29 = 0.5 +scale_y29 = 1.0 -shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear30 = false -float_framebuffer30 = true -scale_type_x30 = source -scale_type_y30 = source -scale_x30 = 4.0 +shader30 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear30 = true +scale_type30 = source +scale_x30 = 1.0 scale_y30 = 1.0 -frame_count_mod30 = 2 -alias30 = NPass1 -shader31 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer31 = true +shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear31 = true scale_type31 = source -scale_x31 = 0.5 +scale_x31 = 1.0 scale_y31 = 1.0 -shader32 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader32 = ../../shaders/base/stock.slang filter_linear32 = true scale_type32 = source scale_x32 = 1.0 scale_y32 = 1.0 +alias32 = "PrePass" +mipmap_input32 = true -shader33 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader33 = ../../shaders/guest/hsm-avg-lum.slang filter_linear33 = true scale_type33 = source -scale_x33 = 1.0 -scale_y33 = 1.0 - -shader34 = ../../shaders/base/stock.slang -filter_linear34 = true -scale_type34 = source -scale_x34 = 1.0 -scale_y34 = 1.0 -alias34 = "PrePass" -mipmap_input34 = true - -shader35 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear35 = true -scale_type35 = source -scale35 = 1.0 -mipmap_input35 = true -alias35 = "AvgLumPass" +scale33 = 1.0 +mipmap_input33 = true +alias33 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader36 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear34 = true +scale_type34 = source +scale34 = 1.0 +float_framebuffer34 = true +alias34 = "LinearizePass" + +shader35 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear35 = true +scale_type_x35 = viewport +scale_x35 = 1.0 +scale_type_y35 = source +scale_y35 = 1.0 +float_framebuffer35 = true +alias35 = Pass1 + +shader36 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear36 = true -scale_type36 = source -scale36 = 1.0 +scale_type_x36 = absolute +scale_x36 = 640.0 +scale_type_y36 = source +scale_y36 = 1.0 float_framebuffer36 = true -alias36 = "LinearizePass" -shader37 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader37 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear37 = true -scale_type_x37 = viewport -scale_x37 = 1.0 -scale_type_y37 = source -scale_y37 = 1.0 +scale_type_x37 = absolute +scale_x37 = 640.0 +scale_type_y37 = absolute +scale_y37 = 480.0 float_framebuffer37 = true -alias37 = Pass1 +alias37 = GlowPass -shader38 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader38 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear38 = true scale_type_x38 = absolute scale_x38 = 640.0 -scale_type_y38 = source -scale_y38 = 1.0 +scale_type_y38 = absolute +scale_y38 = 480.0 float_framebuffer38 = true -shader39 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader39 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear39 = true scale_type_x39 = absolute scale_x39 = 640.0 scale_type_y39 = absolute scale_y39 = 480.0 float_framebuffer39 = true -alias39 = GlowPass +alias39 = BloomPass -shader40 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader40 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear40 = true -scale_type_x40 = absolute -scale_x40 = 640.0 -scale_type_y40 = absolute -scale_y40 = 480.0 +scale_type40 = viewport +scale_x40 = 1.0 +scale_y40 = 1.0 float_framebuffer40 = true -shader41 = ../../shaders/guest/hsm-bloom_vertical.slang +shader41 = ../../shaders/guest/hsm-deconvergence.slang filter_linear41 = true -scale_type_x41 = absolute -scale_x41 = 640.0 -scale_type_y41 = absolute -scale_y41 = 480.0 +scale_type41 = viewport +scale_x41 = 1.0 +scale_y41 = 1.0 float_framebuffer41 = true -alias41 = BloomPass +alias41 = "CRTPass" -shader42 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear42 = true +shader42 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input42 = true scale_type42 = viewport -scale_x42 = 1.0 -scale_y42 = 1.0 float_framebuffer42 = true +alias42 = "PostCRTPass" -shader43 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader43 = ../../shaders/base/bezel-images-under-crt.slang filter_linear43 = true scale_type43 = viewport -scale_x43 = 1.0 -scale_y43 = 1.0 float_framebuffer43 = true -alias43 = "CRTPass" +alias43 = "BR_LayersUnderCRTPass" -shader44 = ../../shaders/base/post-crt-prep-image-layers.slang +shader44 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear44 = true scale_type44 = viewport float_framebuffer44 = true -alias44 = "PostCRTPass" +alias44 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -300,24 +330,10 @@ shader50 = ../../shaders/base/reflection.slang scale_type50 = viewport alias50 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader51 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear51 = true -scale_type51 = viewport -float_framebuffer51 = true -alias51 = "BR_LayersUnderCRTPass" - -shader52 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear52 = true -scale_type52 = viewport -float_framebuffer52 = true -alias52 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader53 = ../../shaders/base/combine-passes.slang -scale_type53 = viewport -alias53 = "CombinePass" +shader51 = ../../shaders/base/combine-passes.slang +scale_type51 = viewport +alias51 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -409,7 +425,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -418,7 +434,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 @@ -430,6 +446,8 @@ masksize = 0 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp index 103b1aa..10f4bba 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-3DS-400x480.slangp @@ -1,4 +1,4 @@ -shaders = 51 +shaders = 49 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,175 +51,205 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false -shader19 = ../../shaders/base/stock.slang -alias19 = refpass +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader20 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" + +shader17 = ../../shaders/base/stock.slang +alias17 = refpass + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer18 = true +alias18 = scalefx_pass0 + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +float_framebuffer12 = true + +shader20 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer20 = true -alias20 = scalefx_pass0 -shader21 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear21 = false scale_type21 = source scale21 = 1.0 -float_framebuffer12 = true -shader22 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader22 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear22 = false scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 - -shader24 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear24 = false -scale_type24 = source -scale24 = 3 +scale22 = 3 // GTU TV Processing -shader25 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type25 = source -scale25 = 1.0 -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type23 = source +scale23 = 1.0 +float_framebuffer23 = true -shader26 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x26 = source -scale_x26 = 1.0 -scale_type_y26 = source -scale_y26 = 1.0 -filter_linear26 = false -float_framebuffer26 = true +shader24 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x24 = source +scale_x24 = 1.0 +scale_type_y24 = source +scale_y24 = 1.0 +filter_linear24 = false +float_framebuffer24 = true -shader27 = ../../shaders/base/stock.slang -alias27 = "PreCRTPass" +shader25 = ../../shaders/base/stock.slang +alias25 = "PreCRTPass" -shader28 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -alias28 = "AfterglowPass" +shader26 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +alias26 = "AfterglowPass" -shader29 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear29 = true -scale_type29 = source -mipmap_input29 = true -scale29 = 1.0 +shader27 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear27 = true +scale_type27 = source +mipmap_input27 = true +scale27 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader30 = ../../shaders/dogway/hsm-grade.slang -filter_linear30 = false -scale_type30 = source -scale30 = 1.0 -alias30 = "ColorCorrectPass" +shader28 = ../../shaders/dogway/hsm-grade.slang +filter_linear28 = false +scale_type28 = source +scale28 = 1.0 +alias28 = "ColorCorrectPass" -shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader29 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 + +shader30 = ../../shaders/base/stock.slang +filter_linear30 = true +scale_type30 = source +scale_x30 = 1.0 +scale_y30 = 1.0 +alias30 = "PrePass" +mipmap_input30 = true + +shader31 = ../../shaders/guest/hsm-avg-lum.slang filter_linear31 = true scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 - -shader32 = ../../shaders/base/stock.slang -filter_linear32 = true -scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 -alias32 = "PrePass" -mipmap_input32 = true - -shader33 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -mipmap_input33 = true -alias33 = "AvgLumPass" +scale31 = 1.0 +mipmap_input31 = true +alias31 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -float_framebuffer34 = true -alias34 = "LinearizePass" +shader32 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear32 = true +scale_type32 = source +scale32 = 1.0 +float_framebuffer32 = true +alias32 = "LinearizePass" -shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader33 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = source +scale_y33 = 1.0 +float_framebuffer33 = true + +shader34 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear34 = true +scale_type_x34 = absolute +scale_x34 = 800.0 +scale_type_y34 = absolute +scale_y34 = 600.0 +float_framebuffer34 = true +alias34 = GlowPass + +shader35 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear35 = true scale_type_x35 = absolute scale_x35 = 800.0 -scale_type_y35 = source -scale_y35 = 1.0 +scale_type_y35 = absolute +scale_y35 = 600.0 float_framebuffer35 = true -shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader36 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type_x36 = source +scale_x36 = 1.0 +scale_type_y36 = source +scale_y36 = 1.0 float_framebuffer36 = true -alias36 = GlowPass +alias36 = BloomPass -shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader37 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear37 = true -scale_type_x37 = absolute -scale_x37 = 800.0 -scale_type_y37 = absolute -scale_y37 = 600.0 +scale_type37 = viewport +scale_x37 = 1.0 +scale_y37 = 1.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-bloom_vertical.slang +shader38 = ../../shaders/guest/hsm-deconvergence.slang filter_linear38 = true -scale_type_x38 = source +scale_type38 = viewport scale_x38 = 1.0 -scale_type_y38 = source scale_y38 = 1.0 float_framebuffer38 = true -alias38 = BloomPass +alias38 = "CRTPass" -shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear39 = true +shader39 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input39 = true scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 float_framebuffer39 = true +alias39 = "PostCRTPass" -shader40 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader40 = ../../shaders/base/bezel-images-under-crt.slang filter_linear40 = true scale_type40 = viewport -scale_x40 = 1.0 -scale_y40 = 1.0 float_framebuffer40 = true -alias40 = "CRTPass" +alias40 = "BR_LayersUnderCRTPass" -shader41 = ../../shaders/base/post-crt-prep-image-layers.slang +shader41 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear41 = true scale_type41 = viewport float_framebuffer41 = true -alias41 = "PostCRTPass" +alias41 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -279,24 +309,10 @@ shader47 = ../../shaders/base/reflection.slang scale_type47 = viewport alias47 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader48 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear48 = true -scale_type48 = viewport -float_framebuffer48 = true -alias48 = "BR_LayersUnderCRTPass" - -shader49 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear49 = true -scale_type49 = viewport -float_framebuffer49 = true -alias49 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader50 = ../../shaders/base/combine-passes.slang -scale_type50 = viewport -alias50 = "CombinePass" +shader48 = ../../shaders/base/combine-passes.slang +scale_type48 = viewport +alias48 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -388,7 +404,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -397,7 +413,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp index 0dd9f38..6e81d35 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__0__SMOOTH-ADV__GDV__DREZ-480p.slangp @@ -1,4 +1,4 @@ -shaders = 51 +shaders = 49 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,175 +51,205 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false -shader19 = ../../shaders/base/stock.slang -alias19 = refpass +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader20 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" + +shader17 = ../../shaders/base/stock.slang +alias17 = refpass + +shader18 = ../../shaders/scalefx/hsm-scalefx-pass0.slang +filter_linear18 = false +scale_type18 = source +scale18 = 1.0 +float_framebuffer18 = true +alias18 = scalefx_pass0 + +shader19 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +filter_linear19 = false +scale_type19 = source +scale19 = 1.0 +float_framebuffer12 = true + +shader20 = ../../shaders/scalefx/hsm-scalefx-pass2.slang filter_linear20 = false scale_type20 = source scale20 = 1.0 -float_framebuffer20 = true -alias20 = scalefx_pass0 -shader21 = ../../shaders/scalefx/hsm-scalefx-pass1.slang +shader21 = ../../shaders/scalefx/hsm-scalefx-pass3.slang filter_linear21 = false scale_type21 = source scale21 = 1.0 -float_framebuffer12 = true -shader22 = ../../shaders/scalefx/hsm-scalefx-pass2.slang +shader22 = ../../shaders/scalefx/hsm-scalefx-pass4.slang filter_linear22 = false scale_type22 = source -scale22 = 1.0 - -shader23 = ../../shaders/scalefx/hsm-scalefx-pass3.slang -filter_linear23 = false -scale_type23 = source -scale23 = 1.0 - -shader24 = ../../shaders/scalefx/hsm-scalefx-pass4.slang -filter_linear24 = false -scale_type24 = source -scale24 = 3 +scale22 = 3 // GTU TV Processing -shader25 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type25 = source -scale25 = 1.0 -float_framebuffer25 = true +shader23 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type23 = source +scale23 = 1.0 +float_framebuffer23 = true -shader26 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x26 = source -scale_x26 = 1.0 -scale_type_y26 = source -scale_y26 = 1.0 -filter_linear26 = false -float_framebuffer26 = true +shader24 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x24 = source +scale_x24 = 1.0 +scale_type_y24 = source +scale_y24 = 1.0 +filter_linear24 = false +float_framebuffer24 = true -shader27 = ../../shaders/base/stock.slang -alias27 = "PreCRTPass" +shader25 = ../../shaders/base/stock.slang +alias25 = "PreCRTPass" -shader28 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -alias28 = "AfterglowPass" +shader26 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +alias26 = "AfterglowPass" -shader29 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear29 = true -scale_type29 = source -mipmap_input29 = true -scale29 = 1.0 +shader27 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear27 = true +scale_type27 = source +mipmap_input27 = true +scale27 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader30 = ../../shaders/dogway/hsm-grade.slang -filter_linear30 = false -scale_type30 = source -scale30 = 1.0 -alias30 = "ColorCorrectPass" +shader28 = ../../shaders/dogway/hsm-grade.slang +filter_linear28 = false +scale_type28 = source +scale28 = 1.0 +alias28 = "ColorCorrectPass" -shader31 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader29 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear29 = true +scale_type29 = source +scale_x29 = 1.0 +scale_y29 = 1.0 + +shader30 = ../../shaders/base/stock.slang +filter_linear30 = true +scale_type30 = source +scale_x30 = 1.0 +scale_y30 = 1.0 +alias30 = "PrePass" +mipmap_input30 = true + +shader31 = ../../shaders/guest/hsm-avg-lum.slang filter_linear31 = true scale_type31 = source -scale_x31 = 1.0 -scale_y31 = 1.0 - -shader32 = ../../shaders/base/stock.slang -filter_linear32 = true -scale_type32 = source -scale_x32 = 1.0 -scale_y32 = 1.0 -alias32 = "PrePass" -mipmap_input32 = true - -shader33 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear33 = true -scale_type33 = source -scale33 = 1.0 -mipmap_input33 = true -alias33 = "AvgLumPass" +scale31 = 1.0 +mipmap_input31 = true +alias31 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader34 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear34 = true -scale_type34 = source -scale34 = 1.0 -float_framebuffer34 = true -alias34 = "LinearizePass" +shader32 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear32 = true +scale_type32 = source +scale32 = 1.0 +float_framebuffer32 = true +alias32 = "LinearizePass" -shader35 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader33 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear33 = true +scale_type_x33 = absolute +scale_x33 = 800.0 +scale_type_y33 = source +scale_y33 = 1.0 +float_framebuffer33 = true + +shader34 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear34 = true +scale_type_x34 = absolute +scale_x34 = 800.0 +scale_type_y34 = absolute +scale_y34 = 600.0 +float_framebuffer34 = true +alias34 = GlowPass + +shader35 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear35 = true scale_type_x35 = absolute scale_x35 = 800.0 -scale_type_y35 = source -scale_y35 = 1.0 +scale_type_y35 = absolute +scale_y35 = 600.0 float_framebuffer35 = true -shader36 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader36 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear36 = true -scale_type_x36 = absolute -scale_x36 = 800.0 -scale_type_y36 = absolute -scale_y36 = 600.0 +scale_type_x36 = source +scale_x36 = 1.0 +scale_type_y36 = source +scale_y36 = 1.0 float_framebuffer36 = true -alias36 = GlowPass +alias36 = BloomPass -shader37 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader37 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear37 = true -scale_type_x37 = absolute -scale_x37 = 800.0 -scale_type_y37 = absolute -scale_y37 = 600.0 +scale_type37 = viewport +scale_x37 = 1.0 +scale_y37 = 1.0 float_framebuffer37 = true -shader38 = ../../shaders/guest/hsm-bloom_vertical.slang +shader38 = ../../shaders/guest/hsm-deconvergence.slang filter_linear38 = true -scale_type_x38 = source +scale_type38 = viewport scale_x38 = 1.0 -scale_type_y38 = source scale_y38 = 1.0 float_framebuffer38 = true -alias38 = BloomPass +alias38 = "CRTPass" -shader39 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear39 = true +shader39 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input39 = true scale_type39 = viewport -scale_x39 = 1.0 -scale_y39 = 1.0 float_framebuffer39 = true +alias39 = "PostCRTPass" -shader40 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader40 = ../../shaders/base/bezel-images-under-crt.slang filter_linear40 = true scale_type40 = viewport -scale_x40 = 1.0 -scale_y40 = 1.0 float_framebuffer40 = true -alias40 = "CRTPass" +alias40 = "BR_LayersUnderCRTPass" -shader41 = ../../shaders/base/post-crt-prep-image-layers.slang +shader41 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear41 = true scale_type41 = viewport float_framebuffer41 = true -alias41 = "PostCRTPass" +alias41 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -279,24 +309,10 @@ shader47 = ../../shaders/base/reflection.slang scale_type47 = viewport alias47 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader48 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear48 = true -scale_type48 = viewport -float_framebuffer48 = true -alias48 = "BR_LayersUnderCRTPass" - -shader49 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear49 = true -scale_type49 = viewport -float_framebuffer49 = true -alias49 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader50 = ../../shaders/base/combine-passes.slang -scale_type50 = viewport -alias50 = "CombinePass" +shader48 = ../../shaders/base/combine-passes.slang +scale_type48 = viewport +alias48 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -388,7 +404,7 @@ TopLayerImage_mipmap = 1 // HSM_ASPECT_RATIO_MODE = 6 // HSM_CURVATURE_MODE = 0 // SMOOTH-ADV -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 HSM_SCALEFX_ON = 1 @@ -397,7 +413,7 @@ HSM_CORE_RES_SAMPLING_MULT_OPPOSITE_DIR = 100 HSM_DOWNSAMPLE_BLUR_SCANLINE_DIR = 0 HSM_DOWNSAMPLE_BLUR_OPPOSITE_DIR = 30 -ntsc_scale = 0.4 +ntsc_scale = 0.33 // Lottes mask, a bit like a slot mask effect shadowMask = 1 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp index 645ed4a..3909696 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-240p.slangp @@ -1,4 +1,4 @@ -shaders = 48 +shaders = 46 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,165 +51,195 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false -shader19 = ../../shaders/base/stock.slang -alias19 = "PreCRTPass" +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader20 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear20 = true -scale_type20 = source -scale20 = 1.0 -alias20 = "AfterglowPass" +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear21 = true -scale_type21 = source -mipmap_input21 = true -scale21 = 1.0 +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" + +shader17 = ../../shaders/base/stock.slang +alias17 = "PreCRTPass" + +shader18 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear18 = true +scale_type18 = source +scale18 = 1.0 +alias18 = "AfterglowPass" + +shader19 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear19 = true +scale_type19 = source +mipmap_input19 = true +scale19 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader22 = ../../shaders/dogway/hsm-grade.slang +shader20 = ../../shaders/dogway/hsm-grade.slang +filter_linear20 = false +scale_type20 = source +scale20 = 1.0 +alias20 = "ColorCorrectPass" + +shader21 = ../../shaders/base/stock.slang +alias21 = "PrePass0" + +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear22 = false -scale_type22 = source -scale22 = 1.0 -alias22 = "ColorCorrectPass" +float_framebuffer22 = true +scale_type_x22 = source +scale_type_y22 = source +scale_x22 = 4.0 +scale_y22 = 1.0 +frame_count_mod22 = 2 +alias22 = NPass1 -shader23 = ../../shaders/base/stock.slang -alias23 = "PrePass0" +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer23 = true +filter_linear23 = true +scale_type23 = source +scale_x23 = 0.5 +scale_y23 = 1.0 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear24 = false -float_framebuffer24 = true -scale_type_x24 = source -scale_type_y24 = source -scale_x24 = 4.0 +shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 scale_y24 = 1.0 -frame_count_mod24 = 2 -alias24 = NPass1 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer25 = true +shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear25 = true scale_type25 = source -scale_x25 = 0.5 +scale_x25 = 1.0 scale_y25 = 1.0 -shader26 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader26 = ../../shaders/base/stock.slang filter_linear26 = true scale_type26 = source scale_x26 = 1.0 scale_y26 = 1.0 +alias26 = "PrePass" +mipmap_input26 = true -shader27 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader27 = ../../shaders/guest/hsm-avg-lum.slang filter_linear27 = true scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 - -shader28 = ../../shaders/base/stock.slang -filter_linear28 = true -scale_type28 = source -scale_x28 = 1.0 -scale_y28 = 1.0 -alias28 = "PrePass" -mipmap_input28 = true - -shader29 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -mipmap_input29 = true -alias29 = "AvgLumPass" +scale27 = 1.0 +mipmap_input27 = true +alias27 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader30 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +float_framebuffer28 = true +alias28 = "LinearizePass" + +shader29 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear29 = true +scale_type_x29 = viewport +scale_x29 = 1.0 +scale_type_y29 = source +scale_y29 = 1.0 +float_framebuffer29 = true +alias29 = Pass1 + +shader30 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear30 = true -scale_type30 = source -scale30 = 1.0 +scale_type_x30 = absolute +scale_x30 = 640.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = "LinearizePass" -shader31 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader31 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear31 = true -scale_type_x31 = viewport -scale_x31 = 1.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_x31 = absolute +scale_x31 = 640.0 +scale_type_y31 = absolute +scale_y31 = 480.0 float_framebuffer31 = true -alias31 = Pass1 +alias31 = GlowPass -shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear32 = true scale_type_x32 = absolute scale_x32 = 640.0 -scale_type_y32 = source -scale_y32 = 1.0 +scale_type_y32 = absolute +scale_y32 = 480.0 float_framebuffer32 = true -shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader33 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear33 = true scale_type_x33 = absolute scale_x33 = 640.0 scale_type_y33 = absolute scale_y33 = 480.0 float_framebuffer33 = true -alias33 = GlowPass +alias33 = BloomPass -shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader34 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear34 = true -scale_type_x34 = absolute -scale_x34 = 640.0 -scale_type_y34 = absolute -scale_y34 = 480.0 +scale_type34 = viewport +scale_x34 = 1.0 +scale_y34 = 1.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-bloom_vertical.slang +shader35 = ../../shaders/guest/hsm-deconvergence.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 640.0 -scale_type_y35 = absolute -scale_y35 = 480.0 +scale_type35 = viewport +scale_x35 = 1.0 +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = BloomPass +alias35 = "CRTPass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear36 = true +shader36 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input36 = true scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 float_framebuffer36 = true +alias36 = "PostCRTPass" -shader37 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader37 = ../../shaders/base/bezel-images-under-crt.slang filter_linear37 = true scale_type37 = viewport -scale_x37 = 1.0 -scale_y37 = 1.0 float_framebuffer37 = true -alias37 = "CRTPass" +alias37 = "BR_LayersUnderCRTPass" -shader38 = ../../shaders/base/post-crt-prep-image-layers.slang +shader38 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear38 = true scale_type38 = viewport float_framebuffer38 = true -alias38 = "PostCRTPass" +alias38 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -269,24 +299,10 @@ shader44 = ../../shaders/base/reflection.slang scale_type44 = viewport alias44 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader45 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear45 = true -scale_type45 = viewport -float_framebuffer45 = true -alias45 = "BR_LayersUnderCRTPass" - -shader46 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear46 = true -scale_type46 = viewport -float_framebuffer46 = true -alias46 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader47 = ../../shaders/base/combine-passes.slang -scale_type47 = viewport -alias47 = "CombinePass" +shader45 = ../../shaders/base/combine-passes.slang +scale_type45 = viewport +alias45 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -381,6 +397,9 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp index f2094b2..f184414 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV-NTSC__DREZ-480p.slangp @@ -1,4 +1,4 @@ -shaders = 48 +shaders = 46 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,165 +51,195 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false -shader19 = ../../shaders/base/stock.slang -alias19 = "PreCRTPass" +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang -shader20 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear20 = true -scale_type20 = source -scale20 = 1.0 -alias20 = "AfterglowPass" +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang -shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear21 = true -scale_type21 = source -mipmap_input21 = true -scale21 = 1.0 +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" + +shader17 = ../../shaders/base/stock.slang +alias17 = "PreCRTPass" + +shader18 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear18 = true +scale_type18 = source +scale18 = 1.0 +alias18 = "AfterglowPass" + +shader19 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear19 = true +scale_type19 = source +mipmap_input19 = true +scale19 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader22 = ../../shaders/dogway/hsm-grade.slang +shader20 = ../../shaders/dogway/hsm-grade.slang +filter_linear20 = false +scale_type20 = source +scale20 = 1.0 +alias20 = "ColorCorrectPass" + +shader21 = ../../shaders/base/stock.slang +alias21 = "PrePass0" + +shader22 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang filter_linear22 = false -scale_type22 = source -scale22 = 1.0 -alias22 = "ColorCorrectPass" +float_framebuffer22 = true +scale_type_x22 = source +scale_type_y22 = source +scale_x22 = 4.0 +scale_y22 = 1.0 +frame_count_mod22 = 2 +alias22 = NPass1 -shader23 = ../../shaders/base/stock.slang -alias23 = "PrePass0" +shader23 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang +float_framebuffer23 = true +filter_linear23 = true +scale_type23 = source +scale_x23 = 0.5 +scale_y23 = 1.0 -shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass1.slang -filter_linear24 = false -float_framebuffer24 = true -scale_type_x24 = source -scale_type_y24 = source -scale_x24 = 4.0 +shader24 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 scale_y24 = 1.0 -frame_count_mod24 = 2 -alias24 = NPass1 -shader25 = ../../shaders/guest/ntsc/hsm-ntsc-pass2.slang -float_framebuffer25 = true +shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang filter_linear25 = true scale_type25 = source -scale_x25 = 0.5 +scale_x25 = 1.0 scale_y25 = 1.0 -shader26 = ../../shaders/guest/ntsc/hsm-ntsc-pass3.slang +shader26 = ../../shaders/base/stock.slang filter_linear26 = true scale_type26 = source scale_x26 = 1.0 scale_y26 = 1.0 +alias26 = "PrePass" +mipmap_input26 = true -shader27 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader27 = ../../shaders/guest/hsm-avg-lum.slang filter_linear27 = true scale_type27 = source -scale_x27 = 1.0 -scale_y27 = 1.0 - -shader28 = ../../shaders/base/stock.slang -filter_linear28 = true -scale_type28 = source -scale_x28 = 1.0 -scale_y28 = 1.0 -alias28 = "PrePass" -mipmap_input28 = true - -shader29 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear29 = true -scale_type29 = source -scale29 = 1.0 -mipmap_input29 = true -alias29 = "AvgLumPass" +scale27 = 1.0 +mipmap_input27 = true +alias27 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader30 = ../../shaders/guest/hsm-interlace-and-linearize.slang +shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear28 = true +scale_type28 = source +scale28 = 1.0 +float_framebuffer28 = true +alias28 = "LinearizePass" + +shader29 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +filter_linear29 = true +scale_type_x29 = viewport +scale_x29 = 1.0 +scale_type_y29 = source +scale_y29 = 1.0 +float_framebuffer29 = true +alias29 = Pass1 + +shader30 = ../../shaders/guest/hsm-gaussian_horizontal.slang filter_linear30 = true -scale_type30 = source -scale30 = 1.0 +scale_type_x30 = absolute +scale_x30 = 640.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = "LinearizePass" -shader31 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.slang +shader31 = ../../shaders/guest/hsm-gaussian_vertical.slang filter_linear31 = true -scale_type_x31 = viewport -scale_x31 = 1.0 -scale_type_y31 = source -scale_y31 = 1.0 +scale_type_x31 = absolute +scale_x31 = 640.0 +scale_type_y31 = absolute +scale_y31 = 480.0 float_framebuffer31 = true -alias31 = Pass1 +alias31 = GlowPass -shader32 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader32 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear32 = true scale_type_x32 = absolute scale_x32 = 640.0 -scale_type_y32 = source -scale_y32 = 1.0 +scale_type_y32 = absolute +scale_y32 = 480.0 float_framebuffer32 = true -shader33 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader33 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear33 = true scale_type_x33 = absolute scale_x33 = 640.0 scale_type_y33 = absolute scale_y33 = 480.0 float_framebuffer33 = true -alias33 = GlowPass +alias33 = BloomPass -shader34 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader34 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear34 = true -scale_type_x34 = absolute -scale_x34 = 640.0 -scale_type_y34 = absolute -scale_y34 = 480.0 +scale_type34 = viewport +scale_x34 = 1.0 +scale_y34 = 1.0 float_framebuffer34 = true -shader35 = ../../shaders/guest/hsm-bloom_vertical.slang +shader35 = ../../shaders/guest/hsm-deconvergence.slang filter_linear35 = true -scale_type_x35 = absolute -scale_x35 = 640.0 -scale_type_y35 = absolute -scale_y35 = 480.0 +scale_type35 = viewport +scale_x35 = 1.0 +scale_y35 = 1.0 float_framebuffer35 = true -alias35 = BloomPass +alias35 = "CRTPass" -shader36 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang -filter_linear36 = true +shader36 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input36 = true scale_type36 = viewport -scale_x36 = 1.0 -scale_y36 = 1.0 float_framebuffer36 = true +alias36 = "PostCRTPass" -shader37 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader37 = ../../shaders/base/bezel-images-under-crt.slang filter_linear37 = true scale_type37 = viewport -scale_x37 = 1.0 -scale_y37 = 1.0 float_framebuffer37 = true -alias37 = "CRTPass" +alias37 = "BR_LayersUnderCRTPass" -shader38 = ../../shaders/base/post-crt-prep-image-layers.slang +shader38 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear38 = true scale_type38 = viewport float_framebuffer38 = true -alias38 = "PostCRTPass" +alias38 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -269,24 +299,10 @@ shader44 = ../../shaders/base/reflection.slang scale_type44 = viewport alias44 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader45 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear45 = true -scale_type45 = viewport -float_framebuffer45 = true -alias45 = "BR_LayersUnderCRTPass" - -shader46 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear46 = true -scale_type46 = viewport -float_framebuffer46 = true -alias46 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader47 = ../../shaders/base/combine-passes.slang -scale_type47 = viewport -alias47 = "CombinePass" +shader45 = ../../shaders/base/combine-passes.slang +scale_type45 = viewport +alias45 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" @@ -381,6 +397,9 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp index fb47054..a1fa3f0 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-1080p.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp index 63f4003..077ce93 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-224p.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp index 416055e..2ae0610 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-240p.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp index 54e0ca3..97233fc 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-3DS-400x480.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp index 29a4496..6c1f719 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-480p.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp index cdd035e..e833254 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-NDS-256x384.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp index 2aa594d..c80790c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-480x272.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp index 2786edc..0d88c27 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__GDV__DREZ-PSP-960x544.slangp @@ -1,4 +1,4 @@ -shaders = 45 +shaders = 43 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,144 +51,174 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/guest/hsm-gaussian_horizontal.slang +shader27 = ../../shaders/guest/hsm-gaussian_horizontal.slang +filter_linear27 = true +scale_type_x27 = absolute +scale_x27 = 800.0 +scale_type_y27 = source +scale_y27 = 1.0 +float_framebuffer27 = true + +shader28 = ../../shaders/guest/hsm-gaussian_vertical.slang +filter_linear28 = true +scale_type_x28 = absolute +scale_x28 = 800.0 +scale_type_y28 = absolute +scale_y28 = 600.0 +float_framebuffer28 = true +alias28 = GlowPass + +shader29 = ../../shaders/guest/hsm-bloom_horizontal.slang filter_linear29 = true scale_type_x29 = absolute scale_x29 = 800.0 -scale_type_y29 = source -scale_y29 = 1.0 +scale_type_y29 = absolute +scale_y29 = 600.0 float_framebuffer29 = true -shader30 = ../../shaders/guest/hsm-gaussian_vertical.slang +shader30 = ../../shaders/guest/hsm-bloom_vertical.slang filter_linear30 = true -scale_type_x30 = absolute -scale_x30 = 800.0 -scale_type_y30 = absolute -scale_y30 = 600.0 +scale_type_x30 = source +scale_x30 = 1.0 +scale_type_y30 = source +scale_y30 = 1.0 float_framebuffer30 = true -alias30 = GlowPass +alias30 = BloomPass -shader31 = ../../shaders/guest/hsm-bloom_horizontal.slang +shader31 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear31 = true -scale_type_x31 = absolute -scale_x31 = 800.0 -scale_type_y31 = absolute -scale_y31 = 600.0 +scale_type31 = viewport +scale_x31 = 1.0 +scale_y31 = 1.0 float_framebuffer31 = true -shader32 = ../../shaders/guest/hsm-bloom_vertical.slang +shader32 = ../../shaders/guest/hsm-deconvergence.slang filter_linear32 = true -scale_type_x32 = source +scale_type32 = viewport scale_x32 = 1.0 -scale_type_y32 = source scale_y32 = 1.0 float_framebuffer32 = true -alias32 = BloomPass +alias32 = "CRTPass" -shader33 = ../../shaders/guest/hsm-crt-guest-advanced.slang -filter_linear33 = true +shader33 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input33 = true scale_type33 = viewport -scale_x33 = 1.0 -scale_y33 = 1.0 float_framebuffer33 = true +alias33 = "PostCRTPass" -shader34 = ../../shaders/guest/hsm-deconvergence.slang +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader34 = ../../shaders/base/bezel-images-under-crt.slang filter_linear34 = true scale_type34 = viewport -scale_x34 = 1.0 -scale_y34 = 1.0 float_framebuffer34 = true -alias34 = "CRTPass" +alias34 = "BR_LayersUnderCRTPass" -shader35 = ../../shaders/base/post-crt-prep-image-layers.slang +shader35 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear35 = true scale_type35 = viewport float_framebuffer35 = true -alias35 = "PostCRTPass" +alias35 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -248,24 +278,10 @@ shader41 = ../../shaders/base/reflection.slang scale_type41 = viewport alias41 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader42 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear42 = true -scale_type42 = viewport -float_framebuffer42 = true -alias42 = "BR_LayersUnderCRTPass" - -shader43 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear43 = true -scale_type43 = viewport -float_framebuffer43 = true -alias43 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader44 = ../../shaders/base/combine-passes.slang -scale_type44 = viewport -alias44 = "CombinePass" +shader42 = ../../shaders/base/combine-passes.slang +scale_type42 = viewport +alias42 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp index cee4694..fc8b27b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-3DS-400x480.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,105 +51,135 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/base/delinearize.slang -float_framebuffer29 = "true" +shader27 = ../../shaders/base/delinearize.slang +float_framebuffer27 = "true" -shader30 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear30 = "false" -scale_type30 = "viewport" -scale30 = "1.0" -float_framebuffer30 = "true" -alias30 = "CRTPass" +shader28 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear28 = "false" +scale_type28 = "viewport" +scale28 = "1.0" +float_framebuffer28 = "true" +alias28 = "CRTPass" -shader31 = ../../shaders/base/post-crt-prep-image-layers.slang +shader29 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader30 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "BR_LayersUnderCRTPass" + +shader31 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear31 = true scale_type31 = viewport float_framebuffer31 = true -alias31 = "PostCRTPass" +alias31 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -209,24 +239,10 @@ shader37 = ../../shaders/base/reflection.slang scale_type37 = viewport alias37 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" - -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp index 381cd28..3ea12dc 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-NDS-256x384.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,105 +51,135 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/base/delinearize.slang -float_framebuffer29 = "true" +shader27 = ../../shaders/base/delinearize.slang +float_framebuffer27 = "true" -shader30 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear30 = "false" -scale_type30 = "viewport" -scale30 = "1.0" -float_framebuffer30 = "true" -alias30 = "CRTPass" +shader28 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear28 = "false" +scale_type28 = "viewport" +scale28 = "1.0" +float_framebuffer28 = "true" +alias28 = "CRTPass" -shader31 = ../../shaders/base/post-crt-prep-image-layers.slang +shader29 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader30 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "BR_LayersUnderCRTPass" + +shader31 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear31 = true scale_type31 = viewport float_framebuffer31 = true -alias31 = "PostCRTPass" +alias31 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -209,24 +239,10 @@ shader37 = ../../shaders/base/reflection.slang scale_type37 = viewport alias37 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" - -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp index f9a74dd..802573a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__1__ADV__LCD-GRID__DREZ-PSP-480x272.slangp @@ -1,4 +1,4 @@ -shaders = 41 +shaders = 39 shader0 = ../../shaders/base/add-params-all.slang alias0 = "CorePass" @@ -51,105 +51,135 @@ alias6 = "IntroPass" shader7 = ../../shaders/dedither/dedither-gamma-prep-1-before.slang alias7 = LinearGamma -shader8 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass1.slang -shader9 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass2.slang -shader10 = ../../shaders/hyllian/checkerboard-dedither/checkerboard-dedither-pass3.slang -alias10 = "PreMdaptPass" +shader8 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang +filter_linear8 = false +scale_type8 = source +scale8 = 1.0 -// De-Dithering - Mdapt -shader11 = ../../shaders/mdapt/hsm-mdapt-pass0.slang -shader12 = ../../shaders/mdapt/hsm-mdapt-pass1.slang -shader13 = ../../shaders/mdapt/hsm-mdapt-pass2.slang -shader14 = ../../shaders/mdapt/hsm-mdapt-pass3.slang -shader15 = ../../shaders/mdapt/hsm-mdapt-pass4.slang +shader9 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang +filter_linear9 = false +scale_type9 = source +scale9 = 1.0 -shader16 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang +shader10 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang +filter_linear10 = false +scale_type10 = source +scale10 = 1.0 +alias10 = CB_Output -shader17 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +shader11 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang +filter_linear11 = false +scale_type11 = source +scale11 = 1.0 -shader18 = ../../shaders/guest/extras/hsm-sharpsmoother.slang -alias18 = "DeditherPass" +shader12 = ../../shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang +filter_linear12 = false + +shader13 = ../../shaders/dedither/dedither-gamma-prep-2-after.slang + +shader14 = ../../shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang + +shader15 = ../../shaders/guest/extras/hsm-g-sharp_resampler.slang +alias15 = "DeditherPass" + +shader16 = ../../shaders/guest/extras/hsm-sharpsmoother.slang +// alias16 = "DeditherPass" // GTU TV Processing -shader19 = ../../shaders/gtu/hsm-gtu-pass1.slang -scale_type19 = source -scale19 = 1.0 -float_framebuffer19 = true +shader17 = ../../shaders/gtu/hsm-gtu-pass1.slang +scale_type17 = source +scale17 = 1.0 +float_framebuffer17 = true -shader20 = ../../shaders/gtu/hsm-gtu-pass2.slang -scale_type_x20 = source -scale_x20 = 1.0 -scale_type_y20 = source -scale_y20 = 1.0 -filter_linear20 = false -float_framebuffer20 = true +shader18 = ../../shaders/gtu/hsm-gtu-pass2.slang +scale_type_x18 = source +scale_x18 = 1.0 +scale_type_y18 = source +scale_y18 = 1.0 +filter_linear18 = false +float_framebuffer18 = true -shader21 = ../../shaders/base/stock.slang -alias21 = "PreCRTPass" +shader19 = ../../shaders/base/stock.slang +alias19 = "PreCRTPass" -shader22 = ../../shaders/guest/hsm-afterglow0.slang -filter_linear22 = true -scale_type22 = source -scale22 = 1.0 -alias22 = "AfterglowPass" +shader20 = ../../shaders/guest/hsm-afterglow0.slang +filter_linear20 = true +scale_type20 = source +scale20 = 1.0 +alias20 = "AfterglowPass" -shader23 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang -filter_linear23 = true -scale_type23 = source -mipmap_input23 = true -scale23 = 1.0 +shader21 = ../../shaders/guest/hsm-pre-shaders-afterglow.slang +filter_linear21 = true +scale_type21 = source +mipmap_input21 = true +scale21 = 1.0 // Color Correction with Dogway's awesome Grade shader // Grade is after Afterglow so that brightening the black level does not break the afterglow -shader24 = ../../shaders/dogway/hsm-grade.slang -filter_linear24 = false -scale_type24 = source -scale24 = 1.0 -alias24 = "ColorCorrectPass" +shader22 = ../../shaders/dogway/hsm-grade.slang +filter_linear22 = false +scale_type22 = source +scale22 = 1.0 +alias22 = "ColorCorrectPass" -shader25 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +shader23 = ../../shaders/guest/hsm-custom-fast-sharpen.slang +filter_linear23 = true +scale_type23 = source +scale_x23 = 1.0 +scale_y23 = 1.0 + +shader24 = ../../shaders/base/stock.slang +filter_linear24 = true +scale_type24 = source +scale_x24 = 1.0 +scale_y24 = 1.0 +alias24 = "PrePass" +mipmap_input24 = true + +shader25 = ../../shaders/guest/hsm-avg-lum.slang filter_linear25 = true scale_type25 = source -scale_x25 = 1.0 -scale_y25 = 1.0 - -shader26 = ../../shaders/base/stock.slang -filter_linear26 = true -scale_type26 = source -scale_x26 = 1.0 -scale_y26 = 1.0 -alias26 = "PrePass" -mipmap_input26 = true - -shader27 = ../../shaders/guest/hsm-avg-lum.slang -filter_linear27 = true -scale_type27 = source -scale27 = 1.0 -mipmap_input27 = true -alias27 = "AvgLumPass" +scale25 = 1.0 +mipmap_input25 = true +alias25 = "AvgLumPass" // Pass referenced by subsequent blurring passes and crt pass -shader28 = ../../shaders/guest/hsm-interlace-and-linearize.slang -filter_linear28 = true -scale_type28 = source -scale28 = 1.0 -float_framebuffer28 = true -alias28 = "LinearizePass" +shader26 = ../../shaders/guest/hsm-interlace-and-linearize.slang +filter_linear26 = true +scale_type26 = source +scale26 = 1.0 +float_framebuffer26 = true +alias26 = "LinearizePass" -shader29 = ../../shaders/base/delinearize.slang -float_framebuffer29 = "true" +shader27 = ../../shaders/base/delinearize.slang +float_framebuffer27 = "true" -shader30 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang -filter_linear30 = "false" -scale_type30 = "viewport" -scale30 = "1.0" -float_framebuffer30 = "true" -alias30 = "CRTPass" +shader28 = ../../shaders/lcd-cgwg/hsm-lcd-grid-v2.slang +filter_linear28 = "false" +scale_type28 = "viewport" +scale28 = "1.0" +float_framebuffer28 = "true" +alias28 = "CRTPass" -shader31 = ../../shaders/base/post-crt-prep-image-layers.slang +shader29 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "PostCRTPass" + +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader30 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear30 = true +scale_type30 = viewport +float_framebuffer30 = true +alias30 = "BR_LayersUnderCRTPass" + +shader31 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear31 = true scale_type31 = viewport float_framebuffer31 = true -alias31 = "PostCRTPass" +alias31 = "BR_LayersOverCRTPass" // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution @@ -209,24 +239,10 @@ shader37 = ../../shaders/base/reflection.slang scale_type37 = viewport alias37 = "ReflectionPass" -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader38 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear38 = true -scale_type38 = viewport -float_framebuffer38 = true -alias38 = "BR_LayersUnderCRTPass" - -shader39 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear39 = true -scale_type39 = viewport -float_framebuffer39 = true -alias39 = "BR_LayersOverCRTPass" - // Combine Passes ---------------------------------------------------------------- -shader40 = ../../shaders/base/combine-passes.slang -scale_type40 = viewport -alias40 = "CombinePass" +shader38 = ../../shaders/base/combine-passes.slang +scale_type38 = viewport +alias38 = "CombinePass" // Define textures to be used by the different passes textures = "SamplerLUT1;SamplerLUT2;SamplerLUT3;SamplerLUT4;IntroImage;ScreenPlacementImage;TubeDiffuseImage;TubeColoredGelImage;TubeShadowImage;TubeStaticReflectionImage;BackgroundImage;BackgroundVertImage;ReflectionMaskImage;FrameTextureImage;CabinetGlassImage;DeviceImage;DeviceVertImage;DeviceLEDImage;DecalImage;NightLightingImage;NightLighting2Image;LEDImage;TopLayerImage;" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp index d75c508..d4dd829 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-240p.slangp @@ -145,81 +145,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang @@ -319,3 +320,6 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp index 2949112..f309c7c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI-NTSC__DREZ-480p.slangp @@ -145,81 +145,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang @@ -319,6 +320,9 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp index 50e5487..5269a09 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-1080p.slangp @@ -119,81 +119,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp index d115035..92dcabc 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-240p.slangp @@ -119,81 +119,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp index 3314e46..47d3aeb 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-MINI__DREZ-480p.slangp @@ -119,81 +119,82 @@ g_sat = 0.15 g_gamma_out = 2.45 shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp index 1184c26..e999725 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-240p.slangp @@ -172,7 +172,7 @@ scale_y24 = 480.0 float_framebuffer24 = true alias24 = BloomPass -shader25 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang +shader25 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear25 = true scale_type25 = viewport scale_x25 = 1.0 @@ -188,81 +188,82 @@ float_framebuffer26 = true alias26 = "CRTPass" shader27 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input27 = true scale_type27 = viewport float_framebuffer27 = true alias27 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader28 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "BR_LayersUnderCRTPass" + +shader29 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader28 = ../../shaders/base/linearize-crt.slang -mipmap_input28 = true -filter_linear28 = true -scale_type28 = absolute -// scale_x28 = 480 -// scale_y28 = 270 -// scale_x28 = 960 -// scale_y28 = 540 -scale_x28 = 800 -scale_y28 = 600 -float_framebuffer28 = true -alias28 = "BR_MirrorLowResPass" +shader30 = ../../shaders/base/linearize-crt.slang +mipmap_input30 = true +filter_linear30 = true +scale_type30 = absolute +// scale_x30 = 480 +// scale_y30 = 270 +// scale_x30 = 960 +// scale_y30 = 540 +scale_x30 = 800 +scale_y30 = 600 +float_framebuffer30 = true +alias30 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader29 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input29 = true -filter_linear29 = true -float_framebuffer29 = true +shader31 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input31 = true +filter_linear31 = true +float_framebuffer31 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader30 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear30 = true -float_framebuffer30 = true -alias30 = "BR_MirrorBlurredPass" +shader32 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear32 = true +float_framebuffer32 = true +alias32 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader31 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -scale_x31 = 128 -scale_y31 = 128 -float_framebuffer31 = true -alias31 = "BR_MirrorReflectionDiffusedPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 128 +scale_y33 = 128 +float_framebuffer33 = true +alias33 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader32 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input32 = true -filter_linear32 = true -scale_type32 = absolute -scale_x32 = 12 -scale_y32 = 12 -float_framebuffer32 = true -alias32 = "BR_MirrorFullscreenGlowPass" +shader34 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input34 = true +filter_linear34 = true +scale_type34 = absolute +scale_x34 = 12 +scale_y34 = 12 +float_framebuffer34 = true +alias34 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader33 = ../../shaders/base/reflection.slang -scale_type33 = viewport -alias33 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader34 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear34 = true -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "BR_LayersUnderCRTPass" - -shader35 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear35 = true +shader35 = ../../shaders/base/reflection.slang scale_type35 = viewport -float_framebuffer35 = true -alias35 = "BR_LayersOverCRTPass" +alias35 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader36 = ../../shaders/base/combine-passes.slang @@ -362,6 +363,9 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp index d668505..488c4f4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV-NTSC__DREZ-480p.slangp @@ -172,7 +172,7 @@ scale_y24 = 480.0 float_framebuffer24 = true alias24 = BloomPass -shader25 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2.slang +shader25 = ../../shaders/guest/hsm-crt-guest-advanced.slang filter_linear25 = true scale_type25 = viewport scale_x25 = 1.0 @@ -188,81 +188,82 @@ float_framebuffer26 = true alias26 = "CRTPass" shader27 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input27 = true scale_type27 = viewport float_framebuffer27 = true alias27 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader28 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear28 = true +scale_type28 = viewport +float_framebuffer28 = true +alias28 = "BR_LayersUnderCRTPass" + +shader29 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear29 = true +scale_type29 = viewport +float_framebuffer29 = true +alias29 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader28 = ../../shaders/base/linearize-crt.slang -mipmap_input28 = true -filter_linear28 = true -scale_type28 = absolute -// scale_x28 = 480 -// scale_y28 = 270 -// scale_x28 = 960 -// scale_y28 = 540 -scale_x28 = 800 -scale_y28 = 600 -float_framebuffer28 = true -alias28 = "BR_MirrorLowResPass" +shader30 = ../../shaders/base/linearize-crt.slang +mipmap_input30 = true +filter_linear30 = true +scale_type30 = absolute +// scale_x30 = 480 +// scale_y30 = 270 +// scale_x30 = 960 +// scale_y30 = 540 +scale_x30 = 800 +scale_y30 = 600 +float_framebuffer30 = true +alias30 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader29 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input29 = true -filter_linear29 = true -float_framebuffer29 = true +shader31 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input31 = true +filter_linear31 = true +float_framebuffer31 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader30 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear30 = true -float_framebuffer30 = true -alias30 = "BR_MirrorBlurredPass" +shader32 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear32 = true +float_framebuffer32 = true +alias32 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader31 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input31 = true -filter_linear31 = true -scale_type31 = absolute -scale_x31 = 128 -scale_y31 = 128 -float_framebuffer31 = true -alias31 = "BR_MirrorReflectionDiffusedPass" +shader33 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input33 = true +filter_linear33 = true +scale_type33 = absolute +scale_x33 = 128 +scale_y33 = 128 +float_framebuffer33 = true +alias33 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader32 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input32 = true -filter_linear32 = true -scale_type32 = absolute -scale_x32 = 12 -scale_y32 = 12 -float_framebuffer32 = true -alias32 = "BR_MirrorFullscreenGlowPass" +shader34 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input34 = true +filter_linear34 = true +scale_type34 = absolute +scale_x34 = 12 +scale_y34 = 12 +float_framebuffer34 = true +alias34 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader33 = ../../shaders/base/reflection.slang -scale_type33 = viewport -alias33 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader34 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear34 = true -scale_type34 = viewport -float_framebuffer34 = true -alias34 = "BR_LayersUnderCRTPass" - -shader35 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear35 = true +shader35 = ../../shaders/base/reflection.slang scale_type35 = viewport -float_framebuffer35 = true -alias35 = "BR_LayersOverCRTPass" +alias35 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader36 = ../../shaders/base/combine-passes.slang @@ -362,6 +363,9 @@ TopLayerImage_mipmap = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // DREZ Parameters SHARPEN = 0 diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp index d4af4a4..2b6ac7f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-1080p.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp index c2d0832..f3d08d4 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-224p.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp index 06f6843..4f9c48f 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-240p.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp index 0a946b7..4763d5a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-1600x1920.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp index f5b9af9..afd94d2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-3DS-400x480.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp index c363fd2..c0a11a2 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-480p.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp index 9ea77ad..43d856a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-1280x1920.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp index aa2e4de..49b8ca1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-NDS-256x384.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp index 91b313b..62eed98 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-480x272.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp index 1b16012..9f9316c 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__GDV__DREZ-PSP-960x544.slangp @@ -153,81 +153,82 @@ float_framebuffer21 = true alias21 = "CRTPass" shader22 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input22 = true scale_type22 = viewport float_framebuffer22 = true alias22 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader23 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear23 = true +scale_type23 = viewport +float_framebuffer23 = true +alias23 = "BR_LayersUnderCRTPass" + +shader24 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear24 = true +scale_type24 = viewport +float_framebuffer24 = true +alias24 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader23 = ../../shaders/base/linearize-crt.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -// scale_x23 = 480 -// scale_y23 = 270 -// scale_x23 = 960 -// scale_y23 = 540 -scale_x23 = 800 -scale_y23 = 600 -float_framebuffer23 = true -alias23 = "BR_MirrorLowResPass" +shader25 = ../../shaders/base/linearize-crt.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +// scale_x25 = 480 +// scale_y25 = 270 +// scale_x25 = 960 +// scale_y25 = 540 +scale_x25 = 800 +scale_y25 = 600 +float_framebuffer25 = true +alias25 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader24 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input24 = true -filter_linear24 = true -float_framebuffer24 = true +shader26 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input26 = true +filter_linear26 = true +float_framebuffer26 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader25 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear25 = true -float_framebuffer25 = true -alias25 = "BR_MirrorBlurredPass" +shader27 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear27 = true +float_framebuffer27 = true +alias27 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader26 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input26 = true -filter_linear26 = true -scale_type26 = absolute -scale_x26 = 128 -scale_y26 = 128 -float_framebuffer26 = true -alias26 = "BR_MirrorReflectionDiffusedPass" +shader28 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input28 = true +filter_linear28 = true +scale_type28 = absolute +scale_x28 = 128 +scale_y28 = 128 +float_framebuffer28 = true +alias28 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader27 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input27 = true -filter_linear27 = true -scale_type27 = absolute -scale_x27 = 12 -scale_y27 = 12 -float_framebuffer27 = true -alias27 = "BR_MirrorFullscreenGlowPass" +shader29 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input29 = true +filter_linear29 = true +scale_type29 = absolute +scale_x29 = 12 +scale_y29 = 12 +float_framebuffer29 = true +alias29 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader28 = ../../shaders/base/reflection.slang -scale_type28 = viewport -alias28 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader29 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear29 = true -scale_type29 = viewport -float_framebuffer29 = true -alias29 = "BR_LayersUnderCRTPass" - -shader30 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear30 = true +shader30 = ../../shaders/base/reflection.slang scale_type30 = viewport -float_framebuffer30 = true -alias30 = "BR_LayersOverCRTPass" +alias30 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader31 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp index b007727..68610d6 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-3DS-400x480.slangp @@ -114,81 +114,82 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp index c38806f..bc6b7af 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-NDS-256x384.slangp @@ -114,81 +114,82 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp index 82faaba..cf37ff1 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__3__STD__LCD-GRID__DREZ-PSP-480x272.slangp @@ -114,81 +114,82 @@ float_framebuffer17 = "true" alias17 = "CRTPass" shader18 = ../../shaders/base/post-crt-prep-image-layers.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" +// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- + +shader19 = ../../shaders/base/bezel-images-under-crt.slang +filter_linear19 = true +scale_type19 = viewport +float_framebuffer19 = true +alias19 = "BR_LayersUnderCRTPass" + +shader20 = ../../shaders/base/bezel-images-over-crt.slang +filter_linear20 = true +scale_type20 = viewport +float_framebuffer20 = true +alias20 = "BR_LayersOverCRTPass" + // Reduce Resolution ---------------------------------------------------------------- // Reduce the resolution to a small static size regardless of final resolution // Allows consistent look and faster at different final resolutions for blur // Mipmap option allows downscaling without artifacts -shader19 = ../../shaders/base/linearize-crt.slang -mipmap_input19 = true -filter_linear19 = true -scale_type19 = absolute -// scale_x19 = 480 -// scale_y19 = 270 -// scale_x19 = 960 -// scale_y19 = 540 -scale_x19 = 800 -scale_y19 = 600 -float_framebuffer19 = true -alias19 = "BR_MirrorLowResPass" +shader21 = ../../shaders/base/linearize-crt.slang +mipmap_input21 = true +filter_linear21 = true +scale_type21 = absolute +// scale_x21 = 480 +// scale_y21 = 270 +// scale_x21 = 960 +// scale_y21 = 540 +scale_x21 = 800 +scale_y21 = 600 +float_framebuffer21 = true +alias21 = "BR_MirrorLowResPass" // Add Blur for the Reflection (Horizontal) ---------------------------------------------------------------- -shader20 = ../../shaders/base/blur-outside-screen-horiz.slang -mipmap_input20 = true -filter_linear20 = true -float_framebuffer20 = true +shader22 = ../../shaders/base/blur-outside-screen-horiz.slang +mipmap_input22 = true +filter_linear22 = true +float_framebuffer22 = true // Add Blur for the Reflection (Vertical) ---------------------------------------------------------------- -shader21 = ../../shaders/base/blur-outside-screen-vert.slang -filter_linear21 = true -float_framebuffer21 = true -alias21 = "BR_MirrorBlurredPass" +shader23 = ../../shaders/base/blur-outside-screen-vert.slang +filter_linear23 = true +float_framebuffer23 = true +alias23 = "BR_MirrorBlurredPass" // Reduce resolution ---------------------------------------------------------------- // Reduced to a very small amount so we can create a blur which will create a glow from the screen // Mipmap option allows smoother downscaling -shader22 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input22 = true -filter_linear22 = true -scale_type22 = absolute -scale_x22 = 128 -scale_y22 = 128 -float_framebuffer22 = true -alias22 = "BR_MirrorReflectionDiffusedPass" +shader24 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input24 = true +filter_linear24 = true +scale_type24 = absolute +scale_x24 = 128 +scale_y24 = 128 +float_framebuffer24 = true +alias24 = "BR_MirrorReflectionDiffusedPass" // Add Diffused glow all around the screen ---------------------------------------------------------------- // Blurred so much that it's non directional // Mipmap option allows downscaling without artifacts -shader23 = ../../../../blurs/shaders/royale/blur9x9.slang -mipmap_input23 = true -filter_linear23 = true -scale_type23 = absolute -scale_x23 = 12 -scale_y23 = 12 -float_framebuffer23 = true -alias23 = "BR_MirrorFullscreenGlowPass" +shader25 = ../../../../blurs/shaders/royale/blur9x9.slang +mipmap_input25 = true +filter_linear25 = true +scale_type25 = absolute +scale_x25 = 12 +scale_y25 = 12 +float_framebuffer25 = true +alias25 = "BR_MirrorFullscreenGlowPass" // Bezel Reflection ---------------------------------------------------------------- -shader24 = ../../shaders/base/reflection.slang -scale_type24 = viewport -alias24 = "ReflectionPass" - -// Bezel Generation & Composite of Image Layers ---------------------------------------------------------------- - -shader25 = ../../shaders/base/bezel-images-under-crt.slang -filter_linear25 = true -scale_type25 = viewport -float_framebuffer25 = true -alias25 = "BR_LayersUnderCRTPass" - -shader26 = ../../shaders/base/bezel-images-over-crt.slang -filter_linear26 = true +shader26 = ../../shaders/base/reflection.slang scale_type26 = viewport -float_framebuffer26 = true -alias26 = "BR_LayersOverCRTPass" +alias26 = "ReflectionPass" // Combine Passes ---------------------------------------------------------------- shader27 = ../../shaders/base/combine-passes.slang diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp index 0fbe658..9d31c34 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI-NTSC__DREZ-480p.slangp @@ -127,6 +127,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader18 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input18 = true scale_type18 = viewport float_framebuffer18 = true alias18 = "PostCRTPass" @@ -154,5 +155,8 @@ HSM_ASPECT_RATIO_MODE = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // hcrt_gamma_in = "2.250000" // hcrt_gamma_out = "2.250000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp index e068c3e..b7cc689 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-MINI__DREZ-480p.slangp @@ -95,6 +95,7 @@ g_sat = 0.15 g_gamma_out = 2.45 shader13 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input13 = true scale_type13 = viewport float_framebuffer13 = true alias13 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp index 423f1da..d3af01b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV-NTSC__DREZ-480p.slangp @@ -169,7 +169,7 @@ scale_y23 = 480.0 float_framebuffer23 = true alias23 = BloomPass -shader24 = ../../shaders/guest/hsm-crt-guest-advanced-ntsc-pass2-potato.slang +shader24 = ../../shaders/guest/hsm-crt-guest-advanced-potato.slang filter_linear24 = true scale_type24 = viewport scale_x24 = 1.0 @@ -185,6 +185,7 @@ float_framebuffer25 = true alias25 = "CRTPass" shader26 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input26 = true scale_type26 = viewport float_framebuffer26 = true alias26 = "PostCRTPass" @@ -221,5 +222,8 @@ HSM_ASPECT_RATIO_MODE = 1 // NTSC Parameters GAMMA_INPUT = 2.0 gamma_out = 1.95 +HSM_CORE_RES_SAMPLING_MULT_SCANLINE_DIR = "200.000000" +h_sharp = "15.000000" +s_sharp = "1.500000" // hcrt_gamma_in = "2.250000" // hcrt_gamma_out = "2.250000" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp index 47dc58a..30e8e32 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets_DREZ/MBZ__5__POTATO__GDV__DREZ-480p.slangp @@ -150,6 +150,7 @@ float_framebuffer20 = true alias20 = "CRTPass" shader21 = ../../shaders/base/post-crt-prep-potato.slang +mipmap_input21 = true scale_type21 = viewport float_framebuffer21 = true alias21 = "PostCRTPass" diff --git a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp index f64fdd6..d1622f2 100644 --- a/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Variations/CRT-Flavors/Newpixie-Clone__STD__GDV.slangp @@ -10,7 +10,7 @@ HSM_INTERLACE_TRIGGER_RES = "100.000000" HSM_FAKE_SCANLINE_OPACITY = "70.000000" HSM_FAKE_SCANLINE_ROLL = "30.000000" -HSM_DEDITHER_MODE = "0" +SGPT_BLEND_OPTION = 0 g_cntrst = "0.500000" diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp new file mode 100644 index 0000000..b1904be --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_0__SMOOTH-ADV-SCREEN-ONLY.slangp @@ -0,0 +1,6 @@ +#reference "../../Base_CRT_Presets/MBZ__0__SMOOTH-ADV-SCREEN-ONLY__GDV.slangp" + +#reference "../../../resource/param_values/base/set-all-textures-empty.params" +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" + +HSM_CRT_CURVATURE_SCALE = 0 diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp new file mode 100644 index 0000000..0858f50 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_1__ADV.slangp @@ -0,0 +1,3 @@ +#reference "../../Base_CRT_Presets/MBZ__1__ADV__GDV.slangp" + +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" \ No newline at end of file diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp new file mode 100644 index 0000000..d36a7b3 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-GLASS.slangp @@ -0,0 +1,5 @@ +#reference "../../Base_CRT_Presets/MBZ__2__ADV-GLASS__GDV.slangp" + +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" + +HSM_REFLECT_SHOW_TUBE_FX_AMOUNT = 0 \ No newline at end of file diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp new file mode 100644 index 0000000..f8670d0 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_2__ADV-SCREEN-ONLY.slangp @@ -0,0 +1,4 @@ +#reference "../../Base_CRT_Presets/MBZ__2__ADV-SCREEN-ONLY__GDV.slangp" + +#reference "../../../resource/param_values/base/set-all-textures-empty.params" +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp new file mode 100644 index 0000000..58174e9 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_3__STD.slangp @@ -0,0 +1,3 @@ +#reference "../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp" + +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp new file mode 100644 index 0000000..6742df7 --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI.slangp @@ -0,0 +1,5 @@ +#reference "../../Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp" + +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" + +HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION = "0.000000" diff --git a/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp new file mode 100644 index 0000000..0060e9b --- /dev/null +++ b/bezel/Mega_Bezel/Presets/Variations/Lightgun/Sinden_Border_5__POTATO-GDV-MINI_No-BG.slangp @@ -0,0 +1,6 @@ +#reference "../../Base_CRT_Presets/MBZ__5__POTATO__GDV-MINI.slangp" + +#reference "../../../resource/param_values/base/set-all-textures-empty.params" +#reference "../../../resource/param_values/lightgun/sinden-border-basic.params" + +HSM_BG_OPACITY = 0 \ No newline at end of file diff --git a/bezel/Mega_Bezel/README.md b/bezel/Mega_Bezel/README.md index d02f6c2..5acdab5 100644 --- a/bezel/Mega_Bezel/README.md +++ b/bezel/Mega_Bezel/README.md @@ -3,7 +3,7 @@ Mega Bezel Shader Readme ------------------------------------------------------------------------------------------------------------ ![Mega Bezel Logo](MegaBezelLogo.png) -**Version V1.7.0_2022-12-21** +**Version V1.9.0_2023-01-22** ---------------------------------------- ---------------------------------------- @@ -379,17 +379,6 @@ NTSC Processing is only included in NTSC Presets, and GTU Horizontal blurring is * **Post CRT Brightness** - Brightness adjustment on the CRT color output (Applied in Linear Color Space) * **Post CRT Brightness Affects Grade Black Level** - As this value is reduced the brightness adjustment amount will be reduced on the black level. So if you set it to a low value there will be almost no increase in brightness on the areas which were black before the black level adjustment. ------------------------------------------------------------------------------------------------ -**[ GRAPHICS CACHE ]:** - - * **Cache Graphics** - * **0: OFF** - Graphics Layering and Bezel Generation are regenerated every frame - * **1: ON** - Graphics & Bezel are generated once and cached for subsequent frames. The cache auto updates when changes in parameters are detected - * **Cache Update Indicator** - * **0: OFF** - Never show the red dot indicator on screen when the cache updates - * **1: ON** - Appears whenever the graphics are regenerated and cache is updated, when caching is off or if the cache is auto-updated - * **2: ONLY WHEN CACHE OFF** - Indicator does not appear on auto-update, It only appears when caching is off - ----------------------------------------------------------------------------------------------- **[ GRAPHICS GLOBAL BRIGHTNESS ]:** * **Graphics Brightness** - Brightness of all graphics and images which are not the CRT Shader @@ -407,6 +396,17 @@ NTSC Processing is only included in NTSC Presets, and GTU Horizontal blurring is * **2 - 2 ONLY** - Use the second image for both slots * **3 - Swap** - Swap the Images + +----------------------------------------------------------------------------------------------- +**[ SINDEN LIGHTGUN BORDER ]:** + * **Show Border** - Show the white border around the inner edge of the tube + * **Brightness** - How bright is the border + * **Thickness** - How Thick is the border + * **Compensate Empty Tube** + * **0 - Don't adjust the tube size and puts the white border on top of the CRT image** + * **1 - Adjust the tube to be wider so the white border is outside the CRT image** + + ----------------------------------------------------------------------------------------------- **[ VIEWPORT ZOOM ]:** * **Viewport Zoom** --- Zoom in or out on everything @@ -636,6 +636,18 @@ Blend parts of the image which flicker on/off repeatedly between frames often us - **Luma Difference Threshold** - Brightness difference required before the colors will be blended +----------------------------------------------------------------------------------------------- +**[ GRAPHICS CACHE ]:** + + * **Cache Graphics** + * **0: OFF** - Graphics Layering and Bezel Generation are regenerated every frame + * **1: ON** - Graphics & Bezel are generated once and cached for subsequent frames. The cache auto updates when changes in parameters are detected + * **Cache Update Indicator** + * **0: OFF** - Never show the red dot indicator on screen when the cache updates + * **1: ON** - Appears whenever the graphics are regenerated and cache is updated, when caching is off or if the cache is auto-updated + * **2: ONLY WHEN CACHE OFF** - Indicator does not appear on auto-update, It only appears when caching is off + + ----------------------------------------------------------------------------------------------- **[ A/B SPLITSCREEN COMPARE ]:** @@ -650,6 +662,29 @@ Blend parts of the image which flicker on/off repeatedly between frames often us - **Freeze Graphics (Freeze Left, New changes on Right)** - Freeze an image of the Graphics at the current time ion one side of the screen, while the area on the other side keeps updating to user changes + +- **[ SHOW PASS (For Debugging) ]:** + +Shows the results at different stages of the shader chain + +- **Show Pass Index** + * **0: END** - Result of the final pass + * **1: REFLECTION** - Shows te Reflection pass (includes final image of the tube) + * **2: TUBE** - Shows the pass with the tube effects applied, E.G. vignette, diffuse, static reflection + * **3: CRT** - The CRT effect only + * **4: INTERLACE** - The stage before the CRT which has interlacing effects added + * **5: COLOR CORRECT & UPSCALE** - Color Correct, and upscaling like ScaleFx or SuperXBR are applied here + * **6: DEDITHER** - ADV passes only, at this point dithering should be blended together + * **7: DREZ** - DREZ passes only, shows result after the downsampling pass + * **8: CORE** - This is the initial input into the shader pipeline + * **9: LAYERS TOP** - Just the pass which composites all the layers which are in front of the CRT tube + * **10: LAYERS BOTTOM** - Just the pass which composites all the layers which are behind the CRT tube +- **Apply Screen Scale & Curvature to Unscaled Passes** + * **0: Show exact output of the chosen pass** + * **1: Apply scale and curvature to the output of the chosen pass so it is easier to directly compare between earlier and later passes** +- **Show Alpha Channel** + Show the alpha channel of the pass. E.G. the alpha channel of the Layers Bottom pass is the reflection mask + ----------------------------------------------------------------------------------------------- **[ SCREEN VIGNETTE ]:** @@ -672,6 +707,24 @@ Blend parts of the image which flicker on/off repeatedly between frames often us - **Monochrome Hue Offset** - **Monochrome Saturation** + +----------------------------------------------------------------------------------------------- +**[ TUBE ASPECT & EMPTY SPACE ]:** + +- **Tube Aspect** - Default is 2: Explicit + - 0 - EVEN - If there is empty tube space added it will be added evenly on all sides. If there is no empty space then the aspect ratio will match the screen aspect. + - 1 - SCREEN - Have the tube keep the same aspect of the game screen as empty space is added + - 2 - EXPLICIT - Sets the explicit aspect ratio of the tube +- **Explicit Tube Aspect** + - Aspect used when Tube Aspect is set to Explicit +- **Empty Tube Thickness** + - Amount of Empty tube around the game image +- **Empty Tube Thicknes X Scale** + - Amount of Empty tube around the game image horizontally +- **Screen (Game Image) Corner Radius Scale** + - How round are the corners of the CRT image on top of empty area of the tube + + ----------------------------------------------------------------------------------------------- **[ TUBE DIFFUSE IMAGE ]:** @@ -689,10 +742,6 @@ The color/texture of the tube which appears behind the CRT image - A multiplier on the amount of global ambient lighting applied - **Scale** - **Scale X** -- **Empty Tube Thickness** - - Amount of Empty tube around the game image -- **Empty Tube Thicknes X Scale** - - Amount of Empty tube around the game image horizontally ----------------------------------------------------------------------------------------------- **[ TUBE SHADOW IMAGE ]:** @@ -708,6 +757,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Scale Y** - Scales shadow from the top of the tube - **Curvature Scale** - How much curvature is applied to the shadow, more curvature has the effect of making it look like the light is higher relative to the tube/bezel + ----------------------------------------------------------------------------------------------- **[ CRT ON TUBE DIFFUSE BLENDING ]:** @@ -768,6 +818,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - Set this to 0 or less to remove the black edge - **Black Edge Thickness X Scale** --- Scale the thickness on the left and right edge + ----------------------------------------------------------------------------------------------- **[ DUAL SCREEN ]:** @@ -807,6 +858,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - **2nd Screen Crop Overscan Left** - **2nd Screen Crop Overscan Right** + ----------------------------------------------------------------------------------------------- **[ REFLECTION POSITION & SCALE ]:** @@ -818,6 +870,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Screen Reflection Pos Y** - Shift the reflection up or down + ----------------------------------------------------------------------------------------------- **[ AMBIENT LIGHTING IMAGE 1 ]:** @@ -850,8 +903,7 @@ Adds a shadow on top of the tube diffuse image and colored gel ----------------------------------------------------------------------------------------------- -**[ AMBIENT LIGHTING IMAGE 2 ]:** - Has the same parameters as Ambiend Image 1 - +**[ AMBIENT LIGHTING IMAGE 2 ]:** - Has the same parameters as Ambient Image 1 ----------------------------------------------------------------------------------------------- @@ -866,6 +918,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Independent Curvature X** --- Horizontal curvature for the bezel when independent - **Independent Curvature Y** --- Vertical curvature for the bezel when independent + ----------------------------------------------------------------------------------------------- **[ BEZEL GENERAL ]:** @@ -954,6 +1007,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Value/Brightness** - The brightness of the color, default is 10 which is 10% + ----------------------------------------------------------------------------------------------- **[ FRAME COLOR ]:** @@ -966,6 +1020,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Value/Brightness** - The brightness of the color, default is 10 which is 10% + ----------------------------------------------------------------------------------------------- **[ FRAME GENERAL ]:** @@ -1007,20 +1062,6 @@ Adds a shadow on top of the tube diffuse image and colored gel ----------------------------------------------------------------------------------------------- **[ REFLECTION ]:** -- **Blend Mode** - How the reflection is applied to the layer underneath Default is 2 - - **0 - Off** - The layer is not shown - - **1 - Normal Blending** - - **2 - Additive Blending** - Applied additively to brighten what's underneath -- **Mask** - Mask the reflection with the area inside the: - - **0 - ALL** - Whole viewport - - **1 - Screen** - Illuminated area of the tube - - **2 - Tube** - - **2 - Bezel and Inward** - Bezel and inward - - **3 - Bezel** - - **4 - Bezel +** - Bezel and outward - - **5 - Frame** - - **6 - Frame +** - Frame and outward - - **7 - Background** - Outside the frame - **Global Amount** - Overall multiplier on the amount of reflection shown - **Global Gamma Adjust** @@ -1054,8 +1095,7 @@ Adds a shadow on top of the tube diffuse image and colored gel - When the reflection fades out towards the corners, for example on the bottom bezel the reflection fades out towards the left and right. The position where the fade starts. - **Lateral Outer Fade Distance** - For the lateral fade the distance for it to fade out -- **Viewport Vignette (For Glass Presets)** - - Adds a vignette over the entire viewport to darken the areas as it goes towards the edges used to darken the reflection in the glass preset + ----------------------------------------------------------------------------------------------- **[ REFLECTION CORNER ]:** @@ -1095,12 +1135,39 @@ Adds a shadow on top of the tube diffuse image and colored gel - **Sample Distance** - What is the farthest distance away from the point being drawn where the scattered sample come from + + ----------------------------------------------------------------------------------------------- -**[ GLASS BORDER ]:** +**[ REFLECTION MASK IMAGE - Only in Image Layer Presets ]:** -- **Glass Border ON (Glass Preset Only)** +- **Reflection Image Mask Amount** + - How much the image darkens the reflection +- **Follow Layer** + - Which layer should the image mask match, Default is 4, Following the Device + - **0 - FULL** + - **1 - TUBE** + - **2 - BEZEL** + - **3 - BG** + - **4 - DEVICE** + - **5 - DECAL** + - **6 - CAB** + - **7 - TOP** +- **Follow Mode** + - Should the image follow exactly + - **0 - FOLLOW SCALE & POS** - Follows only position and orientation + - **1 - FOLLOW EXACTLY** - Follows curvature and split mode +- **Mask Brightness** - Brighten's the mask which brightens the reflection +- **Mask Black Level** - Increases the black level so that the darker areas of the maskbecome darker, can help increase contrast +- **Mipmapping Blend Bias (Affects Sharpness)** - Makes the effect of the mask blurrier or sharper + +----------------------------------------------------------------------------------------------- +**[ REFLECTION GLASS ]:** + +- **Glass Border ON (For Glass Preset)** - Changes the appearance of the reflection to look like the glass effect, this is here for technical reasons, not very useful to change interactively - +- **Glass Reflection Vignette** + - Adds a vignette over the entire viewport to darken the areas as it goes towards the edges used to darken the reflection in the glass preset +- **Glass Reflection Vignette Size** diff --git a/bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params b/bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params new file mode 100644 index 0000000..f942efa --- /dev/null +++ b/bezel/Mega_Bezel/resource/param_values/lightgun/sinden-border-basic.params @@ -0,0 +1,6 @@ +// Parameters +HSM_SINDEN_BORDER_ON = "1.000000" +// HSM_SINDEN_BORDER_BRIGHTNESS = "70.000000" +HSM_SINDEN_BORDER_THICKNESS = "3.000000" +HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION = "1.000000" +HSM_REFLECT_SHOW_TUBE_FX_AMOUNT = 30 \ No newline at end of file diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params b/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params index f9f047a..5aa675f 100644 --- a/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params +++ b/bezel/Mega_Bezel/resource/param_values/smooth/no-smooth-crt-flavor.params @@ -16,5 +16,5 @@ max_w = "0.08" HSM_INTERLACE_TRIGGER_RES = "800.000000" -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params index 4500cc2..cc0d9ad 100644 --- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params +++ b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-antialias.params @@ -10,4 +10,4 @@ max_w = "0.08" HSM_INTERLACE_TRIGGER_RES = "800.000000" -HSM_DEDITHER_MODE = "3.000000" +SGPT_BLEND_OPTION = 1 diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params index 80feb5b..beb2f1b 100644 --- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params +++ b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-extra-smooth.params @@ -10,4 +10,4 @@ max_w = "0.08" HSM_INTERLACE_TRIGGER_RES = "800.000000" -HSM_DEDITHER_MODE = "3.000000" \ No newline at end of file +SGPT_BLEND_OPTION = 1 \ No newline at end of file diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params index af55c22..fd596fa 100644 --- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params +++ b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth-big-scanlines.params @@ -11,4 +11,4 @@ max_w = "0.08" no_scanlines = 1 HSM_INTERLACE_MODE = -1 HSM_INTERLACE_TRIGGER_RES = "800.000000" -HSM_DEDITHER_MODE = "3.000000" \ No newline at end of file +SGPT_BLEND_OPTION = 1 \ No newline at end of file diff --git a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params index af55c22..fd596fa 100644 --- a/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params +++ b/bezel/Mega_Bezel/resource/param_values/smooth/smooth-adv-super-smooth.params @@ -11,4 +11,4 @@ max_w = "0.08" no_scanlines = 1 HSM_INTERLACE_MODE = -1 HSM_INTERLACE_TRIGGER_RES = "800.000000" -HSM_DEDITHER_MODE = "3.000000" \ No newline at end of file +SGPT_BLEND_OPTION = 1 \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/ShaderTodo.txt b/bezel/Mega_Bezel/shaders/ShaderTodo.txt index dda9907..19a90f0 100644 --- a/bezel/Mega_Bezel/shaders/ShaderTodo.txt +++ b/bezel/Mega_Bezel/shaders/ShaderTodo.txt @@ -1,20 +1,40 @@ ![Mega_Bezel_Logo|512x256, 75%](upload://6PNkvcMF9Go9Wnk6OJXfYR1opXI.png) -Mega Bezel is updated to V1.7.0_2022-12-21 +Mega Bezel is updated to V1.9.0_2023-01-22 Changes: - * POTATO - * Fixed Background Masking and Blend Modes - * Added Colorize & Brightness - * Show Passes Feature - * Added switch to enable/disable applying scale and curvature to raw passes - * This allows you to compare the passes all with the same curvature or what the pass actually looks like - * Moved Show Passes parameters right underneath the AB Compare parameters so they can both easily be used together + * Added some more Sinden presets for SCREEN-ONLY and POTATO + * Added Screen Region to Resolution Debug text + * Good for getting the screen region pixel coordinates if you need them + * Adjusted Ambient Lighting Scaling when using the Inherit Zoom scale mode + * Now when you zoom out it is much less likely to generate a black frame covering the outer parts of the background image + * The minimum size of the lighting texture will be close to the height of the current viewport + * This reduces the likelihood that we will see the cutoff + * ScaleFx: Exposed more of the settings so they can be tweaked + * Default Settings changed: + * ScaleFx Threshold: now 0.43 (was 0.5) + * ScaleFx Filter Corners: now 0 (was 1) + * These settings result in a slighly clearer picture and less rounding of square corners + * SMOOTH-ADV ntsc presets: ntsc_scale adjusted so it visually matches the regular ADV ntsc presets ---------------------------------------------------- --- TODO --------------------------------------- ---------------------------------------------------- + * Add back Raster Bloom + * Do new release + * Add Z-Fast to libretro repo + * Check difference between old and new NTSC + * Check out duplicate params in NTSC + * Check out independent bezel scale and reflection, reflection is not following the bezel + * Check brighter reflection in new NTSC + + * Update Dual Screen to use params files + * Swap out // for # in base presets + * Add ability to have layers appear on top of the bezel but below the reflection + * One way to do this would be to have a CRT/Reflection layer offset which forces layers below to be composited on top of the bezel + * Fix CRT Blend Amount + * Adjustable softness of bezel outer edge for reflection * Adjustable Bezel Curvature per side? * Revisit Tate Mode / Vertical Scanline and Rotate CRT artifacts * Fast Sharpen & Sharp Smoother currently work on x axis, should be relative to scanline direction @@ -76,6 +96,12 @@ Scene Dynamic Lighting * Reflection from screen on additional elements * Side Panels, Speaker Panel, Table * Masking of main and additional reflection + * Colored Mask to define areas + * Up rgb(128, 255, 128) + * Down rgb(128, 0, 128) + * Left rgb(0, 128, 128) + * Right rgb(255, 128, 128) + * Center rgb(128, 128, 255) * Bounce lighting from screen to room back to the scene * Masking behind devices * Sprite sheet for arcade Lighting loop diff --git a/bezel/Mega_Bezel/shaders/base/bezel-images.inc b/bezel/Mega_Bezel/shaders/base/bezel-images.inc index fe952b7..c984a7c 100644 --- a/bezel/Mega_Bezel/shaders/base/bezel-images.inc +++ b/bezel/Mega_Bezel/shaders/base/bezel-images.inc @@ -108,6 +108,58 @@ vec4 BlendModeMaskLayerMix(vec4 color_under, vec4 color_over, float blend_mode, return out_color; } +vec2 HSM_GetLayerCoord(vec2 in_viewport_coord, float layer_to_follow, float follow_mode, inout vec2 out_placement_scale) +{ + vec2 flat_coord = vec2(0.5); + vec2 curved_coord = vec2(0.5); + vec2 out_coord = vec2(0.5); + + if (layer_to_follow == FOLLOW_LAYER_VIEWPORT) + { + flat_coord = in_viewport_coord; + curved_coord = in_viewport_coord; + } + else if (layer_to_follow == FOLLOW_LAYER_TUBE_DIFFUSE) + { + flat_coord = TUBE_DIFFUSE_COORD; + curved_coord = TUBE_DIFFUSE_CURVED_COORD; + } + else if (layer_to_follow == FOLLOW_LAYER_BEZEL_OUTSIDE) + { + flat_coord = BEZEL_OUTSIDE_COORD; + curved_coord = BEZEL_OUTSIDE_CURVED_COORD; + } + else if (layer_to_follow == FOLLOW_LAYER_BG) + { + flat_coord = BACKGROUND_COORD; + curved_coord = BACKGROUND_CURVED_COORD; + } + else if (layer_to_follow == FOLLOW_LAYER_DEVICE) + { + flat_coord = DEVICE_COORD; + curved_coord = DEVICE_CURVED_COORD; + } + else if (layer_to_follow == FOLLOW_LAYER_DECAL) + { + flat_coord = DECAL_COORD; + curved_coord = DECAL_CURVED_COORD; + } + else if (layer_to_follow == FOLLOW_LAYER_CAB_GLASS) + { + flat_coord = CAB_GLASS_COORD; + curved_coord = CAB_GLASS_CURVED_COORD; + } + else if (layer_to_follow == FOLLOW_LAYER_TOP) + { + flat_coord = TOP_IMAGE_COORD; + curved_coord = TOP_IMAGE_CURVED_COORD; + } + + out_coord = follow_mode == FOLLOW_MODE_EXACT ? curved_coord : flat_coord; + + return out_coord; +} + // Takes a viewport coordinate and gives a new coordinate scaled by the specific scale mode // Takes into account the default sizes of each scale mode vec2 HSM_GetScaledCoord(vec2 in_viewport_coord, @@ -313,19 +365,20 @@ layout(location = 0) out vec4 FragColor; // Pass Framebuffer Textures layout(set = 0, binding = 1) uniform sampler2D InfoCachePass; -layout(set = 0, binding = 3) uniform sampler2D BackgroundImage; -layout(set = 0, binding = 4) uniform sampler2D BackgroundVertImage; -layout(set = 0, binding = 5) uniform sampler2D NightLightingImage; -layout(set = 0, binding = 6) uniform sampler2D NightLighting2Image; +layout(set = 0, binding = 2) uniform sampler2D BackgroundImage; +layout(set = 0, binding = 3) uniform sampler2D BackgroundVertImage; +layout(set = 0, binding = 4) uniform sampler2D NightLightingImage; +layout(set = 0, binding = 5) uniform sampler2D NightLighting2Image; -layout(set = 0, binding = 7) uniform sampler2D LEDImage; -layout(set = 0, binding = 8) uniform sampler2D FrameTextureImage; -layout(set = 0, binding = 9) uniform sampler2D DeviceImage; -layout(set = 0, binding = 10) uniform sampler2D DeviceVertImage; -layout(set = 0, binding = 11) uniform sampler2D DeviceLEDImage; -layout(set = 0, binding = 12) uniform sampler2D DecalImage; -layout(set = 0, binding = 13) uniform sampler2D CabinetGlassImage; -layout(set = 0, binding = 14) uniform sampler2D TopLayerImage; +layout(set = 0, binding = 6) uniform sampler2D LEDImage; +layout(set = 0, binding = 7) uniform sampler2D FrameTextureImage; +layout(set = 0, binding = 8) uniform sampler2D DeviceImage; +layout(set = 0, binding = 9) uniform sampler2D DeviceVertImage; +layout(set = 0, binding = 10) uniform sampler2D DeviceLEDImage; +layout(set = 0, binding = 11) uniform sampler2D DecalImage; +layout(set = 0, binding = 12) uniform sampler2D CabinetGlassImage; +layout(set = 0, binding = 13) uniform sampler2D TopLayerImage; +layout(set = 0, binding = 14) uniform sampler2D ReflectionMaskImage; #ifdef LAYERS_OVER_CRT layout(set = 0, binding = 15) uniform sampler2D BR_LayersOverCRTPassFeedback; @@ -677,7 +730,12 @@ void main() BACKGROUND_COORD, BACKGROUND_SCALE); - if (HSM_BG_MIRROR_WRAP == 1) + // Tile Wrap the background + if (HSM_BG_WRAP_MODE == 1) + BACKGROUND_CURVED_COORD = mod(BACKGROUND_CURVED_COORD, 1.0); + + // Mirror Wrap the bBackground + if (HSM_BG_WRAP_MODE == 2) BACKGROUND_CURVED_COORD = HSM_GetMirrorWrapCoord(BACKGROUND_CURVED_COORD); vec4 bg_image = vec4(0); @@ -1182,6 +1240,24 @@ void main() frag_color_linear = clamp(frag_color_linear, 0, 1); } + #ifdef LAYERS_UNDER_CRT + // Store reflection mask in the alpha channel + // Usually used to show the uneven brightness of a bumpy surface + if (HSM_REFLECT_MASK_IMAGE_AMOUNT > 0) + { + vec2 reflect_mask_scale = vec2(0.5); + vec2 reflect_mask_coord = HSM_GetLayerCoord(VIEWPORT_COORD, HSM_REFLECT_MASK_FOLLOW_LAYER, HSM_REFLECT_MASK_FOLLOW_MODE, reflect_mask_scale); + float reflect_mask = HSM_GetMipmappedTexSample(ReflectionMaskImage, reflect_mask_coord, reflect_mask_scale, HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS).r; + reflect_mask = clamp(HSM_REFLECT_MASK_BLACK_LEVEL * (reflect_mask - 1) + 1, 0, 1); + reflect_mask *= HSM_REFLECT_MASK_BRIGHTNESS; + + frag_color_linear.a = HSM_REFLECT_MASK_IMAGE_AMOUNT * reflect_mask + (1 - HSM_REFLECT_MASK_IMAGE_AMOUNT); + } + else + frag_color_linear.a = 1; + + #endif + FragColor = frag_color_linear; // If we have calculated an image then set -1 as a flag to show that we have diff --git a/bezel/Mega_Bezel/shaders/base/cache-info.inc b/bezel/Mega_Bezel/shaders/base/cache-info.inc index 4fc8ea3..0d5113b 100644 --- a/bezel/Mega_Bezel/shaders/base/cache-info.inc +++ b/bezel/Mega_Bezel/shaders/base/cache-info.inc @@ -109,10 +109,10 @@ vec2 HSM_GetTubeScale(vec2 screen_scale, float image_placement_screen_height, ve // Add switch for independent scale if (HSM_BZL_USE_INDEPENDENT_SCALE == 1) { - if (HSM_USE_IMAGE_FOR_PLACEMENT == 0) - screen_scale = screen_scale / screen_scale.y * HSM_BZL_INDEPENDENT_SCALE; + if (HSM_USE_IMAGE_FOR_PLACEMENT > 0.5) + screen_scale = screen_scale / screen_scale.y * image_placement_screen_height * HSM_BZL_INDEPENDENT_SCALE / DEFAULT_SCREEN_HEIGHT; else - screen_scale = screen_scale / screen_scale.y * image_placement_screen_height; + screen_scale = screen_scale / screen_scale.y * HSM_BZL_INDEPENDENT_SCALE; } float normalized_screen_height = screen_scale.y / DEFAULT_UNCORRECTED_SCREEN_SCALE.y; @@ -587,6 +587,10 @@ float HSM_GetParameterSum() + HSM_GLOBAL_GRAPHICS_BRIGHTNESS * 100 + HSM_STATIC_LAYERS_GAMMA + + HSM_SINDEN_BORDER_ON + + HSM_SINDEN_BORDER_THICKNESS + + HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION + + HSM_CACHE_GRAPHICS_ON // Night Lighting @@ -680,10 +684,10 @@ float HSM_GetParameterSum() // + HSM_TUBE_DIFFUSE_IMAGE_SATURATION // + HSM_TUBE_DIFFUSE_IMAGE_BRIGHTNESS // + HSM_TUBE_DIFFUSE_IMAGE_GAMMA - + HSM_TUBE_EMPTY_THICKNESS - + HSM_TUBE_EMPTY_THICKNESS_X_SCALE + HSM_TUBE_DIFFUSE_FORCE_ASPECT + HSM_TUBE_EXPLICIT_ASPECT + + HSM_TUBE_EMPTY_THICKNESS + + HSM_TUBE_EMPTY_THICKNESS_X_SCALE // SCREEN BLACK EDGE + HSM_GLOBAL_CORNER_RADIUS @@ -758,6 +762,14 @@ float HSM_GetParameterSum() + HSM_BZL_INNER_CORNER_RADIUS_SCALE * 100 #ifdef HAS_BEZEL_PARAMS + + // Reflection Image Mask + + HSM_REFLECT_MASK_IMAGE_AMOUNT + + HSM_REFLECT_MASK_FOLLOW_LAYER + + HSM_REFLECT_MASK_FOLLOW_MODE + + HSM_REFLECT_MASK_BRIGHTNESS * 100 + + HSM_REFLECT_MASK_BLACK_LEVEL + // Bezel Params not in Screen Scale + HSM_BZL_INNER_EDGE_THICKNESS / 0.00007 + HSM_BZL_INNER_EDGE_SHARPNESS * 100 @@ -852,7 +864,7 @@ float HSM_GetParameterSum() + HSM_BG_SCALE_X * 100 + HSM_BG_POS_X * 100 + HSM_BG_POS_Y * 100 - + HSM_BG_MIRROR_WRAP + + HSM_BG_WRAP_MODE + HSM_BG_MIPMAPPING_BLEND_BIAS // Background Vignette @@ -1078,7 +1090,10 @@ vec4 HSM_GetColorForScreenInfoCache(vec2 viewport_coord, sampler2D feedback_pass vec2 screen_scale = HSM_GetScreenScale(screen_aspect, screen_pos_and_height.z, cropped_rotated_size); vec2 screen_size = GetScreenSizeWithZoom(screen_scale); - vec2 tube_diffuse_scale = HSM_GetTubeScale(screen_scale, screen_pos_and_height.z, vec2(HSM_TUBE_EMPTY_THICKNESS * HSM_TUBE_EMPTY_THICKNESS_X_SCALE, HSM_TUBE_EMPTY_THICKNESS)); + // Adjust tube empty thickness for Sinden lightgun bright edge border if needed + float tube_sinden_border_thickness = HSM_SINDEN_BORDER_ON > 0.5 && HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION > 0.5 ? 0.6 * HSM_SINDEN_BORDER_THICKNESS * 60 : 0; + + vec2 tube_diffuse_scale = HSM_GetTubeScale(screen_scale, screen_pos_and_height.z, vec2(HSM_TUBE_EMPTY_THICKNESS * HSM_TUBE_EMPTY_THICKNESS_X_SCALE + tube_sinden_border_thickness, HSM_TUBE_EMPTY_THICKNESS + screen_aspect * tube_sinden_border_thickness)); float tube_diffuse_aspect = tube_diffuse_scale.x / tube_diffuse_scale.y * output_aspect; // TODO need to adjust height in screen_pos_and_height with the tube extra thickness diff --git a/bezel/Mega_Bezel/shaders/base/combine-passes.inc b/bezel/Mega_Bezel/shaders/base/combine-passes.inc index 0ac391c..c2d1e2e 100644 --- a/bezel/Mega_Bezel/shaders/base/combine-passes.inc +++ b/bezel/Mega_Bezel/shaders/base/combine-passes.inc @@ -172,6 +172,9 @@ void main() if (HSM_SHOW_PASS_INDEX < 5 || HSM_SHOW_PASS_INDEX > 8) FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA); + if (HSM_SHOW_PASS_ALPHA > 0.5) + FragColor = vec4(FragColor.a); + return; } @@ -210,6 +213,14 @@ void main() if(HSM_BZL_USE_INDEPENDENT_CURVATURE > 0) bezel_corner_radius = HSM_BZL_INNER_CORNER_RADIUS_SCALE * DEFAULT_SCREEN_CORNER_RADIUS; +#ifndef IS_NO_REFLECT_PRESET + vec2 tube_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, 1, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 1); + + TUBE_MASK = HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99); + // Apply Reflection Image Mask + crt_layer *= TUBE_MASK + (1 - TUBE_MASK) * under_layer.a; +#endif + if (HSM_RENDER_SIMPLE_MODE < 0.5) out_color = HSM_PreMultAlphaBlend(out_color, crt_layer); diff --git a/bezel/Mega_Bezel/shaders/base/common/common-functions.inc b/bezel/Mega_Bezel/shaders/base/common/common-functions.inc index 3c1ab29..58a1407 100644 --- a/bezel/Mega_Bezel/shaders/base/common/common-functions.inc +++ b/bezel/Mega_Bezel/shaders/base/common/common-functions.inc @@ -851,6 +851,10 @@ bool HSM_Fill_Ambient_Images(vec2 in_viewport_coord, vec2 in_viewport_unscaled_c if (HSM_AMBIENT1_OPACITY > 0) { + float ambient1_scale = HSM_AMBIENT1_SCALE; + if (HSM_AMBIENT1_SCALE_INHERIT_MODE == 1 && HSM_AMBIENT1_SCALE * HSM_VIEWPORT_ZOOM < 1) + ambient1_scale = 1 / HSM_VIEWPORT_ZOOM; + vec2 lighting_coord = GetSimpleImageScaledCoord(in_viewport_coord, in_viewport_unscaled_coord, in_tube_coord, @@ -858,7 +862,7 @@ bool HSM_Fill_Ambient_Images(vec2 in_viewport_coord, vec2 in_viewport_unscaled_c in_ambient_sampler, vec2(HSM_AMBIENT1_POSITION_X, HSM_AMBIENT1_POSITION_Y), HSM_AMBIENT1_POS_INHERIT_MODE, - vec2(HSM_AMBIENT1_SCALE * HSM_AMBIENT1_SCALE_X, HSM_AMBIENT1_SCALE), + vec2(ambient1_scale * HSM_AMBIENT1_SCALE_X, ambient1_scale), HSM_AMBIENT1_SCALE_INHERIT_MODE, HSM_AMBIENT1_SCALE_KEEP_ASPECT, HSM_AMBIENT1_MIRROR_HORZ, @@ -875,6 +879,10 @@ bool HSM_Fill_Ambient_Images(vec2 in_viewport_coord, vec2 in_viewport_unscaled_c if (HSM_AMBIENT2_OPACITY > 0) { + float ambient2_scale = HSM_AMBIENT2_SCALE; + if (HSM_AMBIENT2_SCALE_INHERIT_MODE == 1 && HSM_AMBIENT2_SCALE * HSM_VIEWPORT_ZOOM < 1) + ambient2_scale = 1 / HSM_VIEWPORT_ZOOM; + vec2 lighting2_coord = GetSimpleImageScaledCoord(in_viewport_coord, in_viewport_unscaled_coord, in_tube_coord, @@ -882,7 +890,7 @@ bool HSM_Fill_Ambient_Images(vec2 in_viewport_coord, vec2 in_viewport_unscaled_c in_ambient2_sampler, vec2(HSM_AMBIENT2_POSITION_X, HSM_AMBIENT2_POSITION_Y), HSM_AMBIENT2_POS_INHERIT_MODE, - vec2(HSM_AMBIENT2_SCALE * HSM_AMBIENT2_SCALE_X, HSM_AMBIENT2_SCALE), + vec2(ambient2_scale * HSM_AMBIENT2_SCALE_X, ambient2_scale), HSM_AMBIENT2_SCALE_INHERIT_MODE, HSM_AMBIENT2_SCALE_KEEP_ASPECT, HSM_AMBIENT2_MIRROR_HORZ, @@ -1044,3 +1052,16 @@ vec4 HSM_ApplyScanlineMask(vec4 in_color, vec2 screen_scale, vec2 in_coord, vec2 return clamp(out_color, 0, 1); } + +vec4 HSM_Apply_Sinden_Lightgun_Border(vec4 in_rgba, vec2 in_tube_diffuse_curved_coord, float in_tube_diffuse_mask, float in_black_edge_corner_radius) +{ + float sinden_gun_mask = in_tube_diffuse_mask - HSM_GetCornerMask((in_tube_diffuse_curved_coord - 0.5) * (1 + vec2(1 / TUBE_DIFFUSE_ASPECT * HSM_SINDEN_BORDER_THICKNESS, HSM_SINDEN_BORDER_THICKNESS)) + 0.5, TUBE_DIFFUSE_ASPECT, in_black_edge_corner_radius, 0.99); + vec4 out_rgba = in_rgba; + + vec3 base_rgb = vec3(1); + out_rgba.rgb = base_rgb * HSM_SINDEN_BORDER_BRIGHTNESS * sinden_gun_mask + (1 - sinden_gun_mask) * out_rgba.rgb; + + // out_rgba.rgb += HSM_SINDEN_BORDER_OPACITY * sinden_gun_mask; + return out_rgba; +} + diff --git a/bezel/Mega_Bezel/shaders/base/common/globals.inc b/bezel/Mega_Bezel/shaders/base/common/globals.inc index d790392..94250eb 100644 --- a/bezel/Mega_Bezel/shaders/base/common/globals.inc +++ b/bezel/Mega_Bezel/shaders/base/common/globals.inc @@ -37,6 +37,12 @@ layout(std140, set = 0, binding = 0) uniform UBO uint FrameCount; float HSM_RESOLUTION_DEBUG_ON; + float HSM_SINDEN_BORDER_ON; + float HSM_SINDEN_BORDER_OPACITY; +float HSM_SINDEN_BORDER_BRIGHTNESS; +float HSM_SINDEN_AMBIENT_LIGHTING; + float HSM_SINDEN_BORDER_THICKNESS; +float HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION; float HSM_CACHE_GRAPHICS_ON; float HSM_CACHE_UPDATE_INDICATOR_MODE; @@ -210,6 +216,7 @@ layout(std140, set = 0, binding = 0) uniform UBO // Show Pass float HSM_SHOW_PASS_INDEX; +float HSM_SHOW_PASS_ALPHA; float HSM_SHOW_PASS_APPLY_SCREEN_COORD; float HSM_SCREEN_VIGNETTE_ON; @@ -389,6 +396,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_REFLECT_BEZEL_INNER_EDGE_FULLSCREEN_GLOW; float HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT; float HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS; +float HSM_REFLECT_SHOW_TUBE_FX_AMOUNT; float HSM_REFLECT_DIRECT_AMOUNT; float HSM_REFLECT_DIFFUSED_AMOUNT; float HSM_REFLECT_FULLSCREEN_GLOW; @@ -400,8 +408,6 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_REFLECT_LATERAL_OUTER_FADE_POSITION; float HSM_REFLECT_LATERAL_OUTER_FADE_DISTANCE; - float HSM_REFLECT_VIGNETTE_AMOUNT; - float HSM_REFLECT_VIGNETTE_SIZE; float HSM_REFLECT_NOISE_AMOUNT; float HSM_REFLECT_NOISE_SAMPLES; @@ -413,9 +419,16 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_REFLECT_BLUR_MIN; float HSM_REFLECT_BLUR_MAX; - float HSM_REFLECT_MASK_IMG_AMOUNT; + float HSM_REFLECT_MASK_IMAGE_AMOUNT; + float HSM_REFLECT_MASK_FOLLOW_LAYER; + float HSM_REFLECT_MASK_FOLLOW_MODE; + float HSM_REFLECT_MASK_BRIGHTNESS; + float HSM_REFLECT_MASK_BLACK_LEVEL; +float HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS; float HSM_GLASS_BORDER_ON; + float HSM_REFLECT_VIGNETTE_AMOUNT; + float HSM_REFLECT_VIGNETTE_SIZE; float HSM_POTATO_SHOW_BG_OVER_SCREEN; float HSM_POTATO_COLORIZE_CRT_WITH_BG; @@ -470,7 +483,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_BG_SCALE_X; float HSM_BG_POS_X; float HSM_BG_POS_Y; - float HSM_BG_MIRROR_WRAP; + float HSM_BG_WRAP_MODE; float HSM_BG_MIPMAPPING_BLEND_BIAS; // Background Vignette @@ -535,9 +548,7 @@ layout(std140, set = 0, binding = 0) uniform UBO float HSM_DEVICE_SCALE_X; float HSM_DEVICE_POS_X; float HSM_DEVICE_POS_Y; - float HSM_DEVICE_MIPMAPPING_BLEND_BIAS; - // float HSM_REFLECT_MASK_FOLLOW_LAYER; - // float HSM_REFLECT_MASK_FOLLOW_MODE; + float HSM_DEVICE_MIPMAPPING_BLEND_BIAS; // DEVICELED float HSM_DEVICELED_OPACITY; @@ -823,6 +834,8 @@ float mask_bloom; #define FOLLOW_LAYER_BG 3 #define FOLLOW_LAYER_DEVICE 4 #define FOLLOW_LAYER_DECAL 5 +#define FOLLOW_LAYER_CAB_GLASS 6 +#define FOLLOW_LAYER_TOP 7 float FOLLOW_MODE_SCALE_AND_POS = 0; float FOLLOW_MODE_EXACT = 1; diff --git a/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc b/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc index 96bfc58..9a18e76 100644 --- a/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc +++ b/bezel/Mega_Bezel/shaders/base/common/params-0-screen-scale.inc @@ -23,7 +23,7 @@ */ // Screen Scale Required Parameters -#pragma parameter HSM_MEGA_BEZEL_TITLE "[ --- HSM MEGA BEZEL V1.7.0_2022-12-21 --- ]" 0 0 0.001 0.001 +#pragma parameter HSM_MEGA_BEZEL_TITLE "[ --- HSM MEGA BEZEL V1.9.0_2023-01-22 --- ]" 0 0 0.001 0.001 #pragma parameter HSM_RESOLUTION_DEBUG_ON " Show Resolution Info" 0 0 1 1 float HSM_RESOLUTION_DEBUG_ON = global.HSM_RESOLUTION_DEBUG_ON; @@ -47,18 +47,6 @@ float HSM_RESOLUTION_DEBUG_ON = global.HSM_RESOLUTION_DEBUG_ON; #pragma parameter post_br_affect_black_level " Post CRT Brightness Affects Grade Black Level" 100 0 100 10 #define HSM_POST_CRT_BRIGHTNESS_AFFECT_BLACK_LEVEL global.post_br_affect_black_level / 100 -//--------------------------------------------------------------------------------------------------- -// Global Graphics Caching -//--------------------------------------------------------------------------------------------------- -#pragma parameter HSM_GLOBAL_GRAPHICS_CACHE_EMPTY_LINE " " 0 0 0.001 0.001 -#pragma parameter HSM_GLOBAL_GRAPHICS_CACHE_TITLE "[ GRAPHICS CACHE ]:" 0 0 0.001 0.001 - -#pragma parameter HSM_CACHE_GRAPHICS_ON " Cache Graphics: OFF | ON" 1 0 1 1 -float HSM_CACHE_GRAPHICS_ON = global.HSM_CACHE_GRAPHICS_ON; - -#pragma parameter HSM_CACHE_UPDATE_INDICATOR_MODE " Cache Update Indicator: OFF | ON | ONLY IF CACHE IS OFF" 2 0 2 1 -float HSM_CACHE_UPDATE_INDICATOR_MODE = global.HSM_CACHE_UPDATE_INDICATOR_MODE; - //--------------------------------------------------------------------------------------------------- // Global Graphics Brightness @@ -92,6 +80,25 @@ float HSM_AMBIENT2_OPACITY = global.HSM_AMBIENT2_OPACITY / 100 * global.HSM_AMBI float HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE = global.HSM_AMBIENT_LIGHTING_SWAP_IMAGE_MODE; +//--------------------------------------------------------------------------------------------------- +// Sinden Lightgun Border +//--------------------------------------------------------------------------------------------------- +#pragma parameter HSM_SINDEN_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_SINDEN_TITLE "[ SINDEN LIGHTGUN BORDER ]:" 0 0 0.001 0.001 + +#pragma parameter HSM_SINDEN_BORDER_ON " Show Border" 0 0 1 1 +float HSM_SINDEN_BORDER_ON = global.HSM_SINDEN_BORDER_ON; + +#pragma parameter HSM_SINDEN_BORDER_BRIGHTNESS " Brightness" 60 0 200 5 +float HSM_SINDEN_BORDER_BRIGHTNESS = global.HSM_SINDEN_BORDER_BRIGHTNESS / 100; + +#pragma parameter HSM_SINDEN_BORDER_THICKNESS " Thickness" 2 0 30 0.5 +float HSM_SINDEN_BORDER_THICKNESS = global.HSM_SINDEN_BORDER_THICKNESS / 100; + +#pragma parameter HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION " Compensate Empty Tube" 0 0 1 1 +float HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION = global.HSM_SINDEN_BORDER_EMPTY_TUBE_COMPENSATION; + + //--------------------------------------------------------------------------------------------------- // Zoom & Pan //--------------------------------------------------------------------------------------------------- @@ -472,6 +479,19 @@ float HSM_CRT_CURVATURE_SCALE = global.HSM_CRT_CURVATURE_SCALE / 100; #define HSM_ANTI_FLICKER_THRESHOLD global.HSM_ANTI_FLICKER_THRESHOLD / 100 +//--------------------------------------------------------------------------------------------------- +// Global Graphics Caching +//--------------------------------------------------------------------------------------------------- +#pragma parameter HSM_GLOBAL_GRAPHICS_CACHE_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_GLOBAL_GRAPHICS_CACHE_TITLE "[ GRAPHICS CACHE ]:" 0 0 0.001 0.001 + +#pragma parameter HSM_CACHE_GRAPHICS_ON " Cache Graphics: OFF | ON" 1 0 1 1 +float HSM_CACHE_GRAPHICS_ON = global.HSM_CACHE_GRAPHICS_ON; + +#pragma parameter HSM_CACHE_UPDATE_INDICATOR_MODE " Cache Update Indicator: OFF | ON | ONLY IF CACHE IS OFF" 2 0 2 1 +float HSM_CACHE_UPDATE_INDICATOR_MODE = global.HSM_CACHE_UPDATE_INDICATOR_MODE; + + //--------------------------------------------------------------------------------------------------- // A/B SPLITSCREEN COMPARE //--------------------------------------------------------------------------------------------------- @@ -511,6 +531,9 @@ float HSM_SHOW_PASS_INDEX = global.HSM_SHOW_PASS_INDEX; #pragma parameter HSM_SHOW_PASS_APPLY_SCREEN_COORD " Apply Screen Scale & Curvature to Unscaled Passes" 1 0 1 1 float HSM_SHOW_PASS_APPLY_SCREEN_COORD = global.HSM_SHOW_PASS_APPLY_SCREEN_COORD; +#pragma parameter HSM_SHOW_PASS_ALPHA " Show Alpha Channel" 0 0 1 1 +float HSM_SHOW_PASS_ALPHA = global.HSM_SHOW_PASS_ALPHA; + //--------------------------------------------------------------------------------------------------- // SCREEN VIGNETTE @@ -559,6 +582,28 @@ float HSM_SCREEN_VIGNETTE_DUALSCREEN_VIS_MODE = global.HSM_SCREEN_VIGNETTE_DUALS float HSM_MONOCHROME_DUALSCREEN_VIS_MODE = global.HSM_MONOCHROME_DUALSCREEN_VIS_MODE; +//--------------------------------------------------------------------------------------------------- +// TUBE EMPTY +//--------------------------------------------------------------------------------------------------- +#pragma parameter HSM_TUBE_ASPECT_AND_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_TUBE_ASPECT_AND_EMPTY_TITLE "[ TUBE ASPECT & EMPTY SPACE ]:" 0 0 0.001 0.001 + +#pragma parameter HSM_TUBE_DIFFUSE_FORCE_ASPECT " Tube Aspect - EVEN | SCREEN | Explicit" 1 0 2 1 +#define HSM_TUBE_DIFFUSE_FORCE_ASPECT global.HSM_TUBE_DIFFUSE_FORCE_ASPECT + +#pragma parameter HSM_TUBE_EXPLICIT_ASPECT " Explicit Tube Aspect " 1.3333 0.5 3 0.01 +#define HSM_TUBE_EXPLICIT_ASPECT global.HSM_TUBE_EXPLICIT_ASPECT + +#pragma parameter HSM_TUBE_EMPTY_THICKNESS " Empty Tube Thickness" 0 0 6000 10 +#define HSM_TUBE_EMPTY_THICKNESS (0.7 * global.HSM_TUBE_EMPTY_THICKNESS / 100) + +#pragma parameter HSM_TUBE_EMPTY_THICKNESS_X_SCALE " Empty Tube Thicknes X Scale" 100 0 3000 1 +#define HSM_TUBE_EMPTY_THICKNESS_X_SCALE (global.HSM_TUBE_EMPTY_THICKNESS_X_SCALE / 100) + +#pragma parameter HSM_SCREEN_CORNER_RADIUS_SCALE " Screen (Game Image) Corner Radius Scale" 100 5 3000 1 +#define HSM_SCREEN_CORNER_RADIUS_SCALE (global.HSM_SCREEN_CORNER_RADIUS_SCALE / 100) + + //--------------------------------------------------------------------------------------------------- // TUBE DIFFUSE IMAGE //--------------------------------------------------------------------------------------------------- @@ -604,21 +649,6 @@ float HSM_TUBE_DIFFUSE_IMAGE_SCALE_X = global.HSM_TUBE_DIFFUSE_IMAGE_SCALE_X / 1 #pragma parameter HSM_TUBE_DIFFUSE_IMAGE_ROTATION " Image Rotation: -1: 270 | 0 | 1: 90" 0 -1 1 1 float HSM_TUBE_DIFFUSE_IMAGE_ROTATION = global.HSM_TUBE_DIFFUSE_IMAGE_ROTATION; -#pragma parameter HSM_TUBE_DIFFUSE_FORCE_ASPECT " Tube Diffuse Aspect - EVEN | SCREEN | Explicit" 1 0 2 1 -#define HSM_TUBE_DIFFUSE_FORCE_ASPECT global.HSM_TUBE_DIFFUSE_FORCE_ASPECT - -#pragma parameter HSM_TUBE_EXPLICIT_ASPECT " Explicit Tube DiIffuse Aspect" 1.3333 0.5 3 0.01 -#define HSM_TUBE_EXPLICIT_ASPECT global.HSM_TUBE_EXPLICIT_ASPECT - -#pragma parameter HSM_TUBE_EMPTY_THICKNESS " Empty Tube Thickness" 0 0 6000 10 -#define HSM_TUBE_EMPTY_THICKNESS (0.7 * global.HSM_TUBE_EMPTY_THICKNESS / 100) - -#pragma parameter HSM_TUBE_EMPTY_THICKNESS_X_SCALE " Empty Tube Thicknes X Scale" 100 0 3000 1 -#define HSM_TUBE_EMPTY_THICKNESS_X_SCALE (global.HSM_TUBE_EMPTY_THICKNESS_X_SCALE / 100) - -#pragma parameter HSM_SCREEN_CORNER_RADIUS_SCALE " Screen (Game Image) Corner Radius Scale" 100 5 3000 1 -#define HSM_SCREEN_CORNER_RADIUS_SCALE (global.HSM_SCREEN_CORNER_RADIUS_SCALE / 100) - //--------------------------------------------------------------------------------------------------- // TUBE SHADOW IMAGE diff --git a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc b/bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc new file mode 100644 index 0000000..1a3a1a2 --- /dev/null +++ b/bezel/Mega_Bezel/shaders/base/common/params-2-reflection-mask.inc @@ -0,0 +1,59 @@ +/* + Mega Bezel - Creates a graphic treatment for the game play area to give a retro feel + Copyright (C) 2019-2022 HyperspaceMadness - HyperspaceMadness@outlook.com + + Incorporates much great feedback from the libretro forum, and thanks + to Hunterk who helped me get started + + See more at the libretro forum + https://forums.libretro.com/t/hsm-mega-bezel-reflection-shader-feedback-and-updates + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see [http://www.gnu.org/licenses/]. +*/ + +//--------------------------------------------------------------------------------------------------- +// REFLECTION MASK +//--------------------------------------------------------------------------------------------------- +#pragma parameter HSM_REFLECT_MASK_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_REFLECT_MASK_TITLE "[ REFLECTION MASK IMAGE - Only in Image Layer Presets ]:" 0 0 0.01 0.01 + +#pragma parameter HSM_REFLECT_MASK_IMAGE_AMOUNT " Reflection Image Mask Amount" 0 0 100 1 +#ifndef HSM_REFLECT_MASK_IMAGE_AMOUNT +#define HSM_REFLECT_MASK_IMAGE_AMOUNT global.HSM_REFLECT_MASK_IMAGE_AMOUNT / 100 +#endif + +#pragma parameter HSM_REFLECT_MASK_FOLLOW_LAYER " Follow Layer - FULL | TUBE | BEZEL |BG|DEVICE|DECAL|CAB|TOP" 4 0 7 1 +#ifndef HSM_REFLECT_MASK_FOLLOW_LAYER +#define HSM_REFLECT_MASK_FOLLOW_LAYER global.HSM_REFLECT_MASK_FOLLOW_LAYER +#endif + +#pragma parameter HSM_REFLECT_MASK_FOLLOW_MODE " Follow Mode - FOLLOW SCALE & POS | FOLLOW EXACTLY" 1 0 1 1 +#ifndef HSM_REFLECT_MASK_FOLLOW_MODE +#define HSM_REFLECT_MASK_FOLLOW_MODE global.HSM_REFLECT_MASK_FOLLOW_MODE +#endif + +#pragma parameter HSM_REFLECT_MASK_BRIGHTNESS " Mask Brightness" 100 0 200 1 +#ifndef HSM_REFLECT_MASK_BRIGHTNESS +#define HSM_REFLECT_MASK_BRIGHTNESS global.HSM_REFLECT_MASK_BRIGHTNESS / 100 +#endif + +#pragma parameter HSM_REFLECT_MASK_BLACK_LEVEL " Mask Black Level" 0 -100 100 0.5 +#ifndef HSM_REFLECT_MASK_BLACK_LEVEL +#define HSM_REFLECT_MASK_BLACK_LEVEL (global.HSM_REFLECT_MASK_BLACK_LEVEL / 1000 + 1) +#endif + +#pragma parameter HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS " Mipmapping Blend Bias (Affects Sharpness)" 0 -5 5 0.1 +#ifndef HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS +#define HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS global.HSM_REFLECT_MASK_MIPMAPPING_BLEND_BIAS +#endif \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc b/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc index 28adf7c..443fcd4 100644 --- a/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc +++ b/bezel/Mega_Bezel/shaders/base/common/params-2-reflection.inc @@ -58,6 +58,8 @@ float HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT = global.HSM_REFLECT_FRAME_INNER_EDGE_ #pragma parameter HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS " Frame Inner Edge Sharpness" 90 0 90 2 float HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS = global.HSM_REFLECT_FRAME_INNER_EDGE_SHARPNESS / 100; +#pragma parameter HSM_REFLECT_SHOW_TUBE_FX_AMOUNT " Show Tube Effects in Reflection Amount" 100 0 100 2 +float HSM_REFLECT_SHOW_TUBE_FX_AMOUNT = global.HSM_REFLECT_SHOW_TUBE_FX_AMOUNT / 100; //--------------------------------------------------------------------------------------------------- // Reflection Fading @@ -99,8 +101,6 @@ float HSM_REFLECT_BLUR_MAX = global.HSM_REFLECT_BLUR_MAX / 100; #pragma parameter HSM_REFLECT_BLUR_FALLOFF_DISTANCE " Falloff Distance" 100 0 1000 1 float HSM_REFLECT_BLUR_FALLOFF_DISTANCE = global.HSM_REFLECT_BLUR_FALLOFF_DISTANCE / 100; -// float HSM_REFLECT_BLUR_FALLOFF_DISTANCE = 1; - // Reflection Noise #pragma parameter HSM_REFLECT_NOISE_EMPTY_LINE " " 0 0 0.001 0.001 #pragma parameter HSM_REFLECT_NOISE_TITLE "[ REFLECTION NOISE ]:" 0 0 0.01 0.01 @@ -114,23 +114,29 @@ float HSM_REFLECT_NOISE_SAMPLES = global.HSM_REFLECT_NOISE_SAMPLES; #pragma parameter HSM_REFLECT_NOISE_SAMPLE_DISTANCE " Sample Distance" 100 0 500 5 float HSM_REFLECT_NOISE_SAMPLE_DISTANCE = global.HSM_REFLECT_NOISE_SAMPLE_DISTANCE / 500; -//TODO Reflection Mask is disabled at the moment because it really needs the layer scaling sof it can follow the device or other layers -// Reflection Mask -// #pragma parameter HSM_REFLECT_MASK_TITLE "[ REFLECTION MASK IMAGE ]:" 0 0 0.01 0.01 +// #pragma parameter HSM_REFLECT_BRIGHTNESS_NOISE_BLACK_LEVEL " Mask Black Level" 0 -100 100 0.5 +// float HSM_REFLECT_BRIGHTNESS_NOISE_BLACK_LEVEL = (global.HSM_REFLECT_BRIGHTNESS_NOISE_BLACK_LEVEL / 1000 + 1); -// #pragma parameter HSM_REFLECT_MASK_IMG_AMOUNT " Reflection Image Mask Amount" 0 0 100 1 -// float HSM_REFLECT_MASK_IMG_AMOUNT = global.HSM_REFLECT_MASK_IMG_AMOUNT / 100; +// #pragma parameter HSM_REFLECT_BRIGHTNESS_NOISE_BRIGHTNESS " Mask Brightness" 100 0 200 1 +// float HSM_REFLECT_BRIGHTNESS_NOISE_BRIGHTNESS = global.HSM_REFLECT_BRIGHTNESS_NOISE_BRIGHTNESS / 100; -// #pragma parameter HSM_REFLECT_MASK_FOLLOW_LAYER " Scaling Mode (Image Layers Only)- FullScreen | Bezel Img" 0 0 1 1 -// float HSM_REFLECT_MASK_FOLLOW_LAYER = global.HSM_REFLECT_MASK_FOLLOW_LAYER; +//--------------------------------------------------------------------------------------------------- +// REFLECTION MASK +//--------------------------------------------------------------------------------------------------- +#include "params-2-reflection-mask.inc" -#pragma parameter HSM_GLASS_BORDER_ON " Glass Border ON (For Glass Preset)" 0 0 1 1 + +// Glass Preset Stuff +#pragma parameter HSM_REFLECT_GLASS_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_REFLECT_GLASS_TITLE "[ REFLECTION GLASS ]:" 0 0 0.01 0.01 + +#pragma parameter HSM_GLASS_BORDER_ON " Glass Border ON (For Glass Preset)" 0 0 1 1 float HSM_GLASS_BORDER_ON = global.HSM_GLASS_BORDER_ON; -#pragma parameter HSM_REFLECT_VIGNETTE_AMOUNT " Glass Reflection Vignette" 0 0 100 0.5 +#pragma parameter HSM_REFLECT_VIGNETTE_AMOUNT " Glass Reflection Vignette" 0 0 100 0.5 float HSM_REFLECT_VIGNETTE_AMOUNT = global.HSM_REFLECT_VIGNETTE_AMOUNT / 100; -#pragma parameter HSM_REFLECT_VIGNETTE_SIZE " Glass Reflection Vignette Size" 100 50 200 2 +#pragma parameter HSM_REFLECT_VIGNETTE_SIZE " Glass Reflection Vignette Size" 100 50 200 2 float HSM_REFLECT_VIGNETTE_SIZE = global.HSM_REFLECT_VIGNETTE_SIZE / 100; diff --git a/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc b/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc index e863044..8faf6b6 100644 --- a/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc +++ b/bezel/Mega_Bezel/shaders/base/common/params-4-image-layers.inc @@ -92,6 +92,12 @@ float HSM_CUTOUT_POS_Y = global.HSM_CUTOUT_POS_Y / 100; float HSM_CUTOUT_CORNER_RADIUS = global.HSM_CUTOUT_CORNER_RADIUS; +//--------------------------------------------------------------------------------------------------- +// REFLECTION MASK +//--------------------------------------------------------------------------------------------------- +#include "params-2-reflection-mask.inc" + + //--------------------------------------------------------------------------------------------------- // MASK DEBUG //--------------------------------------------------------------------------------------------------- @@ -186,8 +192,8 @@ float HSM_BG_POS_X = global.HSM_BG_POS_X / -100; #pragma parameter HSM_BG_POS_Y " Position Y" 0 -1000 1000 0.05 float HSM_BG_POS_Y = global.HSM_BG_POS_Y / 100; -#pragma parameter HSM_BG_MIRROR_WRAP " Mirror Wrap" 1 0 1 1 -float HSM_BG_MIRROR_WRAP = global.HSM_BG_MIRROR_WRAP; +#pragma parameter HSM_BG_WRAP_MODE " Wrap Mode: NONE | TILED | MIRRORED" 1 0 2 1 +float HSM_BG_WRAP_MODE = global.HSM_BG_WRAP_MODE; //--------------------------------------------------------------------------------------------------- diff --git a/bezel/Mega_Bezel/shaders/base/linearize-crt.inc b/bezel/Mega_Bezel/shaders/base/linearize-crt.inc index d7f1e3f..cf19874 100644 --- a/bezel/Mega_Bezel/shaders/base/linearize-crt.inc +++ b/bezel/Mega_Bezel/shaders/base/linearize-crt.inc @@ -21,8 +21,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - -#include "common/globals-and-screen-scale-params.inc" +// HSM_REFLECT_SHOW_TUBE_FX_AMOUNT +#include "common/globals-and-reflection-params.inc" #include "common/helper-functions.inc" layout(push_constant) uniform Push @@ -68,7 +68,9 @@ void main() FragColor = textureLod(CRTPass, vTexCoord, 2); FragColor = HSM_ApplyGamma(FragColor, DEFAULT_SRGB_GAMMA); #else - FragColor = textureLod(PostCRTPass, vTexCoord, 2); + vec4 crt_rgba = textureLod(CRTPass, vTexCoord, 2); + vec4 post_crt_rgba = textureLod(PostCRTPass, vTexCoord, 2); + FragColor = mix(crt_rgba, post_crt_rgba, HSM_REFLECT_SHOW_TUBE_FX_AMOUNT); #endif FragColor = HSM_ApplyGamma(FragColor, DEFAULT_SRGB_GAMMA/DEFAULT_CRT_GAMMA - 0.05); diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc b/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc index daa287e..7ea336c 100644 --- a/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc +++ b/bezel/Mega_Bezel/shaders/base/post-crt-prep-potato.inc @@ -78,11 +78,8 @@ vec4 HSM_GetPostCrtPreppedColorPotato(vec4 in_color_linear, vec2 VIEWPORT_COORD, if (HSM_GetUseScreenVignette()) { - // out_color *= HSM_GetScreenVignetteFactor(screen_curved_coord); - float vignette_factor = HSM_GetScreenVignetteFactor(mirrored_screen_coord); - // float vignette_factor_outside_screen = HSM_SCREEN_VIGNETTE_IN_REFLECTION * vignette_factor + (1 - HSM_SCREEN_VIGNETTE_IN_REFLECTION) * 1; if (HSM_SCREEN_VIGNETTE_IN_REFLECTION < 0.5) vignette_factor = screen_mask * vignette_factor + (1 - screen_mask); @@ -91,6 +88,7 @@ vec4 HSM_GetPostCrtPreppedColorPotato(vec4 in_color_linear, vec2 VIEWPORT_COORD, out_color.rgb *= screen_mask; out_color *= TUBE_MASK; + out_color = clamp(out_color, 0, 1); if (HSM_BG_OPACITY > 0) @@ -135,6 +133,13 @@ vec4 HSM_GetPostCrtPreppedColorPotato(vec4 in_color_linear, vec2 VIEWPORT_COORD, } } + if (HSM_SINDEN_BORDER_ON > 0.5) + { + vec2 tube_diffuse_curved_coord = HSM_GetTubeCurvedCoord(TUBE_DIFFUSE_COORD, HSM_TUBE_BLACK_EDGE_CURVATURE_SCALE, TUBE_DIFFUSE_SCALE, TUBE_SCALE, TUBE_DIFFUSE_ASPECT, 0); + float tube_diffuse_mask = HSM_GetCornerMask(tube_diffuse_curved_coord, TUBE_DIFFUSE_ASPECT, black_edge_corner_radius, 0.99); + out_color = HSM_Apply_Sinden_Lightgun_Border(out_color, tube_diffuse_curved_coord, tube_diffuse_mask, black_edge_corner_radius); + } + return out_color; } diff --git a/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc b/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc index 588feeb..9026f48 100644 --- a/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc +++ b/bezel/Mega_Bezel/shaders/base/post-crt-prep.inc @@ -300,7 +300,7 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_linear, vec2 VIEWPORT_COORD, vec2 out_color = normal_blended + out_color; } } - } + } #ifndef IS_NO_REFLECT_PRESET @@ -328,6 +328,11 @@ vec4 HSM_GetPostCrtPreppedColor(vec4 in_color_linear, vec2 VIEWPORT_COORD, vec2 out_color.rgb += tube_highlight_image * HSM_TUBE_STATIC_REFLECTION_IMAGE_OPACITY; } + if (HSM_SINDEN_BORDER_ON > 0.5) + { + out_color = HSM_Apply_Sinden_Lightgun_Border(out_color, tube_diffuse_curved_coord, tube_diffuse_mask, black_edge_corner_radius); + } + return out_color; } diff --git a/bezel/Mega_Bezel/shaders/base/reflection.inc b/bezel/Mega_Bezel/shaders/base/reflection.inc index 0306527..bd6fa0b 100644 --- a/bezel/Mega_Bezel/shaders/base/reflection.inc +++ b/bezel/Mega_Bezel/shaders/base/reflection.inc @@ -142,7 +142,7 @@ void main() float edge_mask = HSM_GetCornerMask(edge_mask_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, HSM_BZL_INNER_EDGE_SHARPNESS); - float outside_tube_mask = 1 - HSM_GetCornerMask(tube_curved_coord, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99); + float outside_tube_mask = 1 - HSM_GetCornerMask((tube_curved_coord - 0.5) * 1.002 + 0.5, TUBE_DIFFUSE_ASPECT, bezel_corner_radius, 0.99); TUBE_MASK = 1 - outside_tube_mask; OUTSIDE_BEZEL_MASK = 1 - HSM_GetCornerMask(BEZEL_OUTSIDE_CURVED_COORD, TUBE_DIFFUSE_ASPECT, HSM_GLOBAL_CORNER_RADIUS * HSM_BZL_OUTER_CORNER_RADIUS_SCALE, 0.9); @@ -388,22 +388,6 @@ void main() // Modulate amount of refleciton on frame inner edge reflection_color.rgb *= (1 - HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT) * (1 - frame_inner_edge_mask) + HSM_REFLECT_FRAME_INNER_EDGE_AMOUNT; - - // TODO needs more work, needs Background Coord and Device Coord - // // Apply the mask image on the reflection, usually used to show the uneven brightness of a bumpy surface - // if (HSM_REFLECT_MASK_IMG_AMOUNT > 0) - // { - // vec2 reflection_image_coord = BACKGROUND_CURVED_COORD; - // vec2 reflection_image_scale = BACKGROUND_SCALE; - - // if (HSM_REFLECT_MASK_FOLLOW_LAYER == 1) - // { - // reflection_image_coord = DEVICE_CURVED_COORD; - // reflection_image_scale = DEVICE_SCALE; - // } - - // reflection_color *= HSM_REFLECT_MASK_IMG_AMOUNT * texture(ReflectionMaskImage, reflection_image_coord).r + (1 - HSM_REFLECT_MASK_IMG_AMOUNT); - // } } crt_linear.rgb *= TUBE_MASK; @@ -420,7 +404,6 @@ void main() frag_color_linear = HSM_BlendModeLayerMix(frag_color_linear, bg_image, HSM_BG_BLEND_MODE, HSM_BG_OPACITY); frag_color_linear += reflection_color; - FragColor = frag_color_linear; // Apply output gamma if this not an HDR preset because it is the last pass diff --git a/bezel/Mega_Bezel/shaders/base/text.inc b/bezel/Mega_Bezel/shaders/base/text.inc index 0a8b5d8..8dac321 100644 --- a/bezel/Mega_Bezel/shaders/base/text.inc +++ b/bezel/Mega_Bezel/shaders/base/text.inc @@ -396,17 +396,17 @@ float print_integer(float number, int zeros, vec2 uv) #define eps 1e-3 -float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 derezed_size, vec2 negative_crop_added_size, vec2 cropped_original_size, vec2 sampling_res, vec2 int_mult) +float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec4 screen_region, vec2 derezed_size, vec2 negative_crop_added_size, vec2 cropped_original_size, vec2 sampling_res, vec2 int_mult) { float col = 0.0; float current_line_index = 0; float margin = STRHEIGHT(1); - //Resolution Text + // Resolution Text print_pos = vec2(margin, 0); - // Line 14 Viewport Resolution ---------------------------------------------------- + // Viewport Resolution ---------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); @@ -417,7 +417,20 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze _spc _x _spc TEXT_MASK += print_integer(viewport_size.y, 0, uv); - // Line 13 Screen Resolution ---------------------------------------------------------- + // Screen Region ---------------------------------------------------------- + print_pos.x = margin; + print_pos.y += STRHEIGHT(1); + + _S _c _r _e _e _n _spc _R _e _g _i _o _n _spc _dsh _spc + TEXT_MASK += print_integer(screen_region.x, 0, uv); + _spc + TEXT_MASK += print_integer(screen_region.y, 0, uv); + _spc + TEXT_MASK += print_integer(screen_region.z, 0, uv); + _spc + TEXT_MASK += print_integer(screen_region.w, 0, uv); + + // Screen Resolution ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); @@ -426,21 +439,21 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze _spc _x _spc TEXT_MASK += print_integer(screen_size.y, 0, uv); - // Line 12 Final Aspect Ratio ---------------------------------------------------------- + // Final Aspect Ratio ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); _F _i _n _a _l _spc _A _s _p _e _c _t _spc _dsh _dsh _spc TEXT_MASK += print_number(screen_size.x/screen_size.y > 1 ? screen_size.x/screen_size.y : screen_size.y/screen_size.x, print_pos, uv); - // Line 11 Non-Int Scale Percent ---------------------------------------------------------- + // Non-Int Scale Percent ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); _N _o _n _spc _I _n _t _spc _S _c _l _spc _pct _dsh _dsh _spc TEXT_MASK += print_number(screen_size.y / viewport_size.y * 100, print_pos, uv); - // Line 10 Int Scale Vertical ---------------------------------------------------------- + // Int Scale Vertical ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); @@ -451,7 +464,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze else TEXT_MASK += print_number(int_mult.y, print_pos, uv); - // Line 09 Int Scale Horizontal ---------------------------------------------------------- + // Int Scale Horizontal ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); @@ -462,7 +475,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze else TEXT_MASK += print_number(int_mult.x, print_pos, uv); - // Line 08 Sampling Resolution ---------------------------------------------------------- + // Sampling Resolution ---------------------------------------------------------- if (cropped_original_size.x != sampling_res.x || cropped_original_size.y != sampling_res.y) { print_pos.x = margin; @@ -476,7 +489,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze } - // Line 07 CROPPED Resolution ---------------------------------------------------------- + // CROPPED Resolution ---------------------------------------------------------- if (cropped_original_size.x != ROTATED_CORE_PREPPED_SIZE.x || cropped_original_size.y != ROTATED_CORE_PREPPED_SIZE.y) { print_pos.x = margin; @@ -490,7 +503,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze } - // Line 06 Negative Crop Resolution ---------------------------------------------------------- + // Negative Crop Resolution ---------------------------------------------------------- if (derezed_size.x != ROTATED_CORE_PREPPED_SIZE.x || derezed_size.y != ROTATED_CORE_PREPPED_SIZE.y) { print_pos.x = margin; @@ -504,7 +517,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze } - // Line 05 DEREZ Resolution ---------------------------------------------------------- + // DEREZ Resolution ---------------------------------------------------------- if (derezed_size.x != ROTATED_CORE_ORIGINAL_SIZE.x || derezed_size.y != ROTATED_CORE_ORIGINAL_SIZE.y) { print_pos.x = margin; @@ -518,7 +531,7 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze } - // Line 04 CORE Resolution ---------------------------------------------------------- + // CORE Resolution ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); @@ -552,18 +565,17 @@ float DrawResolutions(vec2 uv, vec2 viewport_size, vec2 screen_size, vec2 dereze _P _O _T _A _T _O #endif - - // Line 02 Version ---------------------------------------------------------- + // Version ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); - // Text Version V1.7.0_2022-12-21 + // Text Version V1.9.0_2023-01-22 // Version - _1 _per _7 _per _0 _spc + _1 _per _9 _per _0 _spc // Date - _2 _0 _2 _2 _dsh _1 _2 _dsh _2 _1 + _2 _0 _2 _3 _dsh _0 _1 _dsh _2 _2 - // Line 01 Title ---------------------------------------------------------- + // Title ---------------------------------------------------------- print_pos.x = margin; print_pos.y += STRHEIGHT(1); @@ -581,6 +593,19 @@ vec2 GetIntegerScaleMult(vec2 screen_size, vec2 cropped_size) return integer_scale; } +vec4 GetScreenRegion(vec2 screen_size) +{ + vec2 position_offset = SCREEN_POS_OFFSET * global.FinalViewportSize.xy * HSM_VIEWPORT_ZOOM + + vec2(-HSM_VIEWPORT_POSITION_X, HSM_VIEWPORT_POSITION_Y) * HSM_VIEWPORT_ZOOM * global.FinalViewportSize.xy; + + vec2 top_left = global.FinalViewportSize.xy / 2 - screen_size / 2 + position_offset; + + vec2 bottom_right = global.FinalViewportSize.xy / 2 + screen_size / 2 + position_offset; + + vec4 out_region = round(vec4(top_left, bottom_right)); + return out_region; +} + float GetText(vec2 in_coord) { in_coord.x = HSM_FLIP_VIEWPORT_HORIZONTAL * HSM_FLIP_CORE_HORIZONTAL * (in_coord.x - 0.5) + 0.5; @@ -597,7 +622,9 @@ float GetText(vec2 in_coord) vec2 uv = global.OutputSize.xy * in_coord; vec2 downscaled_uv = floor(global.OutputSize.xy * in_coord / downscale); - float pixel = DrawResolutions(downscaled_uv, global.FinalViewportSize.xy, SCREEN_SIZE, ROTATED_DEREZED_SIZE, ROTATED_CORE_PREPPED_SIZE, CROPPED_ROTATED_SIZE, CROPPED_ROTATED_SIZE_WITH_RES_MULT, int_mult); + vec4 screen_region = GetScreenRegion(SCREEN_SIZE); + + float pixel = DrawResolutions(downscaled_uv, global.FinalViewportSize.xy, SCREEN_SIZE, screen_region, ROTATED_DEREZED_SIZE, ROTATED_CORE_PREPPED_SIZE, CROPPED_ROTATED_SIZE, CROPPED_ROTATED_SIZE_WITH_RES_MULT, int_mult); vec3 col = vec3(1); pixel *= (1 - distance(mod(uv, vec2(1.0)), vec2(0.65))) * 1.2; diff --git a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang b/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang index faeafe2..3ab723c 100644 --- a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang +++ b/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-1-before.slang @@ -32,7 +32,7 @@ layout(push_constant) uniform Push vec4 OriginalSize; vec4 OutputSize; uint FrameCount; - float HSM_DEDITHER_MODE; + float SGPT_BLEND_OPTION; float HSM_DEDITHER_BRIGHTNESS_BIAS; } params; @@ -41,11 +41,11 @@ layout(std140, set = 0, binding = 0) uniform UBO mat4 MVP; } global; -#pragma parameter HSM_DEDITHERING_EMPTY_LINE " " 0 0 0.001 0.001 -#pragma parameter HSM_DEDITHERING_TITLE "[ --- MDAPT & HYLLIAN DE-DITHERING --- ]:" 0 0 0.01 0.01 +#pragma parameter HSM_SGENPT_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_SGENPT_TITLE "[ --- HYLLIAN SGENPT-MIX DE-DITHERING --- ]:" 0 0 0.01 0.01 -#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES" 0 0 5 1 -#define HSM_DEDITHER_MODE params.HSM_DEDITHER_MODE +#pragma parameter SGPT_BLEND_OPTION " Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0 0.0 3.0 1.0 +#define SGPT_BLEND_OPTION params.SGPT_BLEND_OPTION #pragma parameter HSM_DEDITHER_BRIGHTNESS_BIAS " Transparency Brightness Bias" 100 10 300 5 #define HSM_DEDITHER_BRIGHTNESS_BIAS params.HSM_DEDITHER_BRIGHTNESS_BIAS * 0.013 @@ -69,6 +69,6 @@ layout(set = 0, binding = 2) uniform sampler2D Source; void main() { FragColor = texture(Source, vTexCoord); - if (HSM_DEDITHER_MODE > 0.5) + if (SGPT_BLEND_OPTION > 0.5) FragColor = HSM_Linearize(texture(Source, vTexCoord), HSM_DEDITHER_BRIGHTNESS_BIAS); } \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang b/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang index 3b98020..fd496cb 100644 --- a/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang +++ b/bezel/Mega_Bezel/shaders/dedither/dedither-gamma-prep-2-after.slang @@ -32,7 +32,7 @@ layout(push_constant) uniform Push vec4 OriginalSize; vec4 OutputSize; uint FrameCount; - float HSM_DEDITHER_MODE; + float SGPT_BLEND_OPTION; float HSM_DEDITHER_BRIGHTNESS_BIAS; } params; @@ -41,11 +41,11 @@ layout(std140, set = 0, binding = 0) uniform UBO mat4 MVP; } global; -#pragma parameter HSM_DEDITHERING_EMPTY_LINE " " 0 0 0.001 0.001 -#pragma parameter HSM_DEDITHERING_TITLE "[ --- MDAPT & HYLLIAN DE-DITHERING --- ]:" 0 0 0.01 0.01 +#pragma parameter HSM_SGENPT_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_SGENPT_TITLE "[ --- HYLLIAN SGENPT-MIX DE-DITHERING --- ]:" 0 0 0.01 0.01 -#pragma parameter HSM_DEDITHER_MODE "Mode: OFF| STRICT | RELAXED | HYLLIAN | HYL + STRIPES | STRIPES" 0 0 5 1 -#define HSM_DEDITHER_MODE params.HSM_DEDITHER_MODE +#pragma parameter SGPT_BLEND_OPTION " Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0 0.0 3.0 1.0 +#define SGPT_BLEND_OPTION params.SGPT_BLEND_OPTION #pragma parameter HSM_DEDITHER_BRIGHTNESS_BIAS " Transparency Brightness Bias" 100 10 300 5 #define HSM_DEDITHER_BRIGHTNESS_BIAS params.HSM_DEDITHER_BRIGHTNESS_BIAS * 0.013 @@ -69,6 +69,6 @@ layout(set = 0, binding = 2) uniform sampler2D Source; void main() { FragColor = texture(Source, vTexCoord); - if (HSM_DEDITHER_MODE > 0.5) + if (SGPT_BLEND_OPTION > 0.5) FragColor = HSM_Delinearize(texture(Source, vTexCoord), HSM_DEDITHER_BRIGHTNESS_BIAS); } \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang b/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang index defb663..8a5edf7 100644 --- a/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang +++ b/bezel/Mega_Bezel/shaders/guest/extras/hsm-g-sharp_resampler.slang @@ -36,21 +36,26 @@ layout(push_constant) uniform Push float SHAR; } params; -#pragma parameter GSHARP_TITLE "[ G-SHARP RESAMPLER ]:" 0 0 0.01 0.01 +#pragma parameter HSM_GSHARP_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter GSHARP_TITLE "[ --- G-SHARP RESAMPLER --- ]:" 0 0 0.01 0.01 #pragma parameter GSHARP_ON " G-SHARP ON" 0 0 1 1 #define GSHARP_ON params.GSHARP_ON -#pragma parameter HSHARP0 " Filter Range" 1.2 1.0 6.0 0.1 +// Default was 1.2 +#pragma parameter HSHARP0 " Filter Range" 1 1.0 6.0 0.1 #define HSHARP0 params.HSHARP0 -#pragma parameter SIGMA_HV " Gaussian Blur Sigma" 0.75 0.1 7.0 0.05 +// Default was 0.75 +#pragma parameter SIGMA_HV " Gaussian Blur Sigma" 1 0.1 7.0 0.05 #define SIGMA_HV params.SIGMA_HV -#pragma parameter SHAR " Sharpness Definition" 0.5 0.0 2.0 0.05 +// Default was 0.5 +#pragma parameter SHAR " Sharpness Definition" 1.5 0.0 2.0 0.05 #define SHAR params.SHAR -#pragma parameter HAR " Anti-Ringing" 0.5 0.0 1.0 0.10 +// Default was 0.5 +#pragma parameter HAR " Anti-Ringing" 1 0.0 1.0 0.10 #define HAR params.HAR layout(std140, set = 0, binding = 0) uniform UBO diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang b/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang index c5c0597..594ee86 100644 --- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang +++ b/bezel/Mega_Bezel/shaders/guest/hsm-crt-dariusg-gdv-mini-potato.slang @@ -1,5 +1,7 @@ #version 450 +#define IS_POTATO_PRESET + #include "../base/common/globals-and-potato-params.inc" #include "../base/common/common-functions.inc" #include "hsm-crt-dariusg-gdv-mini.inc" \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc index cb91eef..2a19fe1 100644 --- a/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc +++ b/bezel/Mega_Bezel/shaders/guest/hsm-crt-guest-advanced-ntsc-pass1.inc @@ -33,29 +33,32 @@ layout(push_constant) uniform Push float S_SHARP; float HARNG; float HSHARP; - float spike; - float internal_res; + float NTSCspike; } params; -#pragma parameter bogus_filtering "[ FILTERING OPTIONS ]: " 0.0 0.0 1.0 1.0 +//--------------------------------------------------------------------------------------------------- +// NTSC Filtering +//--------------------------------------------------------------------------------------------------- +#pragma parameter HSM_NTSC_FILTERING_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_NTSC_FILTERING_TITLE "[ NTSC FILTERING OPTIONS ]: " 0.0 0.0 1.0 1.0 -#pragma parameter HSHARPNESS " Horizontal Filter Range -- HSHARPNESS" 1.5 1.0 8.0 0.05 +#pragma parameter HSHARPNESS " NTSC Horizontal Filter Range -- HSHARPNESS" 1.5 1.0 8.0 0.05 #define HSHARPNESS params.HSHARPNESS -#pragma parameter SIGMA_HOR " Horizontal Blur Sigma -- SIGMA_HOR" 0.90 0.1 7.0 0.05 +#pragma parameter SIGMA_HOR " NTSC Horizontal Blur Sigma -- SIGMA_HOR" 0.90 0.1 7.0 0.05 #define SIGMA_HOR params.SIGMA_HOR -#pragma parameter S_SHARP " Substractive Sharpness -- S_SHARP" 0.9 0.0 2.0 0.10 +#pragma parameter S_SHARP " NTSC Substractive Sharpness -- S_SHARP" 0.9 0.0 2.0 0.10 #define S_SHARP params.S_SHARP -#pragma parameter HSHARP " Sharpness Definition -- HSHARP" 1.2 0.0 2.0 0.10 +#pragma parameter HSHARP " NTSC Sharpness Definition -- HSHARP" 1.2 0.0 2.0 0.10 #define HSHARP params.HSHARP -#pragma parameter HARNG " Substractive Sharpness Ringing -- HARNG" 0.4 0.0 4.0 0.10 -#define HARNG params.HARNG +#pragma parameter HARNG " NTSC Substractive Sharpness Ringing -- HARNG" 0.4 0.0 4.0 0.10 +#define HARNG params.HARNG -#pragma parameter spike " Scanline Spike Removal -- spike" 1.0 0.0 2.0 0.10 -#define spike params.spike +#pragma parameter NTSCspike " NTSC Scanline Spike Removal -- NTSCspike" 1.0 0.0 2.0 0.10 +#define spike params.NTSCspike #define COMPAT_TEXTURE(c,d) texture(c,d) @@ -132,12 +135,11 @@ void main() float wsum = 0.0; vec3 pixel; - float hsharpness = HSHARPNESS; vec3 cmax = 0.0.xxx; vec3 cmin = 1.0.xxx; - float sharp = gaussian(hsharpness) * S_SHARP; + float sharp = gaussian(HSHARPNESS) * S_SHARP; float maxsharp = 0.20; - float FPR = hsharpness; + float FPR = HSHARPNESS; float fpx = 0.0; float sp = 0.0; float sw = 0.0; diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/hsm-sgenpt-mix-pass2.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix-pass2.slang similarity index 100% rename from bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/hsm-sgenpt-mix-pass2.slang rename to bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix-pass2.slang diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/hsm-sgenpt-mix.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix.slang similarity index 100% rename from bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/hsm-sgenpt-mix.slang rename to bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix-old/hsm-sgenpt-mix.slang diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang new file mode 100644 index 0000000..25874f9 --- /dev/null +++ b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass1.slang @@ -0,0 +1,111 @@ +#version 450 + +/* + Sgenpt-Mix - pass1 + + 2011-2022 Hyllian - sergiogdb@gmail.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ + + +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 OriginalSize; + vec4 OutputSize; + uint FrameCount; + float SGPT_BLEND_OPTION; + float CB_BLEND_LEVEL; +} params; + +#pragma parameter HSM_SGENPT_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_SGENPT_TITLE "[ --- HYLLIAN SGENPT-MIX DE-DITHERING --- ]:" 0 0 0.01 0.01 + +#pragma parameter SGPT_BLEND_OPTION " Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0 0.0 3.0 1.0 +#define SGPT_BLEND_OPTION params.SGPT_BLEND_OPTION + +#pragma parameter CB_BLEND_LEVEL " Checkerboard Blend Level" 1.0 0.0 1.0 0.1 +#define CB_BLEND_LEVEL params.CB_BLEND_LEVEL + + +const vec3 Y = vec3( 0.299, 0.587, 0.114); + +vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));} +vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));} + +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; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + +void main() +{ + vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw; + vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw; + + // Reading the texels. + vec3 C = texture(Source, vTexCoord ).xyz; + vec3 L = texture(Source, vTexCoord -dx).xyz; + vec3 R = texture(Source, vTexCoord +dx).xyz; + vec3 U = texture(Source, vTexCoord -dy).xyz; + vec3 D = texture(Source, vTexCoord +dy).xyz; + vec3 UL = texture(Source, vTexCoord -dx -dy).xyz; + vec3 UR = texture(Source, vTexCoord +dx -dy).xyz; + vec3 DL = texture(Source, vTexCoord -dx +dy).xyz; + vec3 DR = texture(Source, vTexCoord +dx +dy).xyz; + + vec3 color = C; + + if (SGPT_BLEND_OPTION == 1 || SGPT_BLEND_OPTION == 3) + { + float diff = dot(max(C, max(L, R)) - min(C, min(L, R)), Y); + + diff *= (1.0 - CB_BLEND_LEVEL); + + vec3 min_sample = max(min_s(C, L, R), min_s(C, U, D)); + vec3 max_sample = min(max_s(C, L, R), max_s(C, U, D)); + + color = 0.5*( 1.0 + diff )*C + 0.125*( 1.0 - diff )*(L + R + U + D); + + color = clamp(color, min_sample, max_sample); + } + + float luma_diff = abs(dot(C, Y)-dot(color, Y)); + + FragColor = vec4(color, luma_diff); +} diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang new file mode 100644 index 0000000..9a50ddd --- /dev/null +++ b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass2.slang @@ -0,0 +1,141 @@ +#version 450 + +/* + Sgenpt-Mix - pass2 + + 2011-2022 Hyllian - sergiogdb@gmail.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ + + +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 OriginalSize; + vec4 OutputSize; + uint FrameCount; + float CB_BLEND_LEVEL; +} params; + +#pragma parameter CB_BLEND_LEVEL " Checkerboard Blend Level" 1.0 0.0 1.0 0.1 +#define CB_BLEND_LEVEL params.CB_BLEND_LEVEL + +#define PATTERN(A) step(Delta,A) + +const float Delta = 0.000000001; +const vec3 Y = vec3( 0.299, 0.587, 0.114); + +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; +} + +#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 LinearGamma; + +void main() +{ + vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw; + vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw; + + // Reading the texels. + vec4 C = texture(Source, vTexCoord ); + vec4 L = texture(Source, vTexCoord -dx ); + vec4 R = texture(Source, vTexCoord +dx ); + vec4 U = texture(Source, vTexCoord -dy); + vec4 D = texture(Source, vTexCoord +dy); + vec4 UL = texture(Source, vTexCoord -dx -dy); + vec4 UR = texture(Source, vTexCoord +dx -dy); + vec4 DL = texture(Source, vTexCoord -dx +dy); + vec4 DR = texture(Source, vTexCoord +dx +dy); + + vec4 L2 = texture(Source, vTexCoord -2.0*dx ); + vec4 R2 = texture(Source, vTexCoord +2.0*dx ); + vec4 U2 = texture(Source, vTexCoord -2.0*dy); + vec4 D2 = texture(Source, vTexCoord +2.0*dy); + + vec4 UL2 = texture(Source, vTexCoord -2.0*dx -dy); + vec4 UR2 = texture(Source, vTexCoord +2.0*dx -dy); + vec4 DL2 = texture(Source, vTexCoord -2.0*dx +dy); + vec4 DR2 = texture(Source, vTexCoord +2.0*dx +dy); + + vec4 LU2 = texture(Source, vTexCoord -dx -2.0*dy); + vec4 RU2 = texture(Source, vTexCoord +dx -2.0*dy); + vec4 LD2 = texture(Source, vTexCoord -dx +2.0*dy); + vec4 RD2 = texture(Source, vTexCoord +dx -2.0*dy); + + vec3 color = C.rgb; + + vec3 oriC = texture(LinearGamma, vTexCoord ).rgb; + vec3 oriL = texture(LinearGamma, vTexCoord -dx ).rgb; + vec3 oriR = texture(LinearGamma, vTexCoord +dx ).rgb; + vec3 oriU = texture(LinearGamma, vTexCoord -dy).rgb; + vec3 oriD = texture(LinearGamma, vTexCoord +dy).rgb; + + float count1 = 0.0; + float count2 = 0.0; + + float diff = (1.0 - CB_BLEND_LEVEL); + +// LU2 U2 RU2 +// UL2 UL U UR UR2 +// L2 L C R R2 +// DL2 DL D DR DR2 +// LD2 D2 RD2 + + count1 += PATTERN(L.a*D.a*R.a); + count1 += PATTERN(L.a*U.a*R.a); + count1 += PATTERN(L.a*UL.a*R.a*UR.a + L.a*DL.a*R.a*DR.a); + + count1 += PATTERN(U.a*D2.a*(UL.a*LD2.a + UR.a*RD2.a) + U2.a*D.a*(LU2.a*DL.a + RU2.a*DR.a)); + + count2 += PATTERN(U.a*L.a*D.a); + count2 += PATTERN(U.a*R.a*D.a); + count2 += PATTERN(U.a*UR.a*D.a*DR.a + D.a*DL.a*U.a*UL.a); + + count2 += PATTERN(L.a*R2.a*(DL.a*DR2.a + UL.a*UR2.a) + L2.a*R.a*(DL2.a*DR.a + UL2.a*UR.a)); + + if ((count1 * count2) > 0.0 && count1 == count2) + color = 0.5*(1.0+diff)*oriC + 0.125*(1.0-diff)*(oriL + oriR + oriU + oriD); + else if (count1 > 0.0 && count1 > count2) + color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriL + oriR); + else if (count2 > 0.0 && count2 > count1) + color = 0.5*(1.0+diff)*oriC + 0.25*(1.0-diff)*(oriU + oriD); + + float luma_diff = abs(dot(oriC, Y)-dot(color, Y)); + + FragColor = vec4(color, luma_diff); +} diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang new file mode 100644 index 0000000..f79c523 --- /dev/null +++ b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass3.slang @@ -0,0 +1,156 @@ +#version 450 + +/* + Sgenpt-Mix - pass3 + + 2011-2022 Hyllian - sergiogdb@gmail.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ + + +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 OriginalSize; + vec4 OutputSize; + uint FrameCount; + float CB_MITIG_NEIGHBRS; + float CB_MITIG_LINES; + float CB_ADJUST_VIEW; + // float UseGamma; +} params; + +#pragma parameter CB_MITIG_NEIGHBRS " Checkerboard - Mitigate Errors in Neighbors" 1.0 0.0 4.0 1.0 +#define CB_MITIG_NEIGHBRS params.CB_MITIG_NEIGHBRS + +#pragma parameter CB_MITIG_LINES " Checkerboard - Mitigate Errors in Regions" 1.0 0.0 1.0 1.0 +#define CB_MITIG_LINES params.CB_MITIG_LINES + +#pragma parameter CB_ADJUST_VIEW " Checkerboard - Show Debug View" 0.0 0.0 1.0 1.0 +#define CB_ADJUST_VIEW params.CB_ADJUST_VIEW + +// #pragma parameter UseGamma " Gamma Slider" 1.0 0.0 1.0 0.1 + + +// #define UseGamma params.UseGamma +// #define CBDOuputGamma (UseGamma+1.0) + +// #define GAMMA_OUT(color) pow(color, vec3(1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma)) + +#define PATTERN(A) step(Delta,A) + +const float Delta = 0.000000001; +const vec3 Y = vec3( 0.299, 0.587, 0.114); + +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; +} + +#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 LinearGamma; + +void main() +{ + vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw; + vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw; + + // Reading the texels. + vec4 C = texture(Source, vTexCoord ); + vec4 L = texture(Source, vTexCoord -dx ); + vec4 R = texture(Source, vTexCoord +dx ); + vec4 U = texture(Source, vTexCoord -dy); + vec4 D = texture(Source, vTexCoord +dy); + vec4 UL = texture(Source, vTexCoord -dx -dy); + vec4 UR = texture(Source, vTexCoord +dx -dy); + vec4 DL = texture(Source, vTexCoord -dx +dy); + vec4 DR = texture(Source, vTexCoord +dx +dy); + + vec4 L2 = texture(Source, vTexCoord -2.0*dx ); + vec4 R2 = texture(Source, vTexCoord +2.0*dx ); + vec4 U2 = texture(Source, vTexCoord -2.0*dy); + vec4 D2 = texture(Source, vTexCoord +2.0*dy); + + vec4 L3 = texture(Source, vTexCoord -3.0*dx ); + vec4 R3 = texture(Source, vTexCoord +3.0*dx ); + vec4 U3 = texture(Source, vTexCoord -3.0*dy); + vec4 D3 = texture(Source, vTexCoord +3.0*dy); + + vec3 color = C.rgb; + + vec3 oriC = texture(LinearGamma, vTexCoord ).rgb; + + float count = 0.0; + float count2 = 0.0; + float count3 = 0.0; + +// U3 +// U2 +// UL U UR +// L3 L2 L C R R2 R3 +// DL D DR +// D2 +// D3 + + count += PATTERN(L.a); + count += PATTERN(R.a); + count += PATTERN(U.a); + count += PATTERN(D.a); + count += PATTERN(UL.a*UR.a*DL.a*DR.a); + + count2 += PATTERN(L.a*UL.a*U.a + U.a*UR.a*R.a + R.a*DR.a*D.a + D.a*DL.a*L.a); + + count3 += PATTERN(L3.a*L2.a*L.a); + count3 += PATTERN(L2.a*L.a*R.a); + count3 += PATTERN(L.a*R.a*R2.a); + count3 += PATTERN(R.a*R2.a*R3.a); + + count3 += PATTERN(U3.a*U2.a*U.a); + count3 += PATTERN(U2.a*U.a*D.a); + count3 += PATTERN(U.a*D.a*D2.a); + count3 += PATTERN(D.a*D2.a*D3.a); + + if ((count < CB_MITIG_NEIGHBRS) && (count2 < 1.0)) + color = oriC; + else if ((CB_MITIG_LINES == 1.0) && (count3 < 1.0)) + color = oriC; + + float luma_diff = abs(dot(oriC, Y)-dot(color, Y)); + + color = mix(color, vec3(luma_diff), CB_ADJUST_VIEW); + + FragColor = vec4(color, 1.0); +} diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang new file mode 100644 index 0000000..2c50afd --- /dev/null +++ b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass4.slang @@ -0,0 +1,108 @@ +#version 450 + +/* + Sgenpt-Mix - pass4 + + 2011-2022 Hyllian - sergiogdb@gmail.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ + + +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 OriginalSize; + vec4 OutputSize; + uint FrameCount; + float SGPT_BLEND_OPTION; + float VL_BLEND_LEVEL; +} params; + +#pragma parameter SGPT_BLEND_OPTION " Mode: OFF | CHECKERBOARD | VERTICAL LINES | BOTH" 0.0 0.0 3.0 1.0 +#define SGPT_BLEND_OPTION params.SGPT_BLEND_OPTION + +#pragma parameter VL_BLEND_LEVEL " Vertical Lines Blend Level" 0.8 0.0 1.0 0.1 +#define VL_BLEND_LEVEL params.VL_BLEND_LEVEL + + +const vec3 Y = vec3( 0.299, 0.587, 0.114); + +vec3 min_s(vec3 central, vec3 adj1, vec3 adj2) {return min(central, max(adj1, adj2));} +vec3 max_s(vec3 central, vec3 adj1, vec3 adj2) {return max(central, min(adj1, adj2));} + +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; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + +void main() +{ + vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw; + vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw; + + // Reading the texels. + vec3 C = texture(Source, vTexCoord ).xyz; + vec3 L = texture(Source, vTexCoord -dx).xyz; + vec3 R = texture(Source, vTexCoord +dx).xyz; + vec3 U = texture(Source, vTexCoord -dy).xyz; + vec3 D = texture(Source, vTexCoord +dy).xyz; + vec3 UL = texture(Source, vTexCoord -dx -dy).xyz; + vec3 UR = texture(Source, vTexCoord +dx -dy).xyz; + vec3 DL = texture(Source, vTexCoord -dx +dy).xyz; + vec3 DR = texture(Source, vTexCoord +dx +dy).xyz; + + vec3 color = C; + + if (SGPT_BLEND_OPTION == 2 || SGPT_BLEND_OPTION == 3) + { + float diff = dot(max(C, max(L, R)) - min(C, min(L, R)), Y); + + diff *= (1.0 - VL_BLEND_LEVEL); + + vec3 min_sample = max_s(min_s(C, L, R), min_s(C, DL, DR), min_s(C, UL, UR)); + vec3 max_sample = min_s(max_s(C, L, R), max_s(C, DL, DR), max_s(C, UL, UR)); + + color = 0.5*( 1.0 + diff )*C + 0.25*( 1.0 - diff )*(L + R); + + color = clamp(color, min_sample, max_sample); + } + + float luma_diff = abs(dot(C, Y)-dot(color, Y)); + + FragColor = vec4(color, luma_diff); +} diff --git a/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang new file mode 100644 index 0000000..89823fe --- /dev/null +++ b/bezel/Mega_Bezel/shaders/hyllian/sgenpt-mix/sgenpt-mix-pass5.slang @@ -0,0 +1,160 @@ +#version 450 + +/* + Sgenpt-Mix - pass5 + + 2011-2022 Hyllian - sergiogdb@gmail.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +*/ + + +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 OriginalSize; + vec4 OutputSize; + uint FrameCount; + float VL_MITIG_NEIGHBRS; + float VL_MITIG_LINES; + float VL_ADJUST_VIEW; + float UseGamma; +} params; + +#pragma parameter VL_MITIG_NEIGHBRS " Vertical Lines - Mitigate Errors in Neighbors" 1.0 0.0 4.0 1.0 +#define VL_MITIG_NEIGHBRS params.VL_MITIG_NEIGHBRS + +#pragma parameter VL_MITIG_LINES " Vertical Lines - Mitigate Errors in Regions" 1.0 0.0 1.0 1.0 +#define VL_MITIG_LINES params.VL_MITIG_LINES + +#pragma parameter VL_ADJUST_VIEW " Vertical Lines - Debug View" 0.0 0.0 1.0 1.0 +#define VL_ADJUST_VIEW params.VL_ADJUST_VIEW + +// HSM removed + +// #pragma parameter UseGamma " Gamma Slider" 1.0 0.0 1.0 0.1 +// #define UseGamma params.UseGamma + +// #define CBDOuputGamma (UseGamma+1.0) + +// #define GAMMA_OUT(color) pow(color, vec3(1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma, 1.0 / CBDOuputGamma)) + +#define PATTERN(A) step(Delta,A) + +const float Delta = 0.000000001; +const vec3 Y = vec3( 0.299, 0.587, 0.114); + +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; +} + +#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 CB_Output; + +void main() +{ + vec2 dx = vec2(1.0, 0.0)*params.SourceSize.zw; + vec2 dy = vec2(0.0, 1.0)*params.SourceSize.zw; + + // Reading the texels. + vec4 C = texture(Source, vTexCoord ); + vec4 L = texture(Source, vTexCoord -dx ); + vec4 R = texture(Source, vTexCoord +dx ); + vec4 U = texture(Source, vTexCoord -dy); + vec4 D = texture(Source, vTexCoord +dy); + vec4 UL = texture(Source, vTexCoord -dx -dy); + vec4 UR = texture(Source, vTexCoord +dx -dy); + vec4 DL = texture(Source, vTexCoord -dx +dy); + vec4 DR = texture(Source, vTexCoord +dx +dy); + + vec4 L2 = texture(Source, vTexCoord -2.0*dx ); + vec4 R2 = texture(Source, vTexCoord +2.0*dx ); + vec4 U2 = texture(Source, vTexCoord -2.0*dy); + vec4 D2 = texture(Source, vTexCoord +2.0*dy); + + vec4 L3 = texture(Source, vTexCoord -3.0*dx ); + vec4 R3 = texture(Source, vTexCoord +3.0*dx ); + vec4 U3 = texture(Source, vTexCoord -3.0*dy); + vec4 D3 = texture(Source, vTexCoord +3.0*dy); + + vec3 color = C.rgb; + + vec3 oriC = texture(CB_Output, vTexCoord ).rgb; + + float count = 0.0; + float count2 = 0.0; + float count3 = 0.0; + float count4 = 0.0; + +// U3 +// U2 +// UL U UR +// L3 L2 L C R R2 R3 +// DL D DR +// D2 +// D3 + + count += PATTERN(L.a); + count += PATTERN(R.a); + count += PATTERN(U.a); + count += PATTERN(D.a); + + count += PATTERN(UL.a*UR.a*DL.a*DR.a); + + count2 += PATTERN(L.a*UL.a*U.a + U.a*UR.a*R.a + R.a*DR.a*D.a + D.a*DL.a*L.a); + + count3 += PATTERN(L3.a*L2.a*L.a); + count3 += PATTERN(L2.a*L.a*R.a); + count3 += PATTERN(L.a*R.a*R2.a); + count3 += PATTERN(R.a*R2.a*R3.a); + + count4 += PATTERN(U.a); + count4 += PATTERN(D.a); + + if ((count < VL_MITIG_NEIGHBRS) && (count2 < 1.0)) + color = oriC; + else if ((VL_MITIG_LINES == 1.0) && ((count3*count4) < 1.0)) + color = oriC; + + float luma_diff = abs(dot(oriC, Y)-dot(color, Y)); + + color = mix(color, vec3(luma_diff), VL_ADJUST_VIEW); + + // HSM removed + // FragColor = vec4(GAMMA_OUT(color), 1.0); + + FragColor = vec4(color, 1.0); +} diff --git a/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang b/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang index 0a0b618..9f41486 100644 --- a/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang +++ b/bezel/Mega_Bezel/shaders/ps1dither/hsm-PS1-Undither-BoxBlur.slang @@ -6,6 +6,7 @@ layout(push_constant) uniform Push vec4 OriginalSize; vec4 OutputSize; float PS1_BOX_BLUR_MODE; + float PS1_BOX_BLUR_BLEND; uint FrameCount; } params; @@ -16,9 +17,13 @@ layout(std140, set = 0, binding = 0) uniform UBO #pragma parameter HSM_BOXBLUR_EMPTY_LINE " " 0 0 0.001 0.001 #pragma parameter PS1_BOXBLUR_TITLE "[ --- PS1 BOX BLUR --- ]:" 0 0 0.01 0.01 + #pragma parameter PS1_BOX_BLUR_MODE " Box Blur ON" 0.0 0.0 1.0 1.0 #define PS1_BOX_BLUR_MODE params.PS1_BOX_BLUR_MODE +#pragma parameter PS1_BOX_BLUR_BLEND " Blend Amount" 100 0.0 100 10.0 +#define PS1_BOX_BLUR_BLEND params.PS1_BOX_BLUR_BLEND / 100 + #pragma stage vertex layout(location = 0) in vec4 Position; layout(location = 1) in vec2 TexCoord; @@ -71,9 +76,11 @@ void main() //If SquarePass has a detected edge, use HorizoPass vec3 Result = mix(HorizoPass,SquarePass,SquareEdgeMask); + //If HorizoPass has a detected edge, use OriginPass Result = mix(OriginPass,Result,HorizoEdgeMask); - //It's complete - FragColor = vec4(Result,1.0); + // It's complete + // Blend with Original + FragColor = vec4(mix(OriginPass, Result, PS1_BOX_BLUR_BLEND), 1); } \ No newline at end of file diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang index c76610b..04fe898 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass0.slang @@ -40,21 +40,13 @@ THE SOFTWARE. */ - -layout(push_constant) uniform Push -{ - vec4 SourceSize; - float HSM_SCALEFX_ON; - // float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; -} params; +#include "hsm-scalefx.inc" layout(set = 0, binding = 0, std140) uniform UBO { mat4 MVP; } global; -#include "hsm-scalefx.inc" - #pragma stage vertex layout(location = 0) in vec4 Position; layout(location = 1) in vec2 TexCoord; diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang index 5728575..e723cba 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass1.slang @@ -40,30 +40,19 @@ THE SOFTWARE. */ - -layout(push_constant) uniform Push -{ - vec4 SourceSize; - float SFX_CLR; - float SFX_SAA; - float HSM_SCALEFX_ON; - // float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; -} params; - +#include "hsm-scalefx.inc" // #pragma parameter SFX_CLR "ScaleFX Threshold" 0.50 0.01 1.00 0.01 -#define SFX_CLR 0.5 +// #define SFX_CLR 0.5 // #pragma parameter SFX_SAA "ScaleFX Filter AA" 1.00 0.00 1.00 1.00 -#define SFX_SAA 1 +// #define SFX_SAA 1 layout(set = 0, binding = 0, std140) uniform UBO { mat4 MVP; } global; -#include "hsm-scalefx.inc" - #pragma stage vertex layout(location = 0) in vec4 Position; layout(location = 1) in vec2 TexCoord; diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang index 593cf8b..ac77429 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass2.slang @@ -40,22 +40,13 @@ THE SOFTWARE. */ - -layout(push_constant) uniform Push -{ - vec4 SourceSize; - vec4 scalefx_pass0Size; - float HSM_SCALEFX_ON; - float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; -} params; +#include "hsm-scalefx.inc" layout(set = 0, binding = 0, std140) uniform UBO { mat4 MVP; } global; -#include "hsm-scalefx.inc" - #pragma stage vertex layout(location = 0) in vec4 Position; layout(location = 1) in vec2 TexCoord; diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang index e518115..d015ec4 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass3.slang @@ -42,26 +42,13 @@ THE SOFTWARE. */ -layout(push_constant) uniform Push -{ - vec4 SourceSize; - float SFX_SCN; - float HSM_SCALEFX_ON; - // float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; -} params; - #include "hsm-scalefx.inc" -// #pragma parameter SFX_SCN "ScaleFX Filter Corners" 1.0 0.0 1.0 1.0 -#define SFX_SCN 1 - - layout(set = 0, binding = 0, std140) uniform UBO { mat4 MVP; } global; - #pragma stage vertex layout(location = 0) in vec4 Position; layout(location = 1) in vec2 TexCoord; diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang index e4aaabb..d58a904 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4-hybrid.slang @@ -40,16 +40,6 @@ THE SOFTWARE. */ - -layout(push_constant) uniform Push -{ - vec4 SourceSize; - vec4 refpassSize; - float SFX_RAA; - float HSM_SCALEFX_ON; - // float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; -} params; - #include "hsm-scalefx.inc" // #pragma parameter SFX_RAA "ScaleFX rAA Sharpness" 2.0 0.0 10.0 0.05 diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang index 1617930..3bb9e1f 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx-pass4.slang @@ -40,22 +40,13 @@ THE SOFTWARE. */ - -layout(push_constant) uniform Push -{ - vec4 SourceSize; - float HSM_SCALEFX_ON; - // float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; -} params; - +#include "hsm-scalefx.inc" layout(set = 0, binding = 0, std140) uniform UBO { mat4 MVP; } global; -#include "hsm-scalefx.inc" - #pragma stage vertex layout(location = 0) in vec4 Position; layout(location = 1) in vec2 TexCoord; diff --git a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc index 30aaa75..b3b0523 100644 --- a/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc +++ b/bezel/Mega_Bezel/shaders/scalefx/hsm-scalefx.inc @@ -1,10 +1,32 @@ +layout(push_constant) uniform Push +{ + vec4 SourceSize; + vec4 scalefx_pass0Size; + float HSM_SCALEFX_ON; + float SFX_CLR; + float SFX_SAA; + float SFX_SCN; + float SFX_RAA; + // float HSM_SCALEFX_SOURCE_RES_DIVISION_FACTOR; +} params; + +#pragma parameter HSM_SCALEFX_EMPTY_LINE " " 0 0 0.001 0.001 +#pragma parameter HSM_SCALEFX_TITLE "[ --- SMOOTHING - SCALEFX ---- ]:" 0 0 0.01 0.01 + +#pragma parameter HSM_SCALEFX_ON " ScaleFx ON - Must Increase Core Res Sampling" 0 0 1 1 +#define HSM_SCALEFX_ON params.HSM_SCALEFX_ON + +#pragma parameter SFX_CLR " ScaleFX Threshold" 0.43 0.01 1.00 0.01 +#define SFX_CLR params.SFX_CLR + +#pragma parameter SFX_SAA " ScaleFX Filter AA" 1.00 0.00 1.00 1.00 +#define SFX_SAA params.SFX_SAA + +#pragma parameter SFX_SCN " ScaleFX Filter Corners" 0 0.0 1.0 1.0 +#define SFX_SCN params.SFX_SCN + vec4 HSM_TextureOffset(in sampler2D in_sampler, vec2 in_coord, vec2 pixel_offset, vec2 texture_size) { vec2 uv_offset = pixel_offset / params.SourceSize.xy; return texture(in_sampler, in_coord + uv_offset); } - -#pragma parameter HSM_SCALEFX_EMPTY_LINE " " 0 0 0.001 0.001 -#pragma parameter HSM_SCALEFX_TITLE "[ --- SMOOTHING - SCALEFX ---- ]:" 0 0 0.01 0.01 -#pragma parameter HSM_SCALEFX_ON " ScaleFx ON - Must Increase Core Res Sampling" 0 0 1 1 -#define HSM_SCALEFX_ON params.HSM_SCALEFX_ON \ No newline at end of file