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.
This commit is contained in:
fishcu 2023-08-07 19:28:07 +02:00 committed by GitHub
parent 6f921ee481
commit 8f9aa4e8a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 42 additions and 42 deletions

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -116,7 +116,7 @@ scale_x19 = "1.000000"
scale_type_y19 = "source" scale_type_y19 = "source"
scale_y19 = "1.000000" 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" filter_linear20 = "false"
wrap_mode20 = "clamp_to_border" wrap_mode20 = "clamp_to_border"
mipmap_input20 = "false" mipmap_input20 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -111,7 +111,7 @@ scale_x15 = "1.000000"
scale_type_y15 = "source" scale_type_y15 = "source"
scale_y15 = "1.000000" 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" filter_linear16 = "false"
wrap_mode16 = "clamp_to_border" wrap_mode16 = "clamp_to_border"
mipmap_input16 = "false" mipmap_input16 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -114,7 +114,7 @@ scale_x18 = "1.000000"
scale_type_y18 = "source" scale_type_y18 = "source"
scale_y18 = "1.000000" 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" filter_linear19 = "false"
wrap_mode19 = "clamp_to_border" wrap_mode19 = "clamp_to_border"
mipmap_input19 = "false" mipmap_input19 = "false"

View file

@ -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_ROTATE_CORE_IMAGE = 1
HSM_ASPECT_RATIO_MODE = 2 HSM_ASPECT_RATIO_MODE = 2

View file

@ -25,7 +25,7 @@
*/ */
#include "common/globals.inc" #include "common/globals.inc"
#include "params-0-screen-scale.inc" #include "common/params-0-screen-scale.inc"
#include "common/common-functions.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 = mix(texture(previous_pass_feedback, vTexCoord), texture(Source, vTexCoord), 0.5);
FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA); FragColor = HSM_Delinearize(FragColor, DEFAULT_SRGB_GAMMA);
} }

View file

@ -1,5 +1,5 @@
#version 450 #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 "../base/common/common-functions.inc"
#include "hsm-crt-easymode-halation.inc" #include "hsm-crt-easymode-halation.inc"

View file

@ -1,7 +1,7 @@
shaders = "11" shaders = "11"
shader0 = "shaders/linearize.slang" shader0 = "linearize.slang"
filter_linear0 = "false" filter_linear0 = "false"
wrap_mode0 = "clamp_to_border" wrap_mode0 = "clamp_to_border"
mipmap_input0 = "false" mipmap_input0 = "false"
@ -13,7 +13,7 @@ scale_x0 = "1.000000"
scale_type_y0 = "source" scale_type_y0 = "source"
scale_y0 = "1.000000" scale_y0 = "1.000000"
shader1 = "shaders/super-xbr-pass0.slang" shader1 = "super-xbr-pass0.slang"
filter_linear1 = "false" filter_linear1 = "false"
wrap_mode1 = "clamp_to_border" wrap_mode1 = "clamp_to_border"
mipmap_input1 = "false" mipmap_input1 = "false"
@ -25,7 +25,7 @@ scale_x1 = "1.000000"
scale_type_y1 = "source" scale_type_y1 = "source"
scale_y1 = "1.000000" scale_y1 = "1.000000"
shader2 = "shaders/super-xbr-pass1.slang" shader2 = "super-xbr-pass1.slang"
filter_linear2 = "false" filter_linear2 = "false"
wrap_mode2 = "clamp_to_border" wrap_mode2 = "clamp_to_border"
mipmap_input2 = "false" mipmap_input2 = "false"
@ -37,7 +37,7 @@ scale_x2 = "2.000000"
scale_type_y2 = "source" scale_type_y2 = "source"
scale_y2 = "2.000000" scale_y2 = "2.000000"
shader3 = "shaders/super-xbr-pass2.slang" shader3 = "super-xbr-pass2.slang"
filter_linear3 = "false" filter_linear3 = "false"
wrap_mode3 = "clamp_to_border" wrap_mode3 = "clamp_to_border"
mipmap_input3 = "false" mipmap_input3 = "false"
@ -49,7 +49,7 @@ scale_x3 = "1.000000"
scale_type_y3 = "source" scale_type_y3 = "source"
scale_y3 = "1.000000" scale_y3 = "1.000000"
shader4 = "shaders/custom-bicubic-x.slang" shader4 = "custom-bicubic-x.slang"
filter_linear4 = "false" filter_linear4 = "false"
wrap_mode4 = "clamp_to_border" wrap_mode4 = "clamp_to_border"
mipmap_input4 = "false" mipmap_input4 = "false"
@ -61,7 +61,7 @@ scale_x4 = "1.000000"
scale_type_y4 = "source" scale_type_y4 = "source"
scale_y4 = "1.000000" scale_y4 = "1.000000"
shader5 = "shaders/custom-bicubic-y.slang" shader5 = "custom-bicubic-y.slang"
filter_linear5 = "false" filter_linear5 = "false"
wrap_mode5 = "clamp_to_border" wrap_mode5 = "clamp_to_border"
mipmap_input5 = "false" mipmap_input5 = "false"
@ -73,7 +73,7 @@ scale_x5 = "1.000000"
scale_type_y5 = "source" scale_type_y5 = "source"
scale_y5 = "0.500000" scale_y5 = "0.500000"
shader6 = "shaders/crt-hyllian-sinc-curvature.slang" shader6 = "crt-hyllian-sinc-curvature.slang"
filter_linear6 = "true" filter_linear6 = "true"
wrap_mode6 = "clamp_to_border" wrap_mode6 = "clamp_to_border"
mipmap_input6 = "false" mipmap_input6 = "false"
@ -85,7 +85,7 @@ scale_x6 = "1.000000"
scale_type_y6 = "viewport" scale_type_y6 = "viewport"
scale_y6 = "1.000000" scale_y6 = "1.000000"
shader7 = "shaders/threshold.slang" shader7 = "threshold.slang"
filter_linear7 = "false" filter_linear7 = "false"
wrap_mode7 = "clamp_to_border" wrap_mode7 = "clamp_to_border"
mipmap_input7 = "false" mipmap_input7 = "false"
@ -97,7 +97,7 @@ scale_x7 = "1.000000"
scale_type_y7 = "source" scale_type_y7 = "source"
scale_y7 = "1.000000" scale_y7 = "1.000000"
shader8 = "shaders/blur_horiz.slang" shader8 = "blur_horiz.slang"
filter_linear8 = "true" filter_linear8 = "true"
wrap_mode8 = "clamp_to_border" wrap_mode8 = "clamp_to_border"
mipmap_input8 = "true" mipmap_input8 = "true"
@ -109,7 +109,7 @@ scale_x8 = "0.200000"
scale_type_y8 = "source" scale_type_y8 = "source"
scale_y8 = "0.200000" scale_y8 = "0.200000"
shader9 = "shaders/blur_vert.slang" shader9 = "blur_vert.slang"
filter_linear9 = "true" filter_linear9 = "true"
wrap_mode9 = "clamp_to_border" wrap_mode9 = "clamp_to_border"
mipmap_input9 = "false" mipmap_input9 = "false"
@ -117,7 +117,7 @@ alias9 = ""
float_framebuffer9 = "false" float_framebuffer9 = "false"
srgb_framebuffer9 = "true" srgb_framebuffer9 = "true"
shader10 = "shaders/custom-resolve.slang" shader10 = "custom-resolve.slang"
filter_linear10 = "true" filter_linear10 = "true"
wrap_mode10 = "clamp_to_border" wrap_mode10 = "clamp_to_border"
mipmap_input10 = "false" mipmap_input10 = "false"

View file

@ -2,4 +2,4 @@
#include "../base/common/globals-and-potato-params.inc" #include "../base/common/globals-and-potato-params.inc"
#include "../base/common/common-functions.inc" #include "../base/common/common-functions.inc"
#include "hsm-crt-guest-advanced.inc" #include "../guest/hsm-crt-guest-advanced.inc"

View file

@ -42,6 +42,6 @@ filter_linear7 = false
scale_type7 = source scale_type7 = source
scale7 = 1.0 scale7 = 1.0
shader8 = ../bicubic/bicubic.slang shader8 = ../cubic/shaders/bicubic.slang
filter_linear8 = false filter_linear8 = false
scale_type0 = viewport scale_type0 = viewport

View file

@ -5,6 +5,6 @@ filter_linear0 = false
scale_type0 = source scale_type0 = source
scale0 = 2.0 scale0 = 2.0
shader1 = ../cubic/bicubic.slang shader1 = ../cubic/shaders/bicubic.slang
filter_linear1 = false filter_linear1 = false
scale_type1 = viewport scale_type1 = viewport

View file

@ -5,6 +5,6 @@ filter_linear0 = false
scale_type0 = source scale_type0 = source
scale0 = 2.0 scale0 = 2.0
shader1 = ../cubic/bicubic.slang shader1 = ../cubic/shaders/bicubic.slang
filter_linear1 = false filter_linear1 = false
scale_type1 = viewport scale_type1 = viewport

View file

@ -6,6 +6,6 @@ scale_type0 = source
scale_x0 = 2.0 scale_x0 = 2.0
scale_y0 = 2.0 scale_y0 = 2.0
shader1 = ../cubic/bicubic.slang shader1 = ../cubic/shaders/bicubic.slang
filter_linear1 = false filter_linear1 = false
scale_type1 = viewport scale_type1 = viewport

View file

@ -6,6 +6,6 @@ scale_type0 = source
scale_x0 = 2.0 scale_x0 = 2.0
scale_y0 = 2.0 scale_y0 = 2.0
shader1 = ../cubic/bicubic.slang shader1 = ../cubic/shaders/bicubic.slang
filter_linear1 = false filter_linear1 = false
scale_type1 = viewport scale_type1 = viewport

View file

@ -6,6 +6,6 @@ scale_type0 = source
scale_x0 = 2.0 scale_x0 = 2.0
scale_y0 = 2.0 scale_y0 = 2.0
shader1 = ../cubic/bicubic.slang shader1 = ../cubic/shaders/bicubic.slang
filter_linear1 = false filter_linear1 = false
scale_type1 = viewport scale_type1 = viewport

View file

@ -6,6 +6,6 @@ scale_type0 = source
scale_x0 = 3.0 scale_x0 = 3.0
scale_y0 = 3.0 scale_y0 = 3.0
shader1 = ../cubic/bicubic.slang shader1 = ../cubic/shaders/bicubic.slang
filter_linear1 = false filter_linear1 = false
scale_type1 = viewport scale_type1 = viewport