diff options
| author | FernandoS27 <fsahmkow27@gmail.com> | 2021-10-20 18:56:34 +0200 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2021-11-16 22:11:31 +0100 |
| commit | e7fc60406ef5309268d77edb5e5266febe147e53 (patch) | |
| tree | 11a408f3b072272ecfb3ca37f06187fc4f0ff732 | |
| parent | TextureCache: fix rescaling in aliases and overlap joins. (diff) | |
| download | yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.gz yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.bz2 yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.lz yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.xz yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.zst yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.zip | |
| -rw-r--r-- | src/common/settings.cpp | 13 | ||||
| -rw-r--r-- | src/common/settings.h | 11 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.ui | 21 |
3 files changed, 38 insertions, 7 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index bc2c8c7d7..84ac937e5 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -116,6 +116,11 @@ void UpdateRescalingInfo() { info.down_shift = 1; info.downscale = true; break; + case ResolutionSetup::Res3_4X: + info.up_scale = 3; + info.down_shift = 2; + info.downscale = true; + break; case ResolutionSetup::Res1X: info.up_scale = 1; info.down_shift = 0; @@ -132,6 +137,14 @@ void UpdateRescalingInfo() { info.up_scale = 4; info.down_shift = 0; break; + case ResolutionSetup::Res5X: + info.up_scale = 5; + info.down_shift = 0; + break; + case ResolutionSetup::Res6X: + info.up_scale = 6; + info.down_shift = 0; + break; default: UNREACHABLE(); info.up_scale = 1; diff --git a/src/common/settings.h b/src/common/settings.h index 84dab5217..f6acf5bdf 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -54,10 +54,13 @@ enum class NvdecEmulation : u32 { enum class ResolutionSetup : u32 { Res1_2X = 0, - Res1X = 1, - Res2X = 2, - Res3X = 3, - Res4X = 4, + Res3_4X = 1, + Res1X = 2, + Res2X = 3, + Res3X = 4, + Res4X = 5, + Res5X = 6, + Res6X = 7, }; enum class ScalingFilter : u32 { diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index fe2f6bb7f..c1d7e8349 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -335,7 +335,12 @@ <widget class="QComboBox" name="resolution_combobox"> <item> <property name="text"> - <string>0.5X (360p/540p)</string> + <string>0.5X (360p/540p)[MAY BREAK]</string> + </property> + </item> + <item> + <property name="text"> + <string>0.75X (540p/810p)[MAY BREAK]</string> </property> </item> <item> @@ -350,12 +355,22 @@ </item> <item> <property name="text"> - <string>3X (2160p[4K]/3240p[6K])</string> + <string>3X (2160p[4K]/3240p)</string> + </property> + </item> + <item> + <property name="text"> + <string>4X (2880p/4320p)</string> + </property> + </item> + <item> + <property name="text"> + <string>5X (3600p/5400p)</string> </property> </item> <item> <property name="text"> - <string>4X (2880p/4320p[8K])</string> + <string>6X (4320p/6480p)</string> </property> </item> </widget> |