yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #9612 from goldenx86/1.5xScaler 

1.5X, 7X, 8X resolution scaler options
This commit is contained in:
bunnei 2023-01-16 17:49:06 -08:00 committed by GitHub
parent 58a10ed5d0 d7dbd8e774
commit 28fde29924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/settings.cpp
View File

@ -129,6 +129,10 @@ void UpdateRescalingInfo() {
info.up_scale = 1; info.up_scale = 1;
info.down_shift = 0; info.down_shift = 0;
break; break;
case ResolutionSetup::Res3_2X:
info.up_scale = 3;
info.down_shift = 1;
break;
case ResolutionSetup::Res2X: case ResolutionSetup::Res2X:
info.up_scale = 2; info.up_scale = 2;
info.down_shift = 0; info.down_shift = 0;
@ -149,6 +153,14 @@ void UpdateRescalingInfo() {
info.up_scale = 6; info.up_scale = 6;
info.down_shift = 0; info.down_shift = 0;
break; 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: default:
ASSERT(false); ASSERT(false);
info.up_scale = 1; info.up_scale = 1;

13
src/common/settings.h
View File

@ -56,11 +56,14 @@ enum class ResolutionSetup : u32 {
Res1_2X = 0, Res1_2X = 0,
Res3_4X = 1, Res3_4X = 1,
Res1X = 2, Res1X = 2,
Res2X = 3, Res3_2X = 3,
Res3X = 4, Res2X = 4,
Res4X = 5, Res3X = 5,
Res5X = 6, Res4X = 6,
Res6X = 7, Res5X = 7,
Res6X = 8,
Res7X = 9,
Res8X = 10,
}; };
enum class ScalingFilter : u32 { enum class ScalingFilter : u32 {

15
src/yuzu/configuration/configure_graphics.ui
View File

@ -364,6 +364,11 @@
<string>1X (720p/1080p)</string> <string>1X (720p/1080p)</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>1.5X (1080p/1620p) [EXPERIMENTAL]</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>2X (1440p/2160p)</string> <string>2X (1440p/2160p)</string>
@ -389,6 +394,16 @@
<string>6X (4320p/6480p)</string> <string>6X (4320p/6480p)</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>7X (5040p/7560p)</string>
</property>
</item>
<item>
<property name="text">
<string>8X (5760p/8640p)</string>
</property>
</item>
</widget> </widget>
</item> </item>
</layout> </layout>