From 3ba53f2511b2089656f7a16b6d6d8f7ef54e3a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= Date: Fri, 13 Jan 2023 02:34:24 -0300 Subject: 1.5X resolution scaler option --- src/common/settings.cpp | 4 ++++ src/common/settings.h | 11 ++++++----- src/yuzu/configuration/configure_graphics.ui | 5 +++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 1638b79f5..6a5569fe0 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -129,6 +129,10 @@ void UpdateRescalingInfo() { info.up_scale = 1; info.down_shift = 0; break; + case ResolutionSetup::Res3_2X: + info.up_scale = 3; + info.down_shift = 1; + break; case ResolutionSetup::Res2X: info.up_scale = 2; info.down_shift = 0; diff --git a/src/common/settings.h b/src/common/settings.h index a457e3f23..d31784cfc 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -56,11 +56,12 @@ enum class ResolutionSetup : u32 { Res1_2X = 0, Res3_4X = 1, Res1X = 2, - Res2X = 3, - Res3X = 4, - Res4X = 5, - Res5X = 6, - Res6X = 7, + Res3_2X = 3, + Res2X = 4, + Res3X = 5, + Res4X = 6, + Res5X = 7, + Res6X = 8, }; enum class ScalingFilter : u32 { diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index aa02cc63c..8b02228fc 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -364,6 +364,11 @@ 1X (720p/1080p) + + + 1.5X (1080p/1620p) [EXPERIMENTAL] + + 2X (1440p/2160p) -- cgit v1.2.3 From bb2aec00a2529c998998fc6ffe4617f464a9710b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= <42481638+goldenx86@users.noreply.github.com> Date: Fri, 13 Jan 2023 04:54:29 -0300 Subject: UI change --- src/yuzu/configuration/configure_graphics.ui | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 8b02228fc..bb9910a53 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -394,6 +394,16 @@ 6X (4320p/6480p) + + + 7X (5040p/7560p) + + + + + 8X (5760p/8640p) + + -- cgit v1.2.3 From 4294429a079a5902531d36d86229eb970b0c3d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= <42481638+goldenx86@users.noreply.github.com> Date: Fri, 13 Jan 2023 04:55:26 -0300 Subject: CPP --- src/common/settings.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6a5569fe0..b1a2aa8b2 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -153,6 +153,14 @@ void UpdateRescalingInfo() { info.up_scale = 6; info.down_shift = 0; break; + case ResolutionSetup::Res7X: + info.up_scale = 7; + info.down_shift = 0; + break; + case ResolutionSetup::Res8X: + info.up_scale = 8; + info.down_shift = 0; + break; default: ASSERT(false); info.up_scale = 1; -- cgit v1.2.3 From d7dbd8e7742328d8a69bd7e01e1bd8cf6d545892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Locatti?= <42481638+goldenx86@users.noreply.github.com> Date: Fri, 13 Jan 2023 04:56:25 -0300 Subject: Update settings.h --- src/common/settings.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/settings.h b/src/common/settings.h index d31784cfc..80b2eeabc 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -62,6 +62,8 @@ enum class ResolutionSetup : u32 { Res4X = 6, Res5X = 7, Res6X = 8, + Res7X = 9, + Res8X = 10, }; enum class ScalingFilter : u32 { -- cgit v1.2.3