Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

big reorganization of handheld and presets #659

Merged
merged 4 commits into from
Dec 24, 2024
Merged

big reorganization of handheld and presets #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bbf6b1
big reorganization of handheld and presets
hunterk Dec 15, 2024
2e41344
replace edge-blended-240hz-bfi with blurbusters and lottes' crt-beam-…
hunterk Dec 24, 2024
41ac0fe
whoops, forgot to track the new shader
hunterk Dec 24, 2024
e761349
Merge branch 'libretro:master' into master
hunterk Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions handheld/SwitchOLED-color.slangp
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions handheld/bandlimit-pixel-gba-color.slangp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion handheld/NSO-gba-color.slangp → handheld/color-mod/NSO-gba-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
shaders = 1

shader0 = shaders/color/NSO-gba-color.slang
shader0 = ../shaders/color/NSO-gba-color.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
2 changes: 1 addition & 1 deletion handheld/NSO-gbc-color.slangp → handheld/color-mod/NSO-gbc-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
shaders = 1

shader0 = shaders/color/NSO-gbc-color.slang
shader0 = ../shaders/color/NSO-gbc-color.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
9 changes: 4 additions & 5 deletions handheld/gbc-color.slangp → handheld/color-mod/SwitchOLED-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
shaders = 2

shader0 = shaders/color/lut/GBC-LUT.slang
shader0 = ../../reshade/shaders/LUT/multiLUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = shaders/color/gbc-color.slang
shader1 = ../shaders/color/SwitchOLED-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = shaders/color/lut/gbc-grey1.png
SamplerLUT1 = ../../reshade/shaders/LUT/64.png
SamplerLUT1_linear = true
SamplerLUT2 = shaders/color/lut/gbc-grey2.png
SamplerLUT2 = ../shaders/color/lut/psp-grey1.png
SamplerLUT2_linear = true
LUT_selector_param = "2"
17 changes: 17 additions & 0 deletions handheld/color-mod/dslite-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
shaders = 2

shader0 = ../../reshade/shaders/LUT/multiLUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/dslite-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../../reshade/shaders/LUT/64.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/dslite-grey.png
SamplerLUT2_linear = true
17 changes: 17 additions & 0 deletions handheld/color-mod/gbMicro-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
shaders = 2

shader0 = ../shaders/color/lut/GBM-LUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/gbMicro-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../../reshade/shaders/LUT/64.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/gbamicro-grey.png
SamplerLUT2_linear = true
17 changes: 17 additions & 0 deletions handheld/color-mod/gba-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
shaders = 2

shader0 = ../shaders/color/lut/GBA-LUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/gba-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../shaders/color/lut/gba-grey1.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/gba-grey2.png
SamplerLUT2_linear = true
18 changes: 18 additions & 0 deletions handheld/color-mod/gbc-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
shaders = 2

shader0 = ../shaders/color/lut/GBC-LUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/gbc-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../shaders/color/lut/gbc-grey1.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/gbc-grey2.png
SamplerLUT2_linear = true
LUT_selector_param = "2"
2 changes: 1 addition & 1 deletion handheld/gbc-gambatte-color.slangp → handheld/color-mod/gbc-gambatte-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
shaders = 1

shader0 = shaders/color/gbc-gambatte-color.slang
shader0 = ../shaders/color/gbc-gambatte-color.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
17 changes: 17 additions & 0 deletions handheld/color-mod/nds-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
shaders = 2

shader0 = ../../reshade/shaders/LUT/multiLUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/nds-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../../reshade/shaders/LUT/64.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/nds-grey.png
SamplerLUT2_linear = true
2 changes: 1 addition & 1 deletion handheld/palm-color.slangp → handheld/color-mod/palm-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
shaders = 1

shader0 = shaders/color/palm-color.slang
shader0 = ../shaders/color/palm-color.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
17 changes: 17 additions & 0 deletions handheld/color-mod/psp-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
shaders = 2

shader0 = ../../reshade/shaders/LUT/multiLUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/psp-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../shaders/color/lut/psp-grey1.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/psp-grey2.png
SamplerLUT2_linear = true
17 changes: 17 additions & 0 deletions handheld/color-mod/sp101-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
shaders = 2

shader0 = ../../reshade/shaders/LUT/multiLUT.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../shaders/color/sp101-color.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

textures = SamplerLUT1;SamplerLUT2

SamplerLUT1 = ../../reshade/shaders/LUT/64.png
SamplerLUT1_linear = true
SamplerLUT2 = ../shaders/color/lut/sp101-grey.png
SamplerLUT2_linear = true
6 changes: 3 additions & 3 deletions handheld/vba-color.slangp → handheld/color-mod/vba-color.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
shaders = 2

shader0 = shaders/color/vba-color.slang
shader0 = ../shaders/color/vba-color.slang
filter_linear0 = false
scale_type0 = source
scale0 = 1.0
shader1 = ../misc/shaders/image-adjustment.slang
shader1 = ../../misc/shaders/image-adjustment.slang
filter_linear1 = false
scale_type1 = source
scale1 = 1.0

ia_luminance = 0.75
ia_bright_boost = 0.15
ia_bright_boost = 0.15
17 changes: 0 additions & 17 deletions handheld/dslite-color.slangp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions handheld/gbMicro-color.slangp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions handheld/gba-color.slangp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions handheld/nds-color.slangp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions handheld/psp-color.slangp
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions handheld/retro-v2-nds-color.slangp
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions handheld/retro-v3-nds-color.slangp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions handheld/sp101-color.slangp
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions presets/c64-monitor.slangp → presets/crt-plus-signal/c64-monitor.slangp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
shaders = 5

shader0 = ../stock.slang
shader0 = ../../stock.slang
scale_x0 = "640.0"
scale_type_x0 = absolute
alias0 = artifact_colors_refpass

shader1 = ../ntsc/shaders/artifact-colors/artifact-colors0.slang
shader1 = ../../ntsc/shaders/artifact-colors/artifact-colors0.slang
scale1 = 1.0
scale_type1 = source
filter_linear1 = false
alias1 = Pass1

shader2 = ../ntsc/shaders/artifact-colors/artifact-colors1.slang
shader2 = ../../ntsc/shaders/artifact-colors/artifact-colors1.slang
scale2 = 1.0
scale_type2 = source
filter_linear2 = false
alias2 = Pass2
float_framebuffer2 = true

shader3 = ../ntsc/shaders/artifact-colors/artifact-colors2.slang
shader3 = ../../ntsc/shaders/artifact-colors/artifact-colors2.slang
scale3 = 1.0
scale_type3 = source
filter_linear3 = false

shader4 = ../crt/shaders/crt-lottes.slang
shader4 = ../../crt/shaders/crt-lottes.slang
Loading