From b8f57be9c90187a648c4c190630050a142d00d42 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Tue, 3 May 2022 19:33:53 +0100 Subject: [PATCH 01/11] Make scaling a single parameter affair on handheld border shaders --- .../shader-files/gb-pass-5.slang | 22 ++++++++----------- .../shader-files/gb-pass0.slang | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang index ba3ae7f..247b949 100644 --- a/handheld/console-border/shader-files/gb-pass-5.slang +++ b/handheld/console-border/shader-files/gb-pass-5.slang @@ -4,14 +4,14 @@ layout(push_constant) uniform Push { vec4 OutputSize; vec4 SourceSize; - float SCALE; - float OUT_X; - float OUT_Y; + float video_scale; } params; -#pragma parameter SCALE "Box Scale" 0.6667 0.6667 1.5 0.33333 -#pragma parameter OUT_X "Out X" 1600.0 1600.0 4800.0 8000.0 -#pragma parameter OUT_Y "Out Y" 800.0 800.0 2400.0 400.0 +#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0 + +vec2 middle = vec2(0.5, 0.5); +vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; +vec2 border_scale = vec2(800, 400) * params.video_scale; layout(std140, set = 0, binding = 0) uniform UBO { @@ -27,14 +27,10 @@ layout(location = 1) out vec2 tex_border; void main() { gl_Position = global.MVP * Position; - vec2 scale = (params.OutputSize.xy * params.SourceSize.zw) / params.SCALE; - vec2 middle = vec2(0.5, 0.5); - vec2 diff = TexCoord.xy - middle; - vTexCoord = middle + diff * scale; - middle = vec2(0.5, 0.5); - vec2 dist = TexCoord - middle; - tex_border = middle + dist * params.OutputSize.xy / vec2(params.OUT_X, params.OUT_Y); + vec2 diff = TexCoord.xy - middle; + vTexCoord = middle + diff * screen_scale; + tex_border = middle + diff * params.OutputSize.xy / border_scale; } #pragma stage fragment diff --git a/handheld/console-border/shader-files/gb-pass0.slang b/handheld/console-border/shader-files/gb-pass0.slang index eaed2fe..f0bdaad 100644 --- a/handheld/console-border/shader-files/gb-pass0.slang +++ b/handheld/console-border/shader-files/gb-pass0.slang @@ -33,7 +33,7 @@ layout(std140, set = 0, binding = 0) uniform UBO #pragma parameter response_time "LCD Response Time" 0.20 0.0 0.777 0.111 // Set video scale when used in console-border shaders -#pragma parameter video_scale "Video Scale" 3.0 3.0 5.0 1.0 +#pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0 /////////////////////////////////////////////////////////////////////////// // // From 2a80829d45c05a61998c3cd702f909d2278d2557 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Tue, 3 May 2022 23:29:19 +0100 Subject: [PATCH 02/11] Modified presets for single video_scale parameter --- handheld/console-border/dmg-2x.slangp | 7 ++----- handheld/console-border/dmg-3x.slangp | 5 +---- handheld/console-border/dmg-4x.slangp | 5 +---- handheld/console-border/dmg-5x.slangp | 7 ++----- handheld/console-border/dmg-6x.slangp | 7 ++----- handheld/console-border/gb-dmg-alt-2x.slangp | 5 +---- handheld/console-border/gb-dmg-alt-3x.slangp | 5 +---- handheld/console-border/gb-dmg-alt-4x.slangp | 5 +---- handheld/console-border/gb-dmg-alt-5x.slangp | 5 +---- handheld/console-border/gb-dmg-alt-6x.slangp | 5 +---- handheld/console-border/gb-dmg-alt-7x.slangp | 5 +---- handheld/console-border/gb-light-alt-2x.slangp | 5 +---- handheld/console-border/gb-light-alt-3x.slangp | 5 +---- handheld/console-border/gb-light-alt-4x.slangp | 5 +---- handheld/console-border/gb-light-alt-5x.slangp | 5 +---- handheld/console-border/gb-light-alt-6x.slangp | 5 +---- handheld/console-border/gb-light-alt-7x.slangp | 5 +---- handheld/console-border/gb-pocket-2x.slangp | 7 ++----- handheld/console-border/gb-pocket-3x.slangp | 5 +---- handheld/console-border/gb-pocket-4x.slangp | 5 +---- handheld/console-border/gb-pocket-5x.slangp | 7 ++----- handheld/console-border/gb-pocket-6x.slangp | 7 ++----- handheld/console-border/gb-pocket-alt-2x.slangp | 5 +---- handheld/console-border/gb-pocket-alt-3x.slangp | 5 +---- handheld/console-border/gb-pocket-alt-4x.slangp | 5 +---- handheld/console-border/gb-pocket-alt-5x.slangp | 5 +---- handheld/console-border/gb-pocket-alt-6x.slangp | 5 +---- handheld/console-border/gb-pocket-alt-7x.slangp | 5 +---- handheld/console-border/gba-2x.slangp | 6 ++---- handheld/console-border/gba-3x.slangp | 6 ++---- handheld/console-border/gba-4x.slangp | 6 ++---- handheld/console-border/gba-5x.slangp | 6 ++---- handheld/console-border/gba-6x.slangp | 6 ++---- .../console-border/gba-agb001-color-motionblur-1x.slangp | 6 ++---- .../console-border/gba-agb001-color-motionblur-2x.slangp | 6 ++---- .../console-border/gba-agb001-color-motionblur-3x.slangp | 6 ++---- .../console-border/gba-ags001-color-motionblur-1x.slangp | 6 ++---- .../console-border/gba-ags001-color-motionblur-2x.slangp | 6 ++---- .../console-border/gba-ags001-color-motionblur-3x.slangp | 6 ++---- handheld/console-border/gba-lcd-grid-v2-2x.slangp | 6 ++---- handheld/console-border/gba-lcd-grid-v2-3x.slangp | 6 ++---- handheld/console-border/gba-lcd-grid-v2-4x.slangp | 6 ++---- handheld/console-border/gba-lcd-grid-v2-5x.slangp | 6 ++---- handheld/console-border/gba-lcd-grid-v2-6x.slangp | 6 ++---- handheld/console-border/gba-retro-v2-2x.slangp | 6 ++---- handheld/console-border/gba-retro-v2-3x.slangp | 6 ++---- handheld/console-border/gba-retro-v2-4x.slangp | 6 ++---- handheld/console-border/gba-retro-v2-5x.slangp | 6 ++---- handheld/console-border/gba-retro-v2-6x.slangp | 6 ++---- handheld/console-border/gbc-2x.slangp | 6 ++---- handheld/console-border/gbc-3x.slangp | 6 ++---- handheld/console-border/gbc-4x.slangp | 6 ++---- handheld/console-border/gbc-5x.slangp | 6 ++---- handheld/console-border/gbc-6x.slangp | 6 ++---- handheld/console-border/gbc-lcd-grid-v2-2x.slangp | 6 ++---- handheld/console-border/gbc-lcd-grid-v2-3x.slangp | 6 ++---- handheld/console-border/gbc-lcd-grid-v2-4x.slangp | 6 ++---- handheld/console-border/gbc-lcd-grid-v2-5x.slangp | 6 ++---- handheld/console-border/gbc-lcd-grid-v2-6x.slangp | 6 ++---- handheld/console-border/gbc-lcd-grid-v2-7x.slangp | 6 ++---- handheld/console-border/gbc-retro-v2-2x.slangp | 6 ++---- handheld/console-border/gbc-retro-v2-3x.slangp | 6 ++---- handheld/console-border/gbc-retro-v2-4x.slangp | 6 ++---- handheld/console-border/gbc-retro-v2-5x.slangp | 6 ++---- handheld/console-border/gbc-retro-v2-6x.slangp | 6 ++---- handheld/console-border/gbc-retro-v2-7x.slangp | 6 ++---- handheld/console-border/gg-2x.slangp | 6 ++---- handheld/console-border/gg-3x.slangp | 6 ++---- handheld/console-border/gg-4x.slangp | 6 ++---- handheld/console-border/gg-5x.slangp | 6 ++---- handheld/console-border/gg-6x.slangp | 6 ++---- handheld/console-border/psp-2x.slangp | 6 ++---- handheld/console-border/psp-3x.slangp | 6 ++---- handheld/console-border/psp-4x.slangp | 6 ++---- handheld/console-border/psp-5x.slangp | 6 ++---- handheld/console-border/psp-6x.slangp | 6 ++---- 76 files changed, 130 insertions(+), 310 deletions(-) diff --git a/handheld/console-border/dmg-2x.slangp b/handheld/console-border/dmg-2x.slangp index 2b2d781..477c17b 100644 --- a/handheld/console-border/dmg-2x.slangp +++ b/handheld/console-border/dmg-2x.slangp @@ -35,11 +35,8 @@ filter_linear5 = true scale_type5 = source scale5 = 1.0 -parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "3.0" -SCALE = "0.6667" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" +video_scale = "2.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-3x.slangp b/handheld/console-border/dmg-3x.slangp index 09f29b2..22593ce 100644 --- a/handheld/console-border/dmg-3x.slangp +++ b/handheld/console-border/dmg-3x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" +parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-4x.slangp b/handheld/console-border/dmg-4x.slangp index 7a62b12..a16c0d0 100644 --- a/handheld/console-border/dmg-4x.slangp +++ b/handheld/console-border/dmg-4x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" +parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-5x.slangp b/handheld/console-border/dmg-5x.slangp index 8fcdb3a..b943c88 100644 --- a/handheld/console-border/dmg-5x.slangp +++ b/handheld/console-border/dmg-5x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "4.0" -SCALE = "1.25" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" +video_scale = "5.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/dmg-6x.slangp b/handheld/console-border/dmg-6x.slangp index 15a7ea7..75473ee 100644 --- a/handheld/console-border/dmg-6x.slangp +++ b/handheld/console-border/dmg-6x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "4.0" -SCALE = "1.5" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" +video_scale = "6.0" textures = COLOR_PALETTE;BACKGROUND;BORDER COLOR_PALETTE = resources/dmg-palette.png diff --git a/handheld/console-border/gb-dmg-alt-2x.slangp b/handheld/console-border/gb-dmg-alt-2x.slangp index c51f515..fe2e2a6 100644 --- a/handheld/console-border/gb-dmg-alt-2x.slangp +++ b/handheld/console-border/gb-dmg-alt-2x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "2.0" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-3x.slangp b/handheld/console-border/gb-dmg-alt-3x.slangp index 2973a22..e12383a 100644 --- a/handheld/console-border/gb-dmg-alt-3x.slangp +++ b/handheld/console-border/gb-dmg-alt-3x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-4x.slangp b/handheld/console-border/gb-dmg-alt-4x.slangp index 4e95704..493ce4a 100644 --- a/handheld/console-border/gb-dmg-alt-4x.slangp +++ b/handheld/console-border/gb-dmg-alt-4x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-5x.slangp b/handheld/console-border/gb-dmg-alt-5x.slangp index 9b32357..d7710aa 100644 --- a/handheld/console-border/gb-dmg-alt-5x.slangp +++ b/handheld/console-border/gb-dmg-alt-5x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "5.0" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-6x.slangp b/handheld/console-border/gb-dmg-alt-6x.slangp index ddd527d..4d7d01d 100644 --- a/handheld/console-border/gb-dmg-alt-6x.slangp +++ b/handheld/console-border/gb-dmg-alt-6x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "6.0" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-7x.slangp b/handheld/console-border/gb-dmg-alt-7x.slangp index 10ab678..2d84c40 100644 --- a/handheld/console-border/gb-dmg-alt-7x.slangp +++ b/handheld/console-border/gb-dmg-alt-7x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/dmg-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "7.0" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-2x.slangp b/handheld/console-border/gb-light-alt-2x.slangp index 147c125..4cca8d1 100644 --- a/handheld/console-border/gb-light-alt-2x.slangp +++ b/handheld/console-border/gb-light-alt-2x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "2.0" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-light-alt-3x.slangp b/handheld/console-border/gb-light-alt-3x.slangp index 0fb6af5..e51ccf8 100644 --- a/handheld/console-border/gb-light-alt-3x.slangp +++ b/handheld/console-border/gb-light-alt-3x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-light-alt-4x.slangp b/handheld/console-border/gb-light-alt-4x.slangp index 38bdaf1..cbc058f 100644 --- a/handheld/console-border/gb-light-alt-4x.slangp +++ b/handheld/console-border/gb-light-alt-4x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-light-alt-5x.slangp b/handheld/console-border/gb-light-alt-5x.slangp index cd70e4c..b59999d 100644 --- a/handheld/console-border/gb-light-alt-5x.slangp +++ b/handheld/console-border/gb-light-alt-5x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "5.0" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-light-alt-6x.slangp b/handheld/console-border/gb-light-alt-6x.slangp index 652ff23..ce1e2d1 100644 --- a/handheld/console-border/gb-light-alt-6x.slangp +++ b/handheld/console-border/gb-light-alt-6x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "6.0" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-light-alt-7x.slangp b/handheld/console-border/gb-light-alt-7x.slangp index 101c292..9411891 100644 --- a/handheld/console-border/gb-light-alt-7x.slangp +++ b/handheld/console-border/gb-light-alt-7x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;screen_light;grey_balance;response_time;blending_mode" +parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" video_scale = "7.0" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" screen_light = "1.4" grey_balance = 3.0 response_time = 0.444 diff --git a/handheld/console-border/gb-pocket-2x.slangp b/handheld/console-border/gb-pocket-2x.slangp index be08147..62adac7 100644 --- a/handheld/console-border/gb-pocket-2x.slangp +++ b/handheld/console-border/gb-pocket-2x.slangp @@ -35,11 +35,8 @@ filter_linear5 = true scale_type5 = source scale5 = 1.0 -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "3.0" -SCALE = "0.6667" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" +video_scale = "2.0" baseline_alpha = "0.03" grey_balance = "3.5" adjacent_texel_alpha_blending = "0.6" diff --git a/handheld/console-border/gb-pocket-3x.slangp b/handheld/console-border/gb-pocket-3x.slangp index f31a731..98a1edb 100644 --- a/handheld/console-border/gb-pocket-3x.slangp +++ b/handheld/console-border/gb-pocket-3x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" +parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" baseline_alpha = "0.03" grey_balance = "3.5" adjacent_texel_alpha_blending = "0.6" diff --git a/handheld/console-border/gb-pocket-4x.slangp b/handheld/console-border/gb-pocket-4x.slangp index b4be1bd..453e709 100644 --- a/handheld/console-border/gb-pocket-4x.slangp +++ b/handheld/console-border/gb-pocket-4x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" +parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" baseline_alpha = "0.03" grey_balance = "3.5" adjacent_texel_alpha_blending = "0.6" diff --git a/handheld/console-border/gb-pocket-5x.slangp b/handheld/console-border/gb-pocket-5x.slangp index e1904c3..0dd580d 100644 --- a/handheld/console-border/gb-pocket-5x.slangp +++ b/handheld/console-border/gb-pocket-5x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "4.0" -SCALE = "1.25" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" +video_scale = "5.0" baseline_alpha = "0.03" grey_balance = "3.5" adjacent_texel_alpha_blending = "0.6" diff --git a/handheld/console-border/gb-pocket-6x.slangp b/handheld/console-border/gb-pocket-6x.slangp index a6e5863..e80f387 100644 --- a/handheld/console-border/gb-pocket-6x.slangp +++ b/handheld/console-border/gb-pocket-6x.slangp @@ -33,11 +33,8 @@ alias4 = "PASS4" shader5 = shader-files/gb-pass-5.slang filter_linear5 = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "4.0" -SCALE = "1.5" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" +video_scale = "6.0" baseline_alpha = "0.03" grey_balance = "3.5" adjacent_texel_alpha_blending = "0.6" diff --git a/handheld/console-border/gb-pocket-alt-2x.slangp b/handheld/console-border/gb-pocket-alt-2x.slangp index b0b1974..18bb02c 100644 --- a/handheld/console-border/gb-pocket-alt-2x.slangp +++ b/handheld/console-border/gb-pocket-alt-2x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "2.0" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-3x.slangp b/handheld/console-border/gb-pocket-alt-3x.slangp index ad1768a..70f0d9b 100644 --- a/handheld/console-border/gb-pocket-alt-3x.slangp +++ b/handheld/console-border/gb-pocket-alt-3x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "3.0" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-4x.slangp b/handheld/console-border/gb-pocket-alt-4x.slangp index dcb440e..19624c9 100644 --- a/handheld/console-border/gb-pocket-alt-4x.slangp +++ b/handheld/console-border/gb-pocket-alt-4x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "4.0" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-5x.slangp b/handheld/console-border/gb-pocket-alt-5x.slangp index 19f62a8..af5c475 100644 --- a/handheld/console-border/gb-pocket-alt-5x.slangp +++ b/handheld/console-border/gb-pocket-alt-5x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "5.0" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-6x.slangp b/handheld/console-border/gb-pocket-alt-6x.slangp index 41fe929..4026f49 100644 --- a/handheld/console-border/gb-pocket-alt-6x.slangp +++ b/handheld/console-border/gb-pocket-alt-6x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "6.0" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-7x.slangp b/handheld/console-border/gb-pocket-alt-7x.slangp index 58aaf3d..2c31d5f 100644 --- a/handheld/console-border/gb-pocket-alt-7x.slangp +++ b/handheld/console-border/gb-pocket-alt-7x.slangp @@ -39,11 +39,8 @@ BACKGROUND_linear = true BORDER = resources/pocket-border-square-4x.png BORDER_linear = true -parameters = "video_scale;SCALE;OUT_X;OUT_Y;grey_balance;response_time;blending_mode" +parameters = "video_scale;grey_balance;response_time;blending_mode" video_scale = "7.0" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" grey_balance = 3.0 response_time = 0.444 blending_mode = 0.0 diff --git a/handheld/console-border/gba-2x.slangp b/handheld/console-border/gba-2x.slangp index 7d2ec1e..8033b9c 100644 --- a/handheld/console-border/gba-2x.slangp +++ b/handheld/console-border/gba-2x.slangp @@ -20,11 +20,9 @@ shader3 = "shader-files/gb-pass-5.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" +parameters = "video_scale;GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" +video_scale = "2.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gba-3x.slangp b/handheld/console-border/gba-3x.slangp index ce17c15..b813ffb 100644 --- a/handheld/console-border/gba-3x.slangp +++ b/handheld/console-border/gba-3x.slangp @@ -20,11 +20,9 @@ shader3 = "shader-files/gb-pass-5.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" +parameters = "video_scale;GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +video_scale = "3.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gba-4x.slangp b/handheld/console-border/gba-4x.slangp index 22eaf2a..7e0564c 100644 --- a/handheld/console-border/gba-4x.slangp +++ b/handheld/console-border/gba-4x.slangp @@ -20,11 +20,9 @@ shader3 = "shader-files/gb-pass-5.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" +parameters = "video_scale;GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +video_scale = "4.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gba-5x.slangp b/handheld/console-border/gba-5x.slangp index 2e2e04e..149ee1d 100644 --- a/handheld/console-border/gba-5x.slangp +++ b/handheld/console-border/gba-5x.slangp @@ -20,11 +20,9 @@ shader3 = "shader-files/gb-pass-5.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" +parameters = "video_scale;GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -SCALE = "1.25" -OUT_X = "5000.0" -OUT_Y = "2500.0" +video_scale = "5.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gba-6x.slangp b/handheld/console-border/gba-6x.slangp index 3892063..3d7e1c8 100644 --- a/handheld/console-border/gba-6x.slangp +++ b/handheld/console-border/gba-6x.slangp @@ -20,11 +20,9 @@ shader3 = "shader-files/gb-pass-5.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH;mixfactor" +parameters = "video_scale;GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -SCALE = "1.5" -OUT_X = "7200.0" -OUT_Y = "3600.0" +video_scale = "6.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gba-agb001-color-motionblur-1x.slangp b/handheld/console-border/gba-agb001-color-motionblur-1x.slangp index 10d1154..14b14e3 100644 --- a/handheld/console-border/gba-agb001-color-motionblur-1x.slangp +++ b/handheld/console-border/gba-agb001-color-motionblur-1x.slangp @@ -23,7 +23,5 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale" +video_scale = "4.0" diff --git a/handheld/console-border/gba-agb001-color-motionblur-2x.slangp b/handheld/console-border/gba-agb001-color-motionblur-2x.slangp index 5a76a10..14b14e3 100644 --- a/handheld/console-border/gba-agb001-color-motionblur-2x.slangp +++ b/handheld/console-border/gba-agb001-color-motionblur-2x.slangp @@ -23,7 +23,5 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "2.0" -OUT_X = "6400.0" -OUT_Y = "3200.0" +parameters = "video_scale" +video_scale = "4.0" diff --git a/handheld/console-border/gba-agb001-color-motionblur-3x.slangp b/handheld/console-border/gba-agb001-color-motionblur-3x.slangp index 084348d..d59ac98 100644 --- a/handheld/console-border/gba-agb001-color-motionblur-3x.slangp +++ b/handheld/console-border/gba-agb001-color-motionblur-3x.slangp @@ -23,7 +23,5 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "3.0" -OUT_X = "9600.0" -OUT_Y = "4800.0" +parameters = "video_scale" +video_scale = "3.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-1x.slangp b/handheld/console-border/gba-ags001-color-motionblur-1x.slangp index 298305b..eca2be4 100644 --- a/handheld/console-border/gba-ags001-color-motionblur-1x.slangp +++ b/handheld/console-border/gba-ags001-color-motionblur-1x.slangp @@ -28,7 +28,5 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale" +video_scale = "1.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-2x.slangp b/handheld/console-border/gba-ags001-color-motionblur-2x.slangp index 2548c2d..6b82633 100644 --- a/handheld/console-border/gba-ags001-color-motionblur-2x.slangp +++ b/handheld/console-border/gba-ags001-color-motionblur-2x.slangp @@ -28,7 +28,5 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "2.0" -OUT_X = "6400.0" -OUT_Y = "3200.0" +parameters = "video_scale" +video_scale = "2.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-3x.slangp b/handheld/console-border/gba-ags001-color-motionblur-3x.slangp index abe7dfd..0cdd4c9 100644 --- a/handheld/console-border/gba-ags001-color-motionblur-3x.slangp +++ b/handheld/console-border/gba-ags001-color-motionblur-3x.slangp @@ -28,7 +28,5 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "3.0" -OUT_X = "9600.0" -OUT_Y = "4800.0" +parameters = "video_scale" +video_scale = "3.0" diff --git a/handheld/console-border/gba-lcd-grid-v2-2x.slangp b/handheld/console-border/gba-lcd-grid-v2-2x.slangp index 94be66c..5e994a5 100644 --- a/handheld/console-border/gba-lcd-grid-v2-2x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2-2x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "2.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-3x.slangp b/handheld/console-border/gba-lcd-grid-v2-3x.slangp index d2a4b06..9ccaa99 100644 --- a/handheld/console-border/gba-lcd-grid-v2-3x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2-3x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "3.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-4x.slangp b/handheld/console-border/gba-lcd-grid-v2-4x.slangp index b979d2b..240aa19 100644 --- a/handheld/console-border/gba-lcd-grid-v2-4x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2-4x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "4.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-5x.slangp b/handheld/console-border/gba-lcd-grid-v2-5x.slangp index 058fd83..7f1696c 100644 --- a/handheld/console-border/gba-lcd-grid-v2-5x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2-5x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "5.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-6x.slangp b/handheld/console-border/gba-lcd-grid-v2-6x.slangp index 3e45d3d..5cdec1b 100644 --- a/handheld/console-border/gba-lcd-grid-v2-6x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2-6x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "6.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-retro-v2-2x.slangp b/handheld/console-border/gba-retro-v2-2x.slangp index 655fd01..13511a2 100644 --- a/handheld/console-border/gba-retro-v2-2x.slangp +++ b/handheld/console-border/gba-retro-v2-2x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "2.0" RETRO_PIXEL_SIZE = "0.55" diff --git a/handheld/console-border/gba-retro-v2-3x.slangp b/handheld/console-border/gba-retro-v2-3x.slangp index 7cc7f64..d7fbc16 100644 --- a/handheld/console-border/gba-retro-v2-3x.slangp +++ b/handheld/console-border/gba-retro-v2-3x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "3.0" RETRO_PIXEL_SIZE = "0.70" diff --git a/handheld/console-border/gba-retro-v2-4x.slangp b/handheld/console-border/gba-retro-v2-4x.slangp index dba16fc..257d9c0 100644 --- a/handheld/console-border/gba-retro-v2-4x.slangp +++ b/handheld/console-border/gba-retro-v2-4x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "4.0" RETRO_PIXEL_SIZE = "0.75" diff --git a/handheld/console-border/gba-retro-v2-5x.slangp b/handheld/console-border/gba-retro-v2-5x.slangp index 812bd8b..af36669 100644 --- a/handheld/console-border/gba-retro-v2-5x.slangp +++ b/handheld/console-border/gba-retro-v2-5x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "5.0" RETRO_PIXEL_SIZE = "0.80" diff --git a/handheld/console-border/gba-retro-v2-6x.slangp b/handheld/console-border/gba-retro-v2-6x.slangp index 7579940..51498c3 100644 --- a/handheld/console-border/gba-retro-v2-6x.slangp +++ b/handheld/console-border/gba-retro-v2-6x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "6.0" RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gbc-2x.slangp b/handheld/console-border/gbc-2x.slangp index f41deec..39011b9 100644 --- a/handheld/console-border/gbc-2x.slangp +++ b/handheld/console-border/gbc-2x.slangp @@ -12,10 +12,8 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale" +video_scale = "2.0" textures = "BORDER" BORDER = "resources/color-border-square-4x.png" diff --git a/handheld/console-border/gbc-3x.slangp b/handheld/console-border/gbc-3x.slangp index c0a7d08..175f4c7 100644 --- a/handheld/console-border/gbc-3x.slangp +++ b/handheld/console-border/gbc-3x.slangp @@ -12,10 +12,8 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +parameters = "video_scale" +video_scale = "3.0" textures = "BORDER" BORDER = "resources/color-border-square-4x.png" diff --git a/handheld/console-border/gbc-4x.slangp b/handheld/console-border/gbc-4x.slangp index b8db36f..9bd92cd 100644 --- a/handheld/console-border/gbc-4x.slangp +++ b/handheld/console-border/gbc-4x.slangp @@ -12,10 +12,8 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale" +video_scale = "4.0" textures = "BORDER" BORDER = "resources/color-border-square-4x.png" diff --git a/handheld/console-border/gbc-5x.slangp b/handheld/console-border/gbc-5x.slangp index 928a90e..8192f11 100644 --- a/handheld/console-border/gbc-5x.slangp +++ b/handheld/console-border/gbc-5x.slangp @@ -12,10 +12,8 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale" +video_scale = "5.0" textures = "BORDER" BORDER = "resources/color-border-square-4x.png" diff --git a/handheld/console-border/gbc-6x.slangp b/handheld/console-border/gbc-6x.slangp index b73fcd2..b5a2dcb 100644 --- a/handheld/console-border/gbc-6x.slangp +++ b/handheld/console-border/gbc-6x.slangp @@ -12,10 +12,8 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale" +video_scale = "6.0" textures = "BORDER" BORDER = "resources/color-border-square-4x.png" diff --git a/handheld/console-border/gbc-lcd-grid-v2-2x.slangp b/handheld/console-border/gbc-lcd-grid-v2-2x.slangp index 73a0b73..5634f46 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-2x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2-2x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "2.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-3x.slangp b/handheld/console-border/gbc-lcd-grid-v2-3x.slangp index f5ca8cd..a83d30f 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-3x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2-3x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "3.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-4x.slangp b/handheld/console-border/gbc-lcd-grid-v2-4x.slangp index 4b44de2..9b6d188 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-4x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2-4x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "4.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-5x.slangp b/handheld/console-border/gbc-lcd-grid-v2-5x.slangp index 1d28fee..87ac053 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-5x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2-5x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "5.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-6x.slangp b/handheld/console-border/gbc-lcd-grid-v2-6x.slangp index 905c89a..2d8dd5a 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-6x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2-6x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "6.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-7x.slangp b/handheld/console-border/gbc-lcd-grid-v2-7x.slangp index 2e550f9..9f7bd0c 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-7x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2-7x.slangp @@ -23,10 +23,8 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" +parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" +video_scale = "7.0" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-retro-v2-2x.slangp b/handheld/console-border/gbc-retro-v2-2x.slangp index dbf9844..b0f3d96 100644 --- a/handheld/console-border/gbc-retro-v2-2x.slangp +++ b/handheld/console-border/gbc-retro-v2-2x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "1600.0" -OUT_Y = "800.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "2.0" RETRO_PIXEL_SIZE = "0.55" diff --git a/handheld/console-border/gbc-retro-v2-3x.slangp b/handheld/console-border/gbc-retro-v2-3x.slangp index c685924..d22c306 100644 --- a/handheld/console-border/gbc-retro-v2-3x.slangp +++ b/handheld/console-border/gbc-retro-v2-3x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "3.0" RETRO_PIXEL_SIZE = "0.7" diff --git a/handheld/console-border/gbc-retro-v2-4x.slangp b/handheld/console-border/gbc-retro-v2-4x.slangp index 65f15bc..fdcf180 100644 --- a/handheld/console-border/gbc-retro-v2-4x.slangp +++ b/handheld/console-border/gbc-retro-v2-4x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "4.0" RETRO_PIXEL_SIZE = "0.75" diff --git a/handheld/console-border/gbc-retro-v2-5x.slangp b/handheld/console-border/gbc-retro-v2-5x.slangp index d3203a7..3cf7029 100644 --- a/handheld/console-border/gbc-retro-v2-5x.slangp +++ b/handheld/console-border/gbc-retro-v2-5x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4000.0" -OUT_Y = "2000.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "5.0" RETRO_PIXEL_SIZE = "0.80" diff --git a/handheld/console-border/gbc-retro-v2-6x.slangp b/handheld/console-border/gbc-retro-v2-6x.slangp index f5ffc85..94e46fc 100644 --- a/handheld/console-border/gbc-retro-v2-6x.slangp +++ b/handheld/console-border/gbc-retro-v2-6x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "4800.0" -OUT_Y = "2400.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "6.0" RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gbc-retro-v2-7x.slangp b/handheld/console-border/gbc-retro-v2-7x.slangp index e4814a8..bee13e9 100644 --- a/handheld/console-border/gbc-retro-v2-7x.slangp +++ b/handheld/console-border/gbc-retro-v2-7x.slangp @@ -23,8 +23,6 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "SCALE;OUT_X;OUT_Y;RETRO_PIXEL_SIZE" -SCALE = "1.0" -OUT_X = "5600.0" -OUT_Y = "2800.0" +parameters = "video_scale;RETRO_PIXEL_SIZE" +video_scale = "7.0" RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gg-2x.slangp b/handheld/console-border/gg-2x.slangp index 7d95d43..1904289 100644 --- a/handheld/console-border/gg-2x.slangp +++ b/handheld/console-border/gg-2x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = "0.150000" -SCALE = "0.5" -OUT_X = "1600.0" -OUT_Y = "800.0" +video_scale = "2.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/gg-3x.slangp b/handheld/console-border/gg-3x.slangp index 5d92e33..4545415 100644 --- a/handheld/console-border/gg-3x.slangp +++ b/handheld/console-border/gg-3x.slangp @@ -12,10 +12,8 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y" -SCALE = "1.0" -OUT_X = "2400.0" -OUT_Y = "1200.0" +parameters = "video_scale" +video_scale = "3.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/gg-4x.slangp b/handheld/console-border/gg-4x.slangp index 400b0ba..9314e90 100644 --- a/handheld/console-border/gg-4x.slangp +++ b/handheld/console-border/gg-4x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = "0.050000" -SCALE = "1.0" -OUT_X = "3200.0" -OUT_Y = "1600.0" +video_scale = "4.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/gg-5x.slangp b/handheld/console-border/gg-5x.slangp index e31d046..3bec94b 100644 --- a/handheld/console-border/gg-5x.slangp +++ b/handheld/console-border/gg-5x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = "0.050000" -SCALE = "1.25" -OUT_X = "5000.0" -OUT_Y = "2500.0" +video_scale = "5.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/gg-6x.slangp b/handheld/console-border/gg-6x.slangp index d2544a7..8cb5709 100644 --- a/handheld/console-border/gg-6x.slangp +++ b/handheld/console-border/gg-6x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = "0.050000" -SCALE = "1.5" -OUT_X = "7200.0" -OUT_Y = "3600.0" +video_scale = "6.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/psp-2x.slangp b/handheld/console-border/psp-2x.slangp index 4aa4a88..fb474a2 100644 --- a/handheld/console-border/psp-2x.slangp +++ b/handheld/console-border/psp-2x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = 0.2 -SCALE = "0.5" -OUT_X = "2700.0" -OUT_Y = "1350.0" +video_scale = "2.0" textures = "BORDER" BORDER = "resources/psp border.png" diff --git a/handheld/console-border/psp-3x.slangp b/handheld/console-border/psp-3x.slangp index 16e2736..1dd4870 100644 --- a/handheld/console-border/psp-3x.slangp +++ b/handheld/console-border/psp-3x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = 0.10 -SCALE = "0.75" -OUT_X = "4050.0" -OUT_Y = "2025.0" +video_scale = "3.0" textures = "BORDER" BORDER = "resources/psp border.png" diff --git a/handheld/console-border/psp-4x.slangp b/handheld/console-border/psp-4x.slangp index f861e5a..47846b5 100644 --- a/handheld/console-border/psp-4x.slangp +++ b/handheld/console-border/psp-4x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = 0.15 -SCALE = "1.0" -OUT_X = "5400.0" -OUT_Y = "2700.0" +video_scale = "4.0" textures = "BORDER" BORDER = "resources/psp border.png" diff --git a/handheld/console-border/psp-5x.slangp b/handheld/console-border/psp-5x.slangp index ba19dfd..9cb3894 100644 --- a/handheld/console-border/psp-5x.slangp +++ b/handheld/console-border/psp-5x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = 0.15 -SCALE = "1.0" -OUT_X = "6750.0" -OUT_Y = "3375.0" +video_scale = "5.0" textures = "BORDER" BORDER = "resources/psp border.png" diff --git a/handheld/console-border/psp-6x.slangp b/handheld/console-border/psp-6x.slangp index 7a692ac..0aeaf6c 100644 --- a/handheld/console-border/psp-6x.slangp +++ b/handheld/console-border/psp-6x.slangp @@ -12,11 +12,9 @@ shader1 = "shader-files/gb-pass-5.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "SCALE;OUT_X;OUT_Y;GRID_STRENGTH" +parameters = "video_scale;GRID_STRENGTH" GRID_STRENGTH = 0.15 -SCALE = "1.0" -OUT_X = "8100.0" -OUT_Y = "4050.0" +video_scale = "6.0" textures = "BORDER" BORDER = "resources/psp border.png" From f9d9c9724c43b42bf26457f56a845dc0f87f3f13 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Wed, 4 May 2022 01:16:25 +0100 Subject: [PATCH 03/11] Fix gbpass scaling misalignment --- handheld/console-border/shader-files/gb-pass0.slang | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/handheld/console-border/shader-files/gb-pass0.slang b/handheld/console-border/shader-files/gb-pass0.slang index f0bdaad..4a18e5d 100644 --- a/handheld/console-border/shader-files/gb-pass0.slang +++ b/handheld/console-border/shader-files/gb-pass0.slang @@ -76,17 +76,14 @@ layout(location = 3) out vec2 one_texel; //#define video_scale floor(registers.OutputSize.y * registers.SourceSize.w) <- moved to parameter // Size of the scaled video -//#define scaled_video_out (registers.SourceSize.xy * vec2(video_scale)) <- moved to parameter - -//it's... half a pixel -#define half_pixel (vec2(0.5) * registers.OutputSize.zw) +//#define scaled_video_out (registers.SourceSize.xy * vec2(video_scale)) <- moved to parameter void main() { vec2 scaled_video_out = (registers.SourceSize.xy * vec2(registers.video_scale)); // Remaps position to integer scaled output gl_Position = global.MVP * Position / vec4( vec2(registers.OutputSize.xy / scaled_video_out), 1.0, 1.0 ); - vTexCoord = TexCoord + half_pixel; + vTexCoord = TexCoord; dot_size = registers.SourceSize.zw; one_texel = 1.0 / (registers.SourceSize.xy * registers.video_scale); } From 9fcf6bf196a2e117cb60fc05819ee4d556a2bf81 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sat, 7 May 2022 17:27:21 +0100 Subject: [PATCH 04/11] gb-pass5 - determine border size from SourceSize and OriginalSize. Use only Y for compatibility with non-square pixel consoles. --- handheld/console-border/shader-files/gb-pass-5.slang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang index 247b949..8311469 100644 --- a/handheld/console-border/shader-files/gb-pass-5.slang +++ b/handheld/console-border/shader-files/gb-pass-5.slang @@ -4,6 +4,7 @@ layout(push_constant) uniform Push { vec4 OutputSize; vec4 SourceSize; + vec4 OriginalSize; float video_scale; } params; @@ -11,7 +12,7 @@ layout(push_constant) uniform Push vec2 middle = vec2(0.5, 0.5); vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; -vec2 border_scale = vec2(800, 400) * params.video_scale; +vec2 border_scale = vec2(800, 400) * (params.SourceSize.y / params.OriginalSize.y); layout(std140, set = 0, binding = 0) uniform UBO { From e53d1be562e1af2ce8d4eb1d8d7305187165e918 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sat, 7 May 2022 21:14:16 +0100 Subject: [PATCH 05/11] Separate gb-pass border shader from auto scaled border shader --- .../shader-files/border-auto-scale.slang | 46 +++++++++++++++++++ .../shader-files/gb-pass-5.slang | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 handheld/console-border/shader-files/border-auto-scale.slang diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang new file mode 100644 index 0000000..b76fbb1 --- /dev/null +++ b/handheld/console-border/shader-files/border-auto-scale.slang @@ -0,0 +1,46 @@ +#version 450 + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 SourceSize; + vec4 OriginalSize; +} params; + +vec2 middle = vec2(0.5, 0.5); +vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; +vec2 border_scale = vec2(800, 400) * (params.SourceSize.y / params.OriginalSize.y); + +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; +layout(location = 1) out vec2 tex_border; + +void main() +{ + gl_Position = global.MVP * Position; + + vec2 diff = TexCoord.xy - middle; + vTexCoord = middle + diff * screen_scale; + tex_border = middle + diff * params.OutputSize.xy / border_scale; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 tex_border; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; +layout(set = 0, binding = 3) uniform sampler2D BORDER; + +void main() +{ + vec4 frame = texture(Source, vTexCoord).rgba; + vec4 border = texture(BORDER, tex_border).rgba; + FragColor = vec4(mix(frame, border, border.a)); +} diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang index 8311469..74c6aa5 100644 --- a/handheld/console-border/shader-files/gb-pass-5.slang +++ b/handheld/console-border/shader-files/gb-pass-5.slang @@ -12,7 +12,7 @@ layout(push_constant) uniform Push vec2 middle = vec2(0.5, 0.5); vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; -vec2 border_scale = vec2(800, 400) * (params.SourceSize.y / params.OriginalSize.y); +vec2 border_scale = vec2(800, 400) * params.video_scale; layout(std140, set = 0, binding = 0) uniform UBO { From 013ff5aace9b18b0e76b49d86d1e68f29ed9dee4 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sat, 7 May 2022 23:49:50 +0100 Subject: [PATCH 06/11] handheld border major cleanup --- handheld/console-border/dmg-2x.slangp | 47 ---------------- handheld/console-border/dmg-3x.slangp | 45 --------------- handheld/console-border/dmg-5x.slangp | 45 --------------- handheld/console-border/dmg-6x.slangp | 45 --------------- .../{dmg-4x.slangp => dmg.slangp} | 0 handheld/console-border/gb-dmg-alt-2x.slangp | 46 ---------------- handheld/console-border/gb-dmg-alt-3x.slangp | 47 ---------------- handheld/console-border/gb-dmg-alt-5x.slangp | 46 ---------------- handheld/console-border/gb-dmg-alt-6x.slangp | 46 ---------------- handheld/console-border/gb-dmg-alt-7x.slangp | 46 ---------------- ...gb-dmg-alt-4x.slangp => gb-dmg-alt.slangp} | 0 .../console-border/gb-light-alt-2x.slangp | 47 ---------------- .../console-border/gb-light-alt-3x.slangp | 47 ---------------- .../console-border/gb-light-alt-5x.slangp | 47 ---------------- .../console-border/gb-light-alt-6x.slangp | 47 ---------------- .../console-border/gb-light-alt-7x.slangp | 47 ---------------- ...ight-alt-4x.slangp => gb-light-alt.slangp} | 0 handheld/console-border/gb-pocket-2x.slangp | 55 ------------------- handheld/console-border/gb-pocket-3x.slangp | 53 ------------------ handheld/console-border/gb-pocket-5x.slangp | 53 ------------------ handheld/console-border/gb-pocket-6x.slangp | 53 ------------------ .../console-border/gb-pocket-alt-2x.slangp | 46 ---------------- .../console-border/gb-pocket-alt-3x.slangp | 46 ---------------- .../console-border/gb-pocket-alt-5x.slangp | 47 ---------------- .../console-border/gb-pocket-alt-6x.slangp | 47 ---------------- .../console-border/gb-pocket-alt-7x.slangp | 47 ---------------- ...ket-alt-4x.slangp => gb-pocket-alt.slangp} | 0 .../{gb-pocket-4x.slangp => gb-pocket.slangp} | 0 handheld/console-border/gba-3x.slangp | 32 ----------- handheld/console-border/gba-4x.slangp | 32 ----------- handheld/console-border/gba-5x.slangp | 32 ----------- handheld/console-border/gba-6x.slangp | 32 ----------- .../gba-agb001-color-motionblur-2x.slangp | 27 --------- .../gba-agb001-color-motionblur-3x.slangp | 27 --------- ...ngp => gba-agb001-color-motionblur.slangp} | 5 +- .../gba-ags001-color-motionblur-1x.slangp | 32 ----------- .../gba-ags001-color-motionblur-3x.slangp | 32 ----------- ...ngp => gba-ags001-color-motionblur.slangp} | 5 +- .../console-border/gba-lcd-grid-v2-2x.slangp | 41 -------------- .../console-border/gba-lcd-grid-v2-3x.slangp | 41 -------------- .../console-border/gba-lcd-grid-v2-5x.slangp | 41 -------------- .../console-border/gba-lcd-grid-v2-6x.slangp | 41 -------------- ...id-v2-4x.slangp => gba-lcd-grid-v2.slangp} | 5 +- .../{gba-2x.slangp => gba.slangp} | 11 ++-- handheld/console-border/gbc-3x.slangp | 22 -------- handheld/console-border/gbc-4x.slangp | 22 -------- handheld/console-border/gbc-5x.slangp | 22 -------- handheld/console-border/gbc-6x.slangp | 22 -------- .../console-border/gbc-lcd-grid-v2-2x.slangp | 41 -------------- .../console-border/gbc-lcd-grid-v2-3x.slangp | 41 -------------- .../console-border/gbc-lcd-grid-v2-5x.slangp | 41 -------------- .../console-border/gbc-lcd-grid-v2-6x.slangp | 41 -------------- .../console-border/gbc-lcd-grid-v2-7x.slangp | 41 -------------- ...id-v2-4x.slangp => gbc-lcd-grid-v2.slangp} | 5 +- .../{gbc-2x.slangp => gbc.slangp} | 11 +--- handheld/console-border/gg-2x.slangp | 23 -------- handheld/console-border/gg-3x.slangp | 22 -------- handheld/console-border/gg-5x.slangp | 23 -------- handheld/console-border/gg-6x.slangp | 23 -------- .../{gg-4x.slangp => gg.slangp} | 5 +- handheld/console-border/psp-2x.slangp | 23 -------- handheld/console-border/psp-3x.slangp | 23 -------- handheld/console-border/psp-4x.slangp | 23 -------- handheld/console-border/psp-6x.slangp | 23 -------- .../{psp-5x.slangp => psp.slangp} | 11 ++-- 65 files changed, 19 insertions(+), 2020 deletions(-) delete mode 100644 handheld/console-border/dmg-2x.slangp delete mode 100644 handheld/console-border/dmg-3x.slangp delete mode 100644 handheld/console-border/dmg-5x.slangp delete mode 100644 handheld/console-border/dmg-6x.slangp rename handheld/console-border/{dmg-4x.slangp => dmg.slangp} (100%) delete mode 100644 handheld/console-border/gb-dmg-alt-2x.slangp delete mode 100644 handheld/console-border/gb-dmg-alt-3x.slangp delete mode 100644 handheld/console-border/gb-dmg-alt-5x.slangp delete mode 100644 handheld/console-border/gb-dmg-alt-6x.slangp delete mode 100644 handheld/console-border/gb-dmg-alt-7x.slangp rename handheld/console-border/{gb-dmg-alt-4x.slangp => gb-dmg-alt.slangp} (100%) delete mode 100644 handheld/console-border/gb-light-alt-2x.slangp delete mode 100644 handheld/console-border/gb-light-alt-3x.slangp delete mode 100644 handheld/console-border/gb-light-alt-5x.slangp delete mode 100644 handheld/console-border/gb-light-alt-6x.slangp delete mode 100644 handheld/console-border/gb-light-alt-7x.slangp rename handheld/console-border/{gb-light-alt-4x.slangp => gb-light-alt.slangp} (100%) delete mode 100644 handheld/console-border/gb-pocket-2x.slangp delete mode 100644 handheld/console-border/gb-pocket-3x.slangp delete mode 100644 handheld/console-border/gb-pocket-5x.slangp delete mode 100644 handheld/console-border/gb-pocket-6x.slangp delete mode 100644 handheld/console-border/gb-pocket-alt-2x.slangp delete mode 100644 handheld/console-border/gb-pocket-alt-3x.slangp delete mode 100644 handheld/console-border/gb-pocket-alt-5x.slangp delete mode 100644 handheld/console-border/gb-pocket-alt-6x.slangp delete mode 100644 handheld/console-border/gb-pocket-alt-7x.slangp rename handheld/console-border/{gb-pocket-alt-4x.slangp => gb-pocket-alt.slangp} (100%) rename handheld/console-border/{gb-pocket-4x.slangp => gb-pocket.slangp} (100%) delete mode 100644 handheld/console-border/gba-3x.slangp delete mode 100644 handheld/console-border/gba-4x.slangp delete mode 100644 handheld/console-border/gba-5x.slangp delete mode 100644 handheld/console-border/gba-6x.slangp delete mode 100644 handheld/console-border/gba-agb001-color-motionblur-2x.slangp delete mode 100644 handheld/console-border/gba-agb001-color-motionblur-3x.slangp rename handheld/console-border/{gba-agb001-color-motionblur-1x.slangp => gba-agb001-color-motionblur.slangp} (83%) delete mode 100644 handheld/console-border/gba-ags001-color-motionblur-1x.slangp delete mode 100644 handheld/console-border/gba-ags001-color-motionblur-3x.slangp rename handheld/console-border/{gba-ags001-color-motionblur-2x.slangp => gba-ags001-color-motionblur.slangp} (85%) delete mode 100644 handheld/console-border/gba-lcd-grid-v2-2x.slangp delete mode 100644 handheld/console-border/gba-lcd-grid-v2-3x.slangp delete mode 100644 handheld/console-border/gba-lcd-grid-v2-5x.slangp delete mode 100644 handheld/console-border/gba-lcd-grid-v2-6x.slangp rename handheld/console-border/{gba-lcd-grid-v2-4x.slangp => gba-lcd-grid-v2.slangp} (77%) rename handheld/console-border/{gba-2x.slangp => gba.slangp} (72%) delete mode 100644 handheld/console-border/gbc-3x.slangp delete mode 100644 handheld/console-border/gbc-4x.slangp delete mode 100644 handheld/console-border/gbc-5x.slangp delete mode 100644 handheld/console-border/gbc-6x.slangp delete mode 100644 handheld/console-border/gbc-lcd-grid-v2-2x.slangp delete mode 100644 handheld/console-border/gbc-lcd-grid-v2-3x.slangp delete mode 100644 handheld/console-border/gbc-lcd-grid-v2-5x.slangp delete mode 100644 handheld/console-border/gbc-lcd-grid-v2-6x.slangp delete mode 100644 handheld/console-border/gbc-lcd-grid-v2-7x.slangp rename handheld/console-border/{gbc-lcd-grid-v2-4x.slangp => gbc-lcd-grid-v2.slangp} (77%) rename handheld/console-border/{gbc-2x.slangp => gbc.slangp} (64%) delete mode 100644 handheld/console-border/gg-2x.slangp delete mode 100644 handheld/console-border/gg-3x.slangp delete mode 100644 handheld/console-border/gg-5x.slangp delete mode 100644 handheld/console-border/gg-6x.slangp rename handheld/console-border/{gg-4x.slangp => gg.slangp} (81%) delete mode 100644 handheld/console-border/psp-2x.slangp delete mode 100644 handheld/console-border/psp-3x.slangp delete mode 100644 handheld/console-border/psp-4x.slangp delete mode 100644 handheld/console-border/psp-6x.slangp rename handheld/console-border/{psp-5x.slangp => psp.slangp} (63%) diff --git a/handheld/console-border/dmg-2x.slangp b/handheld/console-border/dmg-2x.slangp deleted file mode 100644 index 477c17b..0000000 --- a/handheld/console-border/dmg-2x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true -scale_type5 = source -scale5 = 1.0 - -parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-3x.slangp b/handheld/console-border/dmg-3x.slangp deleted file mode 100644 index 22593ce..0000000 --- a/handheld/console-border/dmg-3x.slangp +++ /dev/null @@ -1,45 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "3.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-5x.slangp b/handheld/console-border/dmg-5x.slangp deleted file mode 100644 index b943c88..0000000 --- a/handheld/console-border/dmg-5x.slangp +++ /dev/null @@ -1,45 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "5.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-6x.slangp b/handheld/console-border/dmg-6x.slangp deleted file mode 100644 index 75473ee..0000000 --- a/handheld/console-border/dmg-6x.slangp +++ /dev/null @@ -1,45 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;adjacent_texel_alpha_blending;pixel_opacity;shadow_opacity" -video_scale = "6.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/dmg-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/dmg-background.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/dmg-4x.slangp b/handheld/console-border/dmg.slangp similarity index 100% rename from handheld/console-border/dmg-4x.slangp rename to handheld/console-border/dmg.slangp diff --git a/handheld/console-border/gb-dmg-alt-2x.slangp b/handheld/console-border/gb-dmg-alt-2x.slangp deleted file mode 100644 index fe2e2a6..0000000 --- a/handheld/console-border/gb-dmg-alt-2x.slangp +++ /dev/null @@ -1,46 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "2.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-3x.slangp b/handheld/console-border/gb-dmg-alt-3x.slangp deleted file mode 100644 index e12383a..0000000 --- a/handheld/console-border/gb-dmg-alt-3x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "3.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-dmg-alt-5x.slangp b/handheld/console-border/gb-dmg-alt-5x.slangp deleted file mode 100644 index d7710aa..0000000 --- a/handheld/console-border/gb-dmg-alt-5x.slangp +++ /dev/null @@ -1,46 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "5.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-6x.slangp b/handheld/console-border/gb-dmg-alt-6x.slangp deleted file mode 100644 index 4d7d01d..0000000 --- a/handheld/console-border/gb-dmg-alt-6x.slangp +++ /dev/null @@ -1,46 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "6.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-7x.slangp b/handheld/console-border/gb-dmg-alt-7x.slangp deleted file mode 100644 index 2d84c40..0000000 --- a/handheld/console-border/gb-dmg-alt-7x.slangp +++ /dev/null @@ -1,46 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/dmg-palette-0.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/dmg-bg.png -BACKGROUND_linear = true -BORDER = resources/dmg-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "7.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-dmg-alt-4x.slangp b/handheld/console-border/gb-dmg-alt.slangp similarity index 100% rename from handheld/console-border/gb-dmg-alt-4x.slangp rename to handheld/console-border/gb-dmg-alt.slangp diff --git a/handheld/console-border/gb-light-alt-2x.slangp b/handheld/console-border/gb-light-alt-2x.slangp deleted file mode 100644 index 4cca8d1..0000000 --- a/handheld/console-border/gb-light-alt-2x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" -video_scale = "2.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-3x.slangp b/handheld/console-border/gb-light-alt-3x.slangp deleted file mode 100644 index e51ccf8..0000000 --- a/handheld/console-border/gb-light-alt-3x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" -video_scale = "3.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-5x.slangp b/handheld/console-border/gb-light-alt-5x.slangp deleted file mode 100644 index b59999d..0000000 --- a/handheld/console-border/gb-light-alt-5x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" -video_scale = "5.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-6x.slangp b/handheld/console-border/gb-light-alt-6x.slangp deleted file mode 100644 index ce1e2d1..0000000 --- a/handheld/console-border/gb-light-alt-6x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" -video_scale = "6.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-7x.slangp b/handheld/console-border/gb-light-alt-7x.slangp deleted file mode 100644 index 9411891..0000000 --- a/handheld/console-border/gb-light-alt-7x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gblight-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;screen_light;grey_balance;response_time;blending_mode" -video_scale = "7.0" -screen_light = "1.4" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-light-alt-4x.slangp b/handheld/console-border/gb-light-alt.slangp similarity index 100% rename from handheld/console-border/gb-light-alt-4x.slangp rename to handheld/console-border/gb-light-alt.slangp diff --git a/handheld/console-border/gb-pocket-2x.slangp b/handheld/console-border/gb-pocket-2x.slangp deleted file mode 100644 index 62adac7..0000000 --- a/handheld/console-border/gb-pocket-2x.slangp +++ /dev/null @@ -1,55 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true -scale_type5 = source -scale5 = 1.0 - -parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "2.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-3x.slangp b/handheld/console-border/gb-pocket-3x.slangp deleted file mode 100644 index 98a1edb..0000000 --- a/handheld/console-border/gb-pocket-3x.slangp +++ /dev/null @@ -1,53 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "3.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-5x.slangp b/handheld/console-border/gb-pocket-5x.slangp deleted file mode 100644 index 0dd580d..0000000 --- a/handheld/console-border/gb-pocket-5x.slangp +++ /dev/null @@ -1,53 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "5.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-6x.slangp b/handheld/console-border/gb-pocket-6x.slangp deleted file mode 100644 index e80f387..0000000 --- a/handheld/console-border/gb-pocket-6x.slangp +++ /dev/null @@ -1,53 +0,0 @@ -shaders = 6 - -shader0 = shader-files/gb-pass0.slang -filter_linear0 = false -scale_type0 = viewport -scale0 = 1.0 -alias0 = "PASS0" - -shader1 = shader-files/gb-pass1.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 -alias1 = "PASS1" - -shader2 = shader-files/gb-pass2.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 -alias2 = "PASS2" - -shader3 = shader-files/gb-pass3.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 -alias3 = "PASS3" - -shader4 = shader-files/gb-pass4.slang -filter_linear4 = false -scale_type4 = source -scale4 = 1.0 -alias4 = "PASS4" - -shader5 = shader-files/gb-pass-5.slang -filter_linear5 = true - -parameters = "video_scale;baseline_alpha;grey_balance;adjacent_texel_alpha_blending;contrast;screen_light;pixel_opacity;shadow_offset_x;shadow_opacity" -video_scale = "6.0" -baseline_alpha = "0.03" -grey_balance = "3.5" -adjacent_texel_alpha_blending = "0.6" -contrast = "0.85" -screen_light = "0.9" -pixel_opacity = "0.95" -shadow_opacity = "0.9" -shadow_offset_x = "-2.0" - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = resources/pocket-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = resources/pocket-background.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true diff --git a/handheld/console-border/gb-pocket-alt-2x.slangp b/handheld/console-border/gb-pocket-alt-2x.slangp deleted file mode 100644 index 18bb02c..0000000 --- a/handheld/console-border/gb-pocket-alt-2x.slangp +++ /dev/null @@ -1,46 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "2.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-3x.slangp b/handheld/console-border/gb-pocket-alt-3x.slangp deleted file mode 100644 index 70f0d9b..0000000 --- a/handheld/console-border/gb-pocket-alt-3x.slangp +++ /dev/null @@ -1,46 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "3.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 diff --git a/handheld/console-border/gb-pocket-alt-5x.slangp b/handheld/console-border/gb-pocket-alt-5x.slangp deleted file mode 100644 index af5c475..0000000 --- a/handheld/console-border/gb-pocket-alt-5x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "5.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-pocket-alt-6x.slangp b/handheld/console-border/gb-pocket-alt-6x.slangp deleted file mode 100644 index 4026f49..0000000 --- a/handheld/console-border/gb-pocket-alt-6x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "6.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-pocket-alt-7x.slangp b/handheld/console-border/gb-pocket-alt-7x.slangp deleted file mode 100644 index 2c31d5f..0000000 --- a/handheld/console-border/gb-pocket-alt-7x.slangp +++ /dev/null @@ -1,47 +0,0 @@ -shaders = 6 -shader0 = shader-files/gb-pass0.slang -shader1 = ../shaders/gameboy/shader-files/gb-pass1.slang -shader2 = ../shaders/gameboy/shader-files/gb-pass2.slang -shader3 = ../shaders/gameboy/shader-files/gb-pass3.slang -shader4 = ../shaders/gameboy/shader-files/gb-pass4.slang -shader5 = shader-files/gb-pass-5.slang - -scale_type0 = viewport -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 1 - -scale_type3 = source -scale3 = 1 - -scale_type4 = source -scale4 = 1 - -scale_type5 = source -scale5 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = false -filter_linear4 = false -filter_linear5 = true - -textures = COLOR_PALETTE;BACKGROUND;BORDER -COLOR_PALETTE = ../shaders/gameboy/resources/sample-palettes/gbp-palette.png -COLOR_PALETTE_linear = false -BACKGROUND = ../shaders/gameboy/resources/sample-bgs/paper-bg.png -BACKGROUND_linear = true -BORDER = resources/pocket-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;grey_balance;response_time;blending_mode" -video_scale = "7.0" -grey_balance = 3.0 -response_time = 0.444 -blending_mode = 0.0 - diff --git a/handheld/console-border/gb-pocket-alt-4x.slangp b/handheld/console-border/gb-pocket-alt.slangp similarity index 100% rename from handheld/console-border/gb-pocket-alt-4x.slangp rename to handheld/console-border/gb-pocket-alt.slangp diff --git a/handheld/console-border/gb-pocket-4x.slangp b/handheld/console-border/gb-pocket.slangp similarity index 100% rename from handheld/console-border/gb-pocket-4x.slangp rename to handheld/console-border/gb-pocket.slangp diff --git a/handheld/console-border/gba-3x.slangp b/handheld/console-border/gba-3x.slangp deleted file mode 100644 index b813ffb..0000000 --- a/handheld/console-border/gba-3x.slangp +++ /dev/null @@ -1,32 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "3.000000" -scale_type_y2 = "source" -scale_y2 = "3.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -video_scale = "3.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-4x.slangp b/handheld/console-border/gba-4x.slangp deleted file mode 100644 index 7e0564c..0000000 --- a/handheld/console-border/gba-4x.slangp +++ /dev/null @@ -1,32 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "4.000000" -scale_type_y2 = "source" -scale_y2 = "4.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -video_scale = "4.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-5x.slangp b/handheld/console-border/gba-5x.slangp deleted file mode 100644 index 149ee1d..0000000 --- a/handheld/console-border/gba-5x.slangp +++ /dev/null @@ -1,32 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "5.000000" -scale_type_y2 = "source" -scale_y2 = "5.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -video_scale = "5.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-6x.slangp b/handheld/console-border/gba-6x.slangp deleted file mode 100644 index 3d7e1c8..0000000 --- a/handheld/console-border/gba-6x.slangp +++ /dev/null @@ -1,32 +0,0 @@ -shaders = "4" - -shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 -filter_linear0 = false - -shader1 = "../shaders/color/gba-color.slang" -filter_linear1 = false - -shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear2 = "false" -wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "6.000000" -scale_type_y2 = "source" -scale_y2 = "6.000000" - -shader3 = "shader-files/gb-pass-5.slang" -filter_linear3 = "true" -wrap_mode3 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH;mixfactor" -GRID_STRENGTH = "0.150000" -video_scale = "6.0" -mixfactor = "0.50" - -textures = "BORDER" -BORDER = "resources/gba-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gba-agb001-color-motionblur-2x.slangp b/handheld/console-border/gba-agb001-color-motionblur-2x.slangp deleted file mode 100644 index 14b14e3..0000000 --- a/handheld/console-border/gba-agb001-color-motionblur-2x.slangp +++ /dev/null @@ -1,27 +0,0 @@ -shaders = 4 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/agb001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = shader-files/gb-pass-5.slang -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale" -video_scale = "4.0" diff --git a/handheld/console-border/gba-agb001-color-motionblur-3x.slangp b/handheld/console-border/gba-agb001-color-motionblur-3x.slangp deleted file mode 100644 index d59ac98..0000000 --- a/handheld/console-border/gba-agb001-color-motionblur-3x.slangp +++ /dev/null @@ -1,27 +0,0 @@ -shaders = 4 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/agb001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = shader-files/gb-pass-5.slang -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale" -video_scale = "3.0" diff --git a/handheld/console-border/gba-agb001-color-motionblur-1x.slangp b/handheld/console-border/gba-agb001-color-motionblur.slangp similarity index 83% rename from handheld/console-border/gba-agb001-color-motionblur-1x.slangp rename to handheld/console-border/gba-agb001-color-motionblur.slangp index 14b14e3..399b322 100644 --- a/handheld/console-border/gba-agb001-color-motionblur-1x.slangp +++ b/handheld/console-border/gba-agb001-color-motionblur.slangp @@ -15,13 +15,10 @@ filter_linear2 = false scale_type2 = source scale2 = 1.0 -shader3 = shader-files/gb-pass-5.slang +shader3 = shader-files/border-auto-scale.slang filter_linear3 = true textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true - -parameters = "video_scale" -video_scale = "4.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-1x.slangp b/handheld/console-border/gba-ags001-color-motionblur-1x.slangp deleted file mode 100644 index eca2be4..0000000 --- a/handheld/console-border/gba-ags001-color-motionblur-1x.slangp +++ /dev/null @@ -1,32 +0,0 @@ -shaders = 5 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/ags001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = ../shaders/mgba/ags001-light.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 - -shader4 = shader-files/gb-pass-5.slang -filter_linear4 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale" -video_scale = "1.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-3x.slangp b/handheld/console-border/gba-ags001-color-motionblur-3x.slangp deleted file mode 100644 index 0cdd4c9..0000000 --- a/handheld/console-border/gba-ags001-color-motionblur-3x.slangp +++ /dev/null @@ -1,32 +0,0 @@ -shaders = 5 - -shader0 = ../../motionblur/shaders/response-time.slang -filter_linear0 = false -scale_type0 = source -scale0 = 1.0 - -shader1 = ../shaders/mgba/ags001.slang -filter_linear1 = false -scale_type1 = source -scale1 = 4.0 - -shader2 = ../shaders/color/gba-color.slang -filter_linear2 = false -scale_type2 = source -scale2 = 1.0 - -shader3 = ../shaders/mgba/ags001-light.slang -filter_linear3 = false -scale_type3 = source -scale3 = 1.0 - -shader4 = shader-files/gb-pass-5.slang -filter_linear4 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale" -video_scale = "3.0" diff --git a/handheld/console-border/gba-ags001-color-motionblur-2x.slangp b/handheld/console-border/gba-ags001-color-motionblur.slangp similarity index 85% rename from handheld/console-border/gba-ags001-color-motionblur-2x.slangp rename to handheld/console-border/gba-ags001-color-motionblur.slangp index 6b82633..68b72fc 100644 --- a/handheld/console-border/gba-ags001-color-motionblur-2x.slangp +++ b/handheld/console-border/gba-ags001-color-motionblur.slangp @@ -20,13 +20,10 @@ filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = shader-files/gb-pass-5.slang +shader4 = shader-files/border-auto-scale.slang filter_linear4 = true textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true - -parameters = "video_scale" -video_scale = "2.0" diff --git a/handheld/console-border/gba-lcd-grid-v2-2x.slangp b/handheld/console-border/gba-lcd-grid-v2-2x.slangp deleted file mode 100644 index 5e994a5..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-2x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 2 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "2.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-3x.slangp b/handheld/console-border/gba-lcd-grid-v2-3x.slangp deleted file mode 100644 index 9ccaa99..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-3x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 3 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "3.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-5x.slangp b/handheld/console-border/gba-lcd-grid-v2-5x.slangp deleted file mode 100644 index 7f1696c..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-5x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 5 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "5.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-6x.slangp b/handheld/console-border/gba-lcd-grid-v2-6x.slangp deleted file mode 100644 index 5cdec1b..0000000 --- a/handheld/console-border/gba-lcd-grid-v2-6x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 6 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "6.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "1.000000" diff --git a/handheld/console-border/gba-lcd-grid-v2-4x.slangp b/handheld/console-border/gba-lcd-grid-v2.slangp similarity index 77% rename from handheld/console-border/gba-lcd-grid-v2-4x.slangp rename to handheld/console-border/gba-lcd-grid-v2.slangp index 240aa19..725c136 100644 --- a/handheld/console-border/gba-lcd-grid-v2-4x.slangp +++ b/handheld/console-border/gba-lcd-grid-v2.slangp @@ -2,7 +2,7 @@ shaders = 4 shader0 = ../../motionblur/shaders/response-time.slang shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang shader2 = ../shaders/color/gba-color.slang -shader3 = shader-files/gb-pass-5.slang +shader3 = shader-files/border-auto-scale.slang scale_type0 = source scale0 = 1 @@ -23,8 +23,7 @@ textures = BORDER BORDER = resources/gba-border-square-4x.png BORDER_linear = true -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "4.0" +parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gba-2x.slangp b/handheld/console-border/gba.slangp similarity index 72% rename from handheld/console-border/gba-2x.slangp rename to handheld/console-border/gba.slangp index 8033b9c..adbf78a 100644 --- a/handheld/console-border/gba-2x.slangp +++ b/handheld/console-border/gba.slangp @@ -11,18 +11,15 @@ filter_linear1 = false shader2 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_border" -scale_type_x2 = "source" -scale_x2 = "2.000000" -scale_type_y2 = "source" -scale_y2 = "2.000000" +scale_type2 = "source" +scale2 = "4.0" -shader3 = "shader-files/gb-pass-5.slang" +shader3 = "shader-files/border-auto-scale.slang" filter_linear3 = "true" wrap_mode3 = "clamp_to_border" -parameters = "video_scale;GRID_STRENGTH;mixfactor" +parameters = "GRID_STRENGTH;mixfactor" GRID_STRENGTH = "0.150000" -video_scale = "2.0" mixfactor = "0.50" textures = "BORDER" diff --git a/handheld/console-border/gbc-3x.slangp b/handheld/console-border/gbc-3x.slangp deleted file mode 100644 index 175f4c7..0000000 --- a/handheld/console-border/gbc-3x.slangp +++ /dev/null @@ -1,22 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "3.000000" -scale_type_y0 = "source" -scale_y0 = "3.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale" -video_scale = "3.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-4x.slangp b/handheld/console-border/gbc-4x.slangp deleted file mode 100644 index 9bd92cd..0000000 --- a/handheld/console-border/gbc-4x.slangp +++ /dev/null @@ -1,22 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale" -video_scale = "4.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-5x.slangp b/handheld/console-border/gbc-5x.slangp deleted file mode 100644 index 8192f11..0000000 --- a/handheld/console-border/gbc-5x.slangp +++ /dev/null @@ -1,22 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "5.000000" -scale_type_y0 = "source" -scale_y0 = "5.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale" -video_scale = "5.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-6x.slangp b/handheld/console-border/gbc-6x.slangp deleted file mode 100644 index b5a2dcb..0000000 --- a/handheld/console-border/gbc-6x.slangp +++ /dev/null @@ -1,22 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale" -video_scale = "6.0" - -textures = "BORDER" -BORDER = "resources/color-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gbc-lcd-grid-v2-2x.slangp b/handheld/console-border/gbc-lcd-grid-v2-2x.slangp deleted file mode 100644 index 5634f46..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-2x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 2 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "2.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-3x.slangp b/handheld/console-border/gbc-lcd-grid-v2-3x.slangp deleted file mode 100644 index a83d30f..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-3x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 3 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "3.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-5x.slangp b/handheld/console-border/gbc-lcd-grid-v2-5x.slangp deleted file mode 100644 index 87ac053..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-5x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 5 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "5.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-6x.slangp b/handheld/console-border/gbc-lcd-grid-v2-6x.slangp deleted file mode 100644 index 2d8dd5a..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-6x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 6 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "6.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-7x.slangp b/handheld/console-border/gbc-lcd-grid-v2-7x.slangp deleted file mode 100644 index 9f7bd0c..0000000 --- a/handheld/console-border/gbc-lcd-grid-v2-7x.slangp +++ /dev/null @@ -1,41 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang -shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 7 - -scale_type2 = source -scale2 = 1 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "7.0" -RSUBPIX_R = "0.750000" -RSUBPIX_G = "0.000000" -RSUBPIX_B = "0.000000" -GSUBPIX_R = "0.000000" -GSUBPIX_G = "0.750000" -GSUBPIX_B = "0.000000" -BSUBPIX_R = "0.000000" -BSUBPIX_G = "0.000000" -BSUBPIX_B = "0.750000" -gain = "1.500000" -gamma = "2.200000" -blacklevel = "0.000000" -ambient = "0.000000" -BGR = "0.000000" diff --git a/handheld/console-border/gbc-lcd-grid-v2-4x.slangp b/handheld/console-border/gbc-lcd-grid-v2.slangp similarity index 77% rename from handheld/console-border/gbc-lcd-grid-v2-4x.slangp rename to handheld/console-border/gbc-lcd-grid-v2.slangp index 9b6d188..92b33f9 100644 --- a/handheld/console-border/gbc-lcd-grid-v2-4x.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2.slangp @@ -2,7 +2,7 @@ shaders = 4 shader0 = ../../motionblur/shaders/response-time.slang shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang shader2 = ../shaders/color/gbc-color.slang -shader3 = shader-files/gb-pass-5.slang +shader3 = shader-files/border-auto-scale.slang scale_type0 = source scale0 = 1 @@ -23,8 +23,7 @@ textures = BORDER BORDER = resources/color-border-square-4x.png BORDER_linear = true -parameters = "video_scale;RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" -video_scale = "4.0" +parameters = "RSUBPIX_R;RSUBPIX_G;RSUBPIX_B;GSUBPIX_R;GSUBPIX_G;GSUBPIX_B;BSUBPIX_R;BSUBPIX_G;BSUBPIX_B;gain;gamma;blacklevel;ambient;BGR" RSUBPIX_R = "0.750000" RSUBPIX_G = "0.000000" RSUBPIX_B = "0.000000" diff --git a/handheld/console-border/gbc-2x.slangp b/handheld/console-border/gbc.slangp similarity index 64% rename from handheld/console-border/gbc-2x.slangp rename to handheld/console-border/gbc.slangp index 39011b9..2ac488b 100644 --- a/handheld/console-border/gbc-2x.slangp +++ b/handheld/console-border/gbc.slangp @@ -3,18 +3,13 @@ shaders = "2" shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "2.000000" -scale_type_y0 = "source" -scale_y0 = "2.000000" +scale_type0 = "source" +scale0 = "4.0" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "video_scale" -video_scale = "2.0" - textures = "BORDER" BORDER = "resources/color-border-square-4x.png" BORDER_linear = "true" diff --git a/handheld/console-border/gg-2x.slangp b/handheld/console-border/gg-2x.slangp deleted file mode 100644 index 1904289..0000000 --- a/handheld/console-border/gg-2x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.800000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = "0.150000" -video_scale = "2.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gg-3x.slangp b/handheld/console-border/gg-3x.slangp deleted file mode 100644 index 4545415..0000000 --- a/handheld/console-border/gg-3x.slangp +++ /dev/null @@ -1,22 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "3.600000" -scale_type_y0 = "source" -scale_y0 = "3.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale" -video_scale = "3.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" \ No newline at end of file diff --git a/handheld/console-border/gg-5x.slangp b/handheld/console-border/gg-5x.slangp deleted file mode 100644 index 3bec94b..0000000 --- a/handheld/console-border/gg-5x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "5.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = "0.050000" -video_scale = "5.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gg-6x.slangp b/handheld/console-border/gg-6x.slangp deleted file mode 100644 index 8cb5709..0000000 --- a/handheld/console-border/gg-6x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "7.200000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = "0.050000" -video_scale = "6.0" - -textures = "BORDER" -BORDER = "resources/gg-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/gg-4x.slangp b/handheld/console-border/gg.slangp similarity index 81% rename from handheld/console-border/gg-4x.slangp rename to handheld/console-border/gg.slangp index 9314e90..3709f14 100644 --- a/handheld/console-border/gg-4x.slangp +++ b/handheld/console-border/gg.slangp @@ -8,13 +8,12 @@ scale_x0 = "4.800000" scale_type_y0 = "source" scale_y0 = "4.000000" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "video_scale;GRID_STRENGTH" +parameters = "GRID_STRENGTH" GRID_STRENGTH = "0.050000" -video_scale = "4.0" textures = "BORDER" BORDER = "resources/gg-border-square-4x.png" diff --git a/handheld/console-border/psp-2x.slangp b/handheld/console-border/psp-2x.slangp deleted file mode 100644 index fb474a2..0000000 --- a/handheld/console-border/psp-2x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../../stock.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = 0.2 -video_scale = "2.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-3x.slangp b/handheld/console-border/psp-3x.slangp deleted file mode 100644 index 1dd4870..0000000 --- a/handheld/console-border/psp-3x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = 0.10 -video_scale = "3.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-4x.slangp b/handheld/console-border/psp-4x.slangp deleted file mode 100644 index 47846b5..0000000 --- a/handheld/console-border/psp-4x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = 0.15 -video_scale = "4.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-6x.slangp b/handheld/console-border/psp-6x.slangp deleted file mode 100644 index 0aeaf6c..0000000 --- a/handheld/console-border/psp-6x.slangp +++ /dev/null @@ -1,23 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/gb-pass-5.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "video_scale;GRID_STRENGTH" -GRID_STRENGTH = 0.15 -video_scale = "6.0" - -textures = "BORDER" -BORDER = "resources/psp border.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "true" \ No newline at end of file diff --git a/handheld/console-border/psp-5x.slangp b/handheld/console-border/psp.slangp similarity index 63% rename from handheld/console-border/psp-5x.slangp rename to handheld/console-border/psp.slangp index 9cb3894..725479c 100644 --- a/handheld/console-border/psp-5x.slangp +++ b/handheld/console-border/psp.slangp @@ -3,18 +3,15 @@ shaders = "2" shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" filter_linear0 = "false" wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "5.000000" -scale_type_y0 = "source" -scale_y0 = "5.000000" +scale_type0 = "source" +scale0 = "4.0" -shader1 = "shader-files/gb-pass-5.slang" +shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "video_scale;GRID_STRENGTH" +parameters = "GRID_STRENGTH" GRID_STRENGTH = 0.15 -video_scale = "5.0" textures = "BORDER" BORDER = "resources/psp border.png" From 1460ef4f01eef70d0a991a876dbdc56a8e5059eb Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sun, 8 May 2022 00:30:43 +0100 Subject: [PATCH 07/11] Add border_texture_scale for border shaders --- handheld/console-border/psp.slangp | 3 ++- handheld/console-border/shader-files/border-auto-scale.slang | 5 ++++- handheld/console-border/shader-files/gb-pass-5.slang | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/handheld/console-border/psp.slangp b/handheld/console-border/psp.slangp index 725479c..8528eb7 100644 --- a/handheld/console-border/psp.slangp +++ b/handheld/console-border/psp.slangp @@ -10,7 +10,8 @@ shader1 = "shader-files/border-auto-scale.slang" filter_linear1 = "true" wrap_mode1 = "clamp_to_border" -parameters = "GRID_STRENGTH" +parameters = "border_texture_scale;GRID_STRENGTH" +border_texture_scale = 2.5 GRID_STRENGTH = 0.15 textures = "BORDER" diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang index b76fbb1..b718fd2 100644 --- a/handheld/console-border/shader-files/border-auto-scale.slang +++ b/handheld/console-border/shader-files/border-auto-scale.slang @@ -5,11 +5,14 @@ layout(push_constant) uniform Push vec4 OutputSize; vec4 SourceSize; vec4 OriginalSize; + float border_texture_scale; } params; +#pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 + vec2 middle = vec2(0.5, 0.5); vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; -vec2 border_scale = vec2(800, 400) * (params.SourceSize.y / params.OriginalSize.y); +vec2 border_scale = vec2(3200, 1600) * (params.SourceSize.y / params.OriginalSize.y) / params.border_texture_scale; layout(std140, set = 0, binding = 0) uniform UBO { diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang index 74c6aa5..619bbad 100644 --- a/handheld/console-border/shader-files/gb-pass-5.slang +++ b/handheld/console-border/shader-files/gb-pass-5.slang @@ -6,13 +6,15 @@ layout(push_constant) uniform Push vec4 SourceSize; vec4 OriginalSize; float video_scale; + float border_texture_scale; } params; #pragma parameter video_scale "Video Scale" 3.0 2.0 20.0 1.0 +#pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 vec2 middle = vec2(0.5, 0.5); vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; -vec2 border_scale = vec2(800, 400) * params.video_scale; +vec2 border_scale = vec2(3200, 1600) * params.video_scale / params.border_texture_scale; layout(std140, set = 0, binding = 0) uniform UBO { From a289e43c06aecc151504fa2641838d2743805e11 Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sun, 8 May 2022 13:56:53 +0100 Subject: [PATCH 08/11] remove handheld border retro presets --- .../console-border/gba-retro-v2-2x.slangp | 28 ------------------- .../console-border/gba-retro-v2-3x.slangp | 28 ------------------- .../console-border/gba-retro-v2-4x.slangp | 28 ------------------- .../console-border/gba-retro-v2-5x.slangp | 28 ------------------- .../console-border/gba-retro-v2-6x.slangp | 28 ------------------- .../console-border/gbc-retro-v2-2x.slangp | 28 ------------------- .../console-border/gbc-retro-v2-3x.slangp | 28 ------------------- .../console-border/gbc-retro-v2-4x.slangp | 28 ------------------- .../console-border/gbc-retro-v2-5x.slangp | 28 ------------------- .../console-border/gbc-retro-v2-6x.slangp | 28 ------------------- .../console-border/gbc-retro-v2-7x.slangp | 28 ------------------- 11 files changed, 308 deletions(-) delete mode 100644 handheld/console-border/gba-retro-v2-2x.slangp delete mode 100644 handheld/console-border/gba-retro-v2-3x.slangp delete mode 100644 handheld/console-border/gba-retro-v2-4x.slangp delete mode 100644 handheld/console-border/gba-retro-v2-5x.slangp delete mode 100644 handheld/console-border/gba-retro-v2-6x.slangp delete mode 100644 handheld/console-border/gbc-retro-v2-2x.slangp delete mode 100644 handheld/console-border/gbc-retro-v2-3x.slangp delete mode 100644 handheld/console-border/gbc-retro-v2-4x.slangp delete mode 100644 handheld/console-border/gbc-retro-v2-5x.slangp delete mode 100644 handheld/console-border/gbc-retro-v2-6x.slangp delete mode 100644 handheld/console-border/gbc-retro-v2-7x.slangp diff --git a/handheld/console-border/gba-retro-v2-2x.slangp b/handheld/console-border/gba-retro-v2-2x.slangp deleted file mode 100644 index 13511a2..0000000 --- a/handheld/console-border/gba-retro-v2-2x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 2 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "2.0" -RETRO_PIXEL_SIZE = "0.55" diff --git a/handheld/console-border/gba-retro-v2-3x.slangp b/handheld/console-border/gba-retro-v2-3x.slangp deleted file mode 100644 index d7fbc16..0000000 --- a/handheld/console-border/gba-retro-v2-3x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 3 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "3.0" -RETRO_PIXEL_SIZE = "0.70" diff --git a/handheld/console-border/gba-retro-v2-4x.slangp b/handheld/console-border/gba-retro-v2-4x.slangp deleted file mode 100644 index 257d9c0..0000000 --- a/handheld/console-border/gba-retro-v2-4x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 4 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "4.0" -RETRO_PIXEL_SIZE = "0.75" diff --git a/handheld/console-border/gba-retro-v2-5x.slangp b/handheld/console-border/gba-retro-v2-5x.slangp deleted file mode 100644 index af36669..0000000 --- a/handheld/console-border/gba-retro-v2-5x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 5 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "5.0" -RETRO_PIXEL_SIZE = "0.80" diff --git a/handheld/console-border/gba-retro-v2-6x.slangp b/handheld/console-border/gba-retro-v2-6x.slangp deleted file mode 100644 index 51498c3..0000000 --- a/handheld/console-border/gba-retro-v2-6x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gba-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 6 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/gba-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "6.0" -RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gbc-retro-v2-2x.slangp b/handheld/console-border/gbc-retro-v2-2x.slangp deleted file mode 100644 index b0f3d96..0000000 --- a/handheld/console-border/gbc-retro-v2-2x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 2 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "2.0" -RETRO_PIXEL_SIZE = "0.55" diff --git a/handheld/console-border/gbc-retro-v2-3x.slangp b/handheld/console-border/gbc-retro-v2-3x.slangp deleted file mode 100644 index d22c306..0000000 --- a/handheld/console-border/gbc-retro-v2-3x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 3 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "3.0" -RETRO_PIXEL_SIZE = "0.7" diff --git a/handheld/console-border/gbc-retro-v2-4x.slangp b/handheld/console-border/gbc-retro-v2-4x.slangp deleted file mode 100644 index fdcf180..0000000 --- a/handheld/console-border/gbc-retro-v2-4x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 4 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "4.0" -RETRO_PIXEL_SIZE = "0.75" diff --git a/handheld/console-border/gbc-retro-v2-5x.slangp b/handheld/console-border/gbc-retro-v2-5x.slangp deleted file mode 100644 index 3cf7029..0000000 --- a/handheld/console-border/gbc-retro-v2-5x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 5 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "5.0" -RETRO_PIXEL_SIZE = "0.80" diff --git a/handheld/console-border/gbc-retro-v2-6x.slangp b/handheld/console-border/gbc-retro-v2-6x.slangp deleted file mode 100644 index 94e46fc..0000000 --- a/handheld/console-border/gbc-retro-v2-6x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 6 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "6.0" -RETRO_PIXEL_SIZE = "0.84" diff --git a/handheld/console-border/gbc-retro-v2-7x.slangp b/handheld/console-border/gbc-retro-v2-7x.slangp deleted file mode 100644 index bee13e9..0000000 --- a/handheld/console-border/gbc-retro-v2-7x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = 4 -shader0 = ../../motionblur/shaders/response-time.slang -shader1 = ../shaders/color/gbc-color.slang -shader2 = ../shaders/retro-v2.slang -shader3 = shader-files/gb-pass-5.slang - -scale_type0 = source -scale0 = 1 - -scale_type1 = source -scale1 = 1 - -scale_type2 = source -scale2 = 7 - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -textures = BORDER - -BORDER = resources/color-border-square-4x.png -BORDER_linear = true - -parameters = "video_scale;RETRO_PIXEL_SIZE" -video_scale = "7.0" -RETRO_PIXEL_SIZE = "0.84" From 521d5319084f90f29e0b7dfd422f522c7f3ef12f Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sun, 8 May 2022 14:18:52 +0100 Subject: [PATCH 09/11] NeoGeo Pocket Color cleanup --- handheld/console-border/ngpc-2x.slangp | 28 -------------------------- handheld/console-border/ngpc-3x.slangp | 28 -------------------------- handheld/console-border/ngpc-4x.slangp | 28 -------------------------- handheld/console-border/ngpc-5x.slangp | 28 -------------------------- handheld/console-border/ngpc-6x.slangp | 28 -------------------------- handheld/console-border/ngpc.slangp | 17 ++++++++++++++++ 6 files changed, 17 insertions(+), 140 deletions(-) delete mode 100644 handheld/console-border/ngpc-2x.slangp delete mode 100644 handheld/console-border/ngpc-3x.slangp delete mode 100644 handheld/console-border/ngpc-4x.slangp delete mode 100644 handheld/console-border/ngpc-5x.slangp delete mode 100644 handheld/console-border/ngpc-6x.slangp create mode 100644 handheld/console-border/ngpc.slangp diff --git a/handheld/console-border/ngpc-2x.slangp b/handheld/console-border/ngpc-2x.slangp deleted file mode 100644 index 494d94e..0000000 --- a/handheld/console-border/ngpc-2x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "2.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "1.05" -border_zoom_y = "1.18" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-3x.slangp b/handheld/console-border/ngpc-3x.slangp deleted file mode 100644 index 3841ecb..0000000 --- a/handheld/console-border/ngpc-3x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "3.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.70" -border_zoom_y = "0.79" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-4x.slangp b/handheld/console-border/ngpc-4x.slangp deleted file mode 100644 index e43b4f7..0000000 --- a/handheld/console-border/ngpc-4x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "4.000000" -scale_type_y0 = "source" -scale_y0 = "4.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "4.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.52" -border_zoom_y = "0.59" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-5x.slangp b/handheld/console-border/ngpc-5x.slangp deleted file mode 100644 index 6e4211f..0000000 --- a/handheld/console-border/ngpc-5x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "5.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.42" -border_zoom_y = "0.47" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc-6x.slangp b/handheld/console-border/ngpc-6x.slangp deleted file mode 100644 index c4cb5b0..0000000 --- a/handheld/console-border/ngpc-6x.slangp +++ /dev/null @@ -1,28 +0,0 @@ -shaders = "2" - -shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" -filter_linear0 = "false" -wrap_mode0 = "clamp_to_border" -scale_type_x0 = "source" -scale_x0 = "6.000000" -scale_type_y0 = "source" -scale_y0 = "6.000000" - -shader1 = "shader-files/border.slang" -filter_linear1 = "true" -wrap_mode1 = "clamp_to_border" - -parameters = "box_scale;in_res_x;in_res_y;border_on_top;border_zoom_x;border_zoom_y" -GRID_STRENGTH = "0.150000" -box_scale = "6.0" -in_res_x = "160.0" -in_res_y = "152.0" -border_on_top = "0.000000" -border_zoom_x = "0.35" -border_zoom_y = "0.39" - -textures = "BORDER" -BORDER = "resources/ngpc-border-square-4x.png" -BORDER_linear = "true" -BORDER_wrap_mode = "clamp_to_border" -BORDER_mipmap = "false" diff --git a/handheld/console-border/ngpc.slangp b/handheld/console-border/ngpc.slangp new file mode 100644 index 0000000..6261871 --- /dev/null +++ b/handheld/console-border/ngpc.slangp @@ -0,0 +1,17 @@ +shaders = "2" + +shader0 = "../shaders/lcd-cgwg/lcd-grid.slang" +filter_linear0 = "false" +wrap_mode0 = "clamp_to_border" +scale_type0 = "source" +scale0 = "4.0" + +shader1 = "shader-files/border-auto-scale.slang" +filter_linear1 = "true" +wrap_mode1 = "clamp_to_border" + +textures = "BORDER" +BORDER = "resources/ngpc-border-square-4x.png" +BORDER_linear = "true" +BORDER_wrap_mode = "clamp_to_border" +BORDER_mipmap = "false" From cb29629a2a3927a0368a1de39dd431254230abcb Mon Sep 17 00:00:00 2001 From: nfp0 Date: Sun, 8 May 2022 17:07:36 +0100 Subject: [PATCH 10/11] Adjusted PSP border scale --- handheld/console-border/psp.slangp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handheld/console-border/psp.slangp b/handheld/console-border/psp.slangp index 8528eb7..ee69754 100644 --- a/handheld/console-border/psp.slangp +++ b/handheld/console-border/psp.slangp @@ -11,7 +11,7 @@ filter_linear1 = "true" wrap_mode1 = "clamp_to_border" parameters = "border_texture_scale;GRID_STRENGTH" -border_texture_scale = 2.5 +border_texture_scale = 2.4 GRID_STRENGTH = 0.15 textures = "BORDER" From 2245052015c834ee69eddeea18222b54d469e20c Mon Sep 17 00:00:00 2001 From: nfp0 Date: Thu, 19 May 2022 20:58:27 +0100 Subject: [PATCH 11/11] handheld borders - removed unnecessary calculation --- handheld/console-border/shader-files/border-auto-scale.slang | 4 ++-- handheld/console-border/shader-files/gb-pass-5.slang | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang index b718fd2..d3e2e79 100644 --- a/handheld/console-border/shader-files/border-auto-scale.slang +++ b/handheld/console-border/shader-files/border-auto-scale.slang @@ -11,7 +11,7 @@ layout(push_constant) uniform Push #pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 vec2 middle = vec2(0.5, 0.5); -vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; +vec2 screen_ratio = params.OutputSize.xy * params.SourceSize.zw; vec2 border_scale = vec2(3200, 1600) * (params.SourceSize.y / params.OriginalSize.y) / params.border_texture_scale; layout(std140, set = 0, binding = 0) uniform UBO @@ -30,7 +30,7 @@ void main() gl_Position = global.MVP * Position; vec2 diff = TexCoord.xy - middle; - vTexCoord = middle + diff * screen_scale; + vTexCoord = middle + diff * screen_ratio; tex_border = middle + diff * params.OutputSize.xy / border_scale; } diff --git a/handheld/console-border/shader-files/gb-pass-5.slang b/handheld/console-border/shader-files/gb-pass-5.slang index 619bbad..935ad29 100644 --- a/handheld/console-border/shader-files/gb-pass-5.slang +++ b/handheld/console-border/shader-files/gb-pass-5.slang @@ -13,7 +13,6 @@ layout(push_constant) uniform Push #pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 vec2 middle = vec2(0.5, 0.5); -vec2 screen_scale = params.OutputSize.xy * params.SourceSize.zw; vec2 border_scale = vec2(3200, 1600) * params.video_scale / params.border_texture_scale; layout(std140, set = 0, binding = 0) uniform UBO @@ -31,8 +30,9 @@ void main() { gl_Position = global.MVP * Position; + vTexCoord = TexCoord.xy; + vec2 diff = TexCoord.xy - middle; - vTexCoord = middle + diff * screen_scale; tex_border = middle + diff * params.OutputSize.xy / border_scale; }