Merge pull request hrydgard#11392 from hrydgard/android-hw-scale-off

Android: Don't use "hw scaling" on modern devices by default.
Skyl3r · Sep 16, 2018 · ad6938d · ad6938d
2 parents d63d2b9 + 3f849bb
commit ad6938d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -510,6 +510,12 @@ static bool DefaultTimerHack() {
 
 static int DefaultAndroidHwScale() {
 #ifdef __ANDROID__
+	if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 19) {
+		// 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);