diff options
| author | 2021-10-20 18:56:34 +0200 | |
|---|---|---|
| committer | 2021-11-16 22:11:31 +0100 | |
| commit | e7fc60406ef5309268d77edb5e5266febe147e53 (patch) | |
| tree | 11a408f3b072272ecfb3ca37f06187fc4f0ff732 /src | |
| parent | TextureCache: fix rescaling in aliases and overlap joins. (diff) | |
| download | yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.gz yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.tar.xz yuzu-e7fc60406ef5309268d77edb5e5266febe147e53.zip | |
VideoCore: Add more rescaling option.
Diffstat (limited to 'src')
| -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() { | |||
| 116 | info.down_shift = 1; | 116 | info.down_shift = 1; |
| 117 | info.downscale = true; | 117 | info.downscale = true; |
| 118 | break; | 118 | break; |
| 119 | case ResolutionSetup::Res3_4X: | ||
| 120 | info.up_scale = 3; | ||
| 121 | info.down_shift = 2; | ||
| 122 | info.downscale = true; | ||
| 123 | break; | ||
| 119 | case ResolutionSetup::Res1X: | 124 | case ResolutionSetup::Res1X: |
| 120 | info.up_scale = 1; | 125 | info.up_scale = 1; |
| 121 | info.down_shift = 0; | 126 | info.down_shift = 0; |
| @@ -132,6 +137,14 @@ void UpdateRescalingInfo() { | |||
| 132 | info.up_scale = 4; | 137 | info.up_scale = 4; |
| 133 | info.down_shift = 0; | 138 | info.down_shift = 0; |
| 134 | break; | 139 | break; |
| 140 | case ResolutionSetup::Res5X: | ||
| 141 | info.up_scale = 5; | ||
| 142 | info.down_shift = 0; | ||
| 143 | break; | ||
| 144 | case ResolutionSetup::Res6X: | ||
| 145 | info.up_scale = 6; | ||
| 146 | info.down_shift = 0; | ||
| 147 | break; | ||
| 135 | default: | 148 | default: |
| 136 | UNREACHABLE(); | 149 | UNREACHABLE(); |
| 137 | info.up_scale = 1; | 150 | 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 { | |||
| 54 | 54 | ||
| 55 | enum class ResolutionSetup : u32 { | 55 | enum class ResolutionSetup : u32 { |
| 56 | Res1_2X = 0, | 56 | Res1_2X = 0, |
| 57 | Res1X = 1, | 57 | Res3_4X = 1, |
| 58 | Res2X = 2, | 58 | Res1X = 2, |
| 59 | Res3X = 3, | 59 | Res2X = 3, |
| 60 | Res4X = 4, | 60 | Res3X = 4, |
| 61 | Res4X = 5, | ||
| 62 | Res5X = 6, | ||
| 63 | Res6X = 7, | ||
| 61 | }; | 64 | }; |
| 62 | 65 | ||
| 63 | enum class ScalingFilter : u32 { | 66 | 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 @@ | |||
| 335 | <widget class="QComboBox" name="resolution_combobox"> | 335 | <widget class="QComboBox" name="resolution_combobox"> |
| 336 | <item> | 336 | <item> |
| 337 | <property name="text"> | 337 | <property name="text"> |
| 338 | <string>0.5X (360p/540p)</string> | 338 | <string>0.5X (360p/540p)[MAY BREAK]</string> |
| 339 | </property> | ||
| 340 | </item> | ||
| 341 | <item> | ||
| 342 | <property name="text"> | ||
| 343 | <string>0.75X (540p/810p)[MAY BREAK]</string> | ||
| 339 | </property> | 344 | </property> |
| 340 | </item> | 345 | </item> |
| 341 | <item> | 346 | <item> |
| @@ -350,12 +355,22 @@ | |||
| 350 | </item> | 355 | </item> |
| 351 | <item> | 356 | <item> |
| 352 | <property name="text"> | 357 | <property name="text"> |
| 353 | <string>3X (2160p[4K]/3240p[6K])</string> | 358 | <string>3X (2160p[4K]/3240p)</string> |
| 359 | </property> | ||
| 360 | </item> | ||
| 361 | <item> | ||
| 362 | <property name="text"> | ||
| 363 | <string>4X (2880p/4320p)</string> | ||
| 364 | </property> | ||
| 365 | </item> | ||
| 366 | <item> | ||
| 367 | <property name="text"> | ||
| 368 | <string>5X (3600p/5400p)</string> | ||
| 354 | </property> | 369 | </property> |
| 355 | </item> | 370 | </item> |
| 356 | <item> | 371 | <item> |
| 357 | <property name="text"> | 372 | <property name="text"> |
| 358 | <string>4X (2880p/4320p[8K])</string> | 373 | <string>6X (4320p/6480p)</string> |
| 359 | </property> | 374 | </property> |
| 360 | </item> | 375 | </item> |
| 361 | </widget> | 376 | </widget> |