mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-09-04 03:35:19 +02:00
Revert "Remove the Android display resolution selector"
This reverts commit ea0eaa31e6.
This commit is contained in:
@@ -300,6 +300,34 @@ static int DefaultFastForwardMode() {
|
||||
#endif
|
||||
}
|
||||
|
||||
static int DefaultAndroidHwScale() {
|
||||
#ifdef __ANDROID__
|
||||
if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 19 || System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) {
|
||||
// Arbitrary cutoff at Kitkat - modern devices are usually powerful enough that hw scaling
|
||||
// doesn't really help very much and mostly causes problems. See #11151
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Get the real resolution as passed in during startup, not dp_xres and stuff
|
||||
int xres = System_GetPropertyInt(SYSPROP_DISPLAY_XRES);
|
||||
int yres = System_GetPropertyInt(SYSPROP_DISPLAY_YRES);
|
||||
|
||||
if (xres <= 960) {
|
||||
// Smaller than the PSP*2, let's go native.
|
||||
return 0;
|
||||
} else if (xres <= 480 * 3) { // 720p xres
|
||||
// Small-ish screen, we should default to 2x
|
||||
return 2 + 1;
|
||||
} else {
|
||||
// Large or very large screen. Default to 3x psp resolution.
|
||||
return 3 + 1;
|
||||
}
|
||||
return 0;
|
||||
#else
|
||||
return 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
// See issue 14439. Should possibly even block these devices from selecting VK.
|
||||
const char * const vulkanDefaultBlacklist[] = {
|
||||
"Sony:BRAVIA VH1",
|
||||
@@ -498,6 +526,7 @@ static const ConfigSetting graphicsSettings[] = {
|
||||
ConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true, CfgFlag::PER_GAME | CfgFlag::REPORT),
|
||||
ConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1, CfgFlag::PER_GAME | CfgFlag::REPORT),
|
||||
ConfigSetting("InternalResolution", &g_Config.iInternalResolution, &DefaultInternalResolution, CfgFlag::PER_GAME | CfgFlag::REPORT),
|
||||
ConfigSetting("AndroidHwScale", &g_Config.iAndroidHwScale, &DefaultAndroidHwScale, CfgFlag::DEFAULT),
|
||||
ConfigSetting("HighQualityDepth", &g_Config.bHighQualityDepth, true, CfgFlag::PER_GAME | CfgFlag::REPORT),
|
||||
ConfigSetting("FrameSkip", &g_Config.iFrameSkip, 0, CfgFlag::PER_GAME | CfgFlag::REPORT),
|
||||
ConfigSetting("FrameSkipType", &g_Config.iFrameSkipType, 0, CfgFlag::PER_GAME | CfgFlag::REPORT),
|
||||
|
||||
Reference in New Issue
Block a user