From 8afdd53387d855bbfd34c48a7f23a31a3a54ad6e Mon Sep 17 00:00:00 2001 From: Nuno Pereira Date: Mon, 3 Oct 2022 23:55:30 +0100 Subject: [PATCH 1/3] Cleanup scale settings on some handheld-border presets to avoid user confusion when scaling --- handheld/console-border/gba-agb001-color-motionblur.slangp | 4 ---- handheld/console-border/gba-ags001-color-motionblur.slangp | 6 ------ handheld/console-border/gba-lcd-grid-v2.slangp | 6 ------ handheld/console-border/gba.slangp | 2 -- handheld/console-border/gbc-lcd-grid-v2.slangp | 6 ------ 5 files changed, 24 deletions(-) diff --git a/handheld/console-border/gba-agb001-color-motionblur.slangp b/handheld/console-border/gba-agb001-color-motionblur.slangp index 399b322..1880d86 100644 --- a/handheld/console-border/gba-agb001-color-motionblur.slangp +++ b/handheld/console-border/gba-agb001-color-motionblur.slangp @@ -2,8 +2,6 @@ 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 @@ -12,8 +10,6 @@ scale1 = 4.0 shader2 = ../shaders/color/gba-color.slang filter_linear2 = false -scale_type2 = source -scale2 = 1.0 shader3 = shader-files/border-auto-scale.slang filter_linear3 = true diff --git a/handheld/console-border/gba-ags001-color-motionblur.slangp b/handheld/console-border/gba-ags001-color-motionblur.slangp index 68b72fc..2f82fcc 100644 --- a/handheld/console-border/gba-ags001-color-motionblur.slangp +++ b/handheld/console-border/gba-ags001-color-motionblur.slangp @@ -2,8 +2,6 @@ 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 @@ -12,13 +10,9 @@ 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/border-auto-scale.slang filter_linear4 = true diff --git a/handheld/console-border/gba-lcd-grid-v2.slangp b/handheld/console-border/gba-lcd-grid-v2.slangp index 725c136..16e9bae 100644 --- a/handheld/console-border/gba-lcd-grid-v2.slangp +++ b/handheld/console-border/gba-lcd-grid-v2.slangp @@ -4,15 +4,9 @@ shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang shader2 = ../shaders/color/gba-color.slang shader3 = shader-files/border-auto-scale.slang -scale_type0 = source -scale0 = 1 - scale_type1 = source scale1 = 4 -scale_type2 = source -scale2 = 1 - filter_linear0 = false filter_linear1 = false filter_linear2 = false diff --git a/handheld/console-border/gba.slangp b/handheld/console-border/gba.slangp index adbf78a..db16ce4 100644 --- a/handheld/console-border/gba.slangp +++ b/handheld/console-border/gba.slangp @@ -1,8 +1,6 @@ shaders = "4" shader0 = "../../motionblur/shaders/feedback.slang" -scale_type0 = source -scale0 = 1.0 filter_linear0 = false shader1 = "../shaders/color/gba-color.slang" diff --git a/handheld/console-border/gbc-lcd-grid-v2.slangp b/handheld/console-border/gbc-lcd-grid-v2.slangp index 92b33f9..096b647 100644 --- a/handheld/console-border/gbc-lcd-grid-v2.slangp +++ b/handheld/console-border/gbc-lcd-grid-v2.slangp @@ -4,15 +4,9 @@ shader1 = ../shaders/lcd-cgwg/lcd-grid-v2.slang shader2 = ../shaders/color/gbc-color.slang shader3 = shader-files/border-auto-scale.slang -scale_type0 = source -scale0 = 1 - scale_type1 = source scale1 = 4 -scale_type2 = source -scale2 = 1 - filter_linear0 = false filter_linear1 = false filter_linear2 = false From e9db5851be04f2b2ac917a3d42f89729fe9a85d3 Mon Sep 17 00:00:00 2001 From: Nuno Pereira Date: Tue, 4 Oct 2022 00:43:01 +0100 Subject: [PATCH 2/3] Instructions on how to change scale for border-auto-scale presets --- handheld/console-border/shader-files/border-auto-scale.slang | 1 + 1 file changed, 1 insertion(+) diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang index d3e2e79..c6d2e5d 100644 --- a/handheld/console-border/shader-files/border-auto-scale.slang +++ b/handheld/console-border/shader-files/border-auto-scale.slang @@ -8,6 +8,7 @@ layout(push_constant) uniform Push float border_texture_scale; } params; +#pragma parameter bogus_scale_instructions "[SCREEN SIZE]: In previous menu->Change lcd-grid scale->Apply" 0.0 0.0 1.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); From 9725f050329eb3314790fb02700e09b237eb6c43 Mon Sep 17 00:00:00 2001 From: Nuno Pereira Date: Mon, 17 Oct 2022 21:31:37 +0100 Subject: [PATCH 3/3] change order for instructions parameter --- handheld/console-border/shader-files/border-auto-scale.slang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handheld/console-border/shader-files/border-auto-scale.slang b/handheld/console-border/shader-files/border-auto-scale.slang index c6d2e5d..4959726 100644 --- a/handheld/console-border/shader-files/border-auto-scale.slang +++ b/handheld/console-border/shader-files/border-auto-scale.slang @@ -8,8 +8,8 @@ layout(push_constant) uniform Push float border_texture_scale; } params; -#pragma parameter bogus_scale_instructions "[SCREEN SIZE]: In previous menu->Change lcd-grid scale->Apply" 0.0 0.0 1.0 1.0 #pragma parameter border_texture_scale "Border Scale" 4.0 1.0 20.0 0.005 +#pragma parameter bogus_scale_instructions "[SCREEN SIZE]: In previous menu->Change lcd-grid scale->Apply" 0.0 0.0 1.0 1.0 vec2 middle = vec2(0.5, 0.5); vec2 screen_ratio = params.OutputSize.xy * params.SourceSize.zw;