From 8f9aa4e8a0b7a42d7774b05fb0fd9ea362eab4d9 Mon Sep 17 00:00:00 2001 From: fishcu Date: Mon, 7 Aug 2023 19:28:07 +0200 Subject: [PATCH] Fix broken file paths (#468) * Remove non standard characters; Remove unused test file * Fix missing includes in shaders * Fix some presets * Fix copy of crt-super-xbr.slangp in MegaBezel * Fix copy of FBNEO-Vertical__STD.slangp in MegaBezel * Revert "Remove non standard characters; Remove unused test file" This reverts commit 62d3cc1c5a4e3b0ead9d0f732631be80685521cd. --- .../MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp | 2 +- .../MBZ__1__ADV-SUPER-XBR__GDV.slangp | 2 +- ...Z__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp | 2 +- .../MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp | 2 +- ..._ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp | 2 +- ...Z__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp | 2 +- ...ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp | 2 +- ...__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp | 2 +- ...Z__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp | 2 +- .../MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp | 2 +- .../MBZ__3__STD-SUPER-XBR__GDV.slangp | 2 +- ..._STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp | 2 +- ...Z__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp | 2 +- ...STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp | 2 +- ...__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp | 2 +- .../MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp | 2 +- .../MBZ__5__POTATO-SUPER-XBR__GDV.slangp | 2 +- .../Variations/FBNEO-Vertical__STD.slangp | 4 ++-- .../shaders/base/phosphor-persistence.slang | 4 ++-- ...m-crt-easymode-halation-basic-border.slang | 4 ++-- .../crt-super-xbr/crt-super-xbr.slangp | 22 +++++++++---------- .../lcd-cgwg/hsm-lcd-grid-v2-potato.slang | 2 +- scalefx/scalefx+rAA.slangp | 2 +- scalenx/epx.slangp | 2 +- scalenx/mmpx.slangp | 2 +- scalenx/scale2x.slangp | 2 +- scalenx/scale2xSFX.slangp | 2 +- scalenx/scale2xplus.slangp | 2 +- scalenx/scale3x.slangp | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp index a9f7a1f..eaeb222 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV-NTSC.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp index 175f3a8..4ca606b 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__1__ADV-SUPER-XBR__GDV.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp index 3a59fc6..6d81b67 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV-NTSC.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp index 176f731..0c11560 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-GLASS-SUPER-XBR__GDV.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp index 1e271f4..87f8d32 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp index 6c6be53..9e304d7 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-NO-REFLECT-SUPER-XBR__GDV.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp index 04df12d..733c1c6 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp index ff88abd..749150d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__2__ADV-SCREEN-ONLY-SUPER-XBR__GDV.slangp @@ -116,7 +116,7 @@ scale_x19 = "1.000000" scale_type_y19 = "source" scale_y19 = "1.000000" -shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader20 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear20 = "false" wrap_mode20 = "clamp_to_border" mipmap_input20 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp index aa4c6e4..8f0e10a 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV-NTSC.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp index b5d7bc2..d793f6e 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-GLASS-SUPER-XBR__GDV.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp index 6d02eff..aeb0f1d 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__3__STD-SUPER-XBR__GDV.slangp @@ -111,7 +111,7 @@ scale_x15 = "1.000000" scale_type_y15 = "source" scale_y15 = "1.000000" -shader16 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader16 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear16 = "false" wrap_mode16 = "clamp_to_border" mipmap_input16 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp index db123ec..047f357 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV-NTSC.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp index 648e735..8b79357 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-NO-REFLECT-SUPER-XBR__GDV.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp index 48e481a..15d8144 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV-NTSC.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp index f3cf010..0e2c905 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__4__STD-SCREEN-ONLY-SUPER-XBR__GDV.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp index 8074950..c2933ab 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV-NTSC.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp index f353e6f..aa4fb6e 100644 --- a/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp +++ b/bezel/Mega_Bezel/Presets/Base_CRT_Presets/Root_Presets/MBZ__5__POTATO-SUPER-XBR__GDV.slangp @@ -114,7 +114,7 @@ scale_x18 = "1.000000" scale_type_y18 = "source" scale_y18 = "1.000000" -shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-X.slang +shader19 = ../../../shaders/hyllian/crt-super-xbr/custom-bicubic-x.slang filter_linear19 = "false" wrap_mode19 = "clamp_to_border" mipmap_input19 = "false" diff --git a/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp b/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp index f426a5f..5998175 100644 --- a/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp +++ b/bezel/Mega_Bezel/Presets/Variations/FBNEO-Vertical__STD.slangp @@ -1,4 +1,4 @@ -#reference "../../../Base_CRT_Presets/MBZ__3__STD__GDV.slangp" +#reference "../Base_CRT_Presets/MBZ__3__STD__GDV.slangp" HSM_ROTATE_CORE_IMAGE = 1 -HSM_ASPECT_RATIO_MODE = 2 \ No newline at end of file +HSM_ASPECT_RATIO_MODE = 2 diff --git a/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang b/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang index ddd56ae..d64d240 100644 --- a/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang +++ b/bezel/Mega_Bezel/shaders/base/phosphor-persistence.slang @@ -25,7 +25,7 @@ */ #include "common/globals.inc" -#include "params-0-screen-scale.inc" +#include "common/params-0-screen-scale.inc" #include "common/common-functions.inc" //--------------------------------------------------------------------------------------------------- @@ -104,4 +104,4 @@ void main() // FragColor = mix(texture(previous_pass_feedback, vTexCoord), texture(Source, vTexCoord), 0.5); FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA); -} \ No newline at end of file +} diff --git a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang index efddcf3..8c5b513 100644 --- a/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang +++ b/bezel/Mega_Bezel/shaders/easymode/hsm-crt-easymode-halation-basic-border.slang @@ -1,5 +1,5 @@ #version 450 -#include "../base/common/globals-and-basic-params.inc" +#include "../base/common/globals-and-all-params.inc" #include "../base/common/common-functions.inc" -#include "hsm-crt-easymode-halation.inc" \ No newline at end of file +#include "hsm-crt-easymode-halation.inc" diff --git a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp index 20a8816..f51b1dd 100644 --- a/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp +++ b/bezel/Mega_Bezel/shaders/hyllian/crt-super-xbr/crt-super-xbr.slangp @@ -1,7 +1,7 @@ shaders = "11" -shader0 = "shaders/linearize.slang" +shader0 = "linearize.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" mipmap_input0 = "false" @@ -13,7 +13,7 @@ scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "shaders/super-xbr-pass0.slang" +shader1 = "super-xbr-pass0.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_border" mipmap_input1 = "false" @@ -25,7 +25,7 @@ scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "shaders/super-xbr-pass1.slang" +shader2 = "super-xbr-pass1.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_border" mipmap_input2 = "false" @@ -37,7 +37,7 @@ scale_x2 = "2.000000" scale_type_y2 = "source" scale_y2 = "2.000000" -shader3 = "shaders/super-xbr-pass2.slang" +shader3 = "super-xbr-pass2.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_border" mipmap_input3 = "false" @@ -49,7 +49,7 @@ scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "shaders/custom-bicubic-x.slang" +shader4 = "custom-bicubic-x.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_border" mipmap_input4 = "false" @@ -61,7 +61,7 @@ scale_x4 = "1.000000" scale_type_y4 = "source" scale_y4 = "1.000000" -shader5 = "shaders/custom-bicubic-y.slang" +shader5 = "custom-bicubic-y.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_border" mipmap_input5 = "false" @@ -73,7 +73,7 @@ scale_x5 = "1.000000" scale_type_y5 = "source" scale_y5 = "0.500000" -shader6 = "shaders/crt-hyllian-sinc-curvature.slang" +shader6 = "crt-hyllian-sinc-curvature.slang" filter_linear6 = "true" wrap_mode6 = "clamp_to_border" mipmap_input6 = "false" @@ -85,7 +85,7 @@ scale_x6 = "1.000000" scale_type_y6 = "viewport" scale_y6 = "1.000000" -shader7 = "shaders/threshold.slang" +shader7 = "threshold.slang" filter_linear7 = "false" wrap_mode7 = "clamp_to_border" mipmap_input7 = "false" @@ -97,7 +97,7 @@ scale_x7 = "1.000000" scale_type_y7 = "source" scale_y7 = "1.000000" -shader8 = "shaders/blur_horiz.slang" +shader8 = "blur_horiz.slang" filter_linear8 = "true" wrap_mode8 = "clamp_to_border" mipmap_input8 = "true" @@ -109,7 +109,7 @@ scale_x8 = "0.200000" scale_type_y8 = "source" scale_y8 = "0.200000" -shader9 = "shaders/blur_vert.slang" +shader9 = "blur_vert.slang" filter_linear9 = "true" wrap_mode9 = "clamp_to_border" mipmap_input9 = "false" @@ -117,7 +117,7 @@ alias9 = "" float_framebuffer9 = "false" srgb_framebuffer9 = "true" -shader10 = "shaders/custom-resolve.slang" +shader10 = "custom-resolve.slang" filter_linear10 = "true" wrap_mode10 = "clamp_to_border" mipmap_input10 = "false" diff --git a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang index 9111884..5755f0e 100644 --- a/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang +++ b/bezel/Mega_Bezel/shaders/lcd-cgwg/hsm-lcd-grid-v2-potato.slang @@ -2,4 +2,4 @@ #include "../base/common/globals-and-potato-params.inc" #include "../base/common/common-functions.inc" -#include "hsm-crt-guest-advanced.inc" \ No newline at end of file +#include "../guest/hsm-crt-guest-advanced.inc" diff --git a/scalefx/scalefx+rAA.slangp b/scalefx/scalefx+rAA.slangp index 488f265..d1fca32 100644 --- a/scalefx/scalefx+rAA.slangp +++ b/scalefx/scalefx+rAA.slangp @@ -42,6 +42,6 @@ filter_linear7 = false scale_type7 = source scale7 = 1.0 -shader8 = ../bicubic/bicubic.slang +shader8 = ../cubic/shaders/bicubic.slang filter_linear8 = false scale_type0 = viewport diff --git a/scalenx/epx.slangp b/scalenx/epx.slangp index 0d2e91f..c803ffe 100644 --- a/scalenx/epx.slangp +++ b/scalenx/epx.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../cubic/bicubic.slang +shader1 = ../cubic/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/mmpx.slangp b/scalenx/mmpx.slangp index a4325ae..cb7bb7d 100644 --- a/scalenx/mmpx.slangp +++ b/scalenx/mmpx.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../cubic/bicubic.slang +shader1 = ../cubic/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale2x.slangp b/scalenx/scale2x.slangp index f77d85e..f96eef0 100644 --- a/scalenx/scale2x.slangp +++ b/scalenx/scale2x.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/bicubic.slang +shader1 = ../cubic/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale2xSFX.slangp b/scalenx/scale2xSFX.slangp index b030736..3a7fffb 100644 --- a/scalenx/scale2xSFX.slangp +++ b/scalenx/scale2xSFX.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/bicubic.slang +shader1 = ../cubic/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale2xplus.slangp b/scalenx/scale2xplus.slangp index 0851ca5..7fe4db1 100644 --- a/scalenx/scale2xplus.slangp +++ b/scalenx/scale2xplus.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/bicubic.slang +shader1 = ../cubic/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale3x.slangp b/scalenx/scale3x.slangp index 149c4ab..09b35dd 100644 --- a/scalenx/scale3x.slangp +++ b/scalenx/scale3x.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 3.0 scale_y0 = 3.0 -shader1 = ../cubic/bicubic.slang +shader1 = ../cubic/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport