VERY experimental Nintendo Switch 2 emulator
C++
settings: Add AspectRatio enum, split res scale function
lat9nq276bc8054481
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex 15fd2e2227..16a58a7506 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -207,9 +207,7 @@ const char* TranslateCategory(Category category) {return "Miscellaneous";}-void UpdateRescalingInfo() {- const auto setup = values.resolution_setup.GetValue();- auto& info = values.resolution_info;+void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info) {info.downscale = false;switch (setup) {case ResolutionSetup::Res1_2X:@@ -269,6 +267,12 @@ void UpdateRescalingInfo() {info.active = info.up_scale != 1 || info.down_shift != 0;}+void UpdateRescalingInfo() {+ const auto setup = values.resolution_setup.GetValue();+ auto& info = values.resolution_info;+ TranslateResolutionInfo(setup, info);+}+void RestoreGlobalState(bool is_powered_on) {// If a game is running, DO NOT restore the global settings stateif (is_powered_on) {diff --git a/src/common/settings.h b/src/common/settings.hindex b0bc6519a6..4407c1e6da 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -525,6 +525,7 @@ std::string GetTimeZoneString(TimeZone time_zone);void LogSettings();+void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info);void UpdateRescalingInfo();// Restore the global state of all applicable settings in the Values structdiff --git a/src/common/settings_enums.h b/src/common/settings_enums.hindex e7cb59ea5b..4edfd2bfb9 100644--- a/src/common/settings_enums.h+++ b/src/common/settings_enums.h@@ -146,6 +146,8 @@ ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);+ENUM(ScreenshotAspectRatio, Auto, R16_9, R4_3, R21_9, R16_10);+template <typename Type>inline std::string CanonicalizeEnum(Type id) {const auto group = EnumMetadata<Type>::Canonicalizations();