Merge remote-tracking branch 'upstream/dev' into dev

src/common/settings.h

@@ -612,7 +612,7 @@ struct Values {
 
     // WebService
     Setting<bool> enable_telemetry{linkage, false, "enable_telemetry", Category::WebService};
-    Setting<std::string> web_api_url{linkage, "https://api.suyu.dev", "web_api_url",
+    Setting<std::string> web_api_url{linkage, "https://suyu.dev", "web_api_url",
                                      Category::WebService};
     Setting<std::string> suyu_username{linkage, std::string(), "suyu_username",
                                        Category::WebService};

src/common/settings_enums.h

@@ -149,7 +149,7 @@ ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, ScaleForce, Fs
 
 ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);
 
-ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
+ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, R32_9, Stretch);
 
 ENUM(ConsoleMode, Handheld, Docked);
 

src/core/frontend/framebuffer_layout.cpp

@@ -70,6 +70,8 @@ float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio) {
         return 9.0f / 21.0f;
     case AspectRatio::R16_10:
         return 10.0f / 16.0f;
+    case AspectRatio::R32_9:
+        return 9.0f / 32.0f;
     case AspectRatio::StretchToWindow:
         return window_aspect_ratio;
     default:

src/core/frontend/framebuffer_layout.h

@@ -28,6 +28,7 @@ enum class AspectRatio {
     R4_3,
     R21_9,
     R16_10,
+    R32_9,
     StretchToWindow,
 };
 

src/core/hle/service/set/system_settings_server.cpp

@@ -939,7 +939,7 @@ Result ISystemSettingsServer::GetBatteryLot(Out<BatteryLot> out_battery_lot) {
 Result ISystemSettingsServer::GetSerialNumber(Out<SerialNumber> out_console_serial) {
     LOG_INFO(Service_SET, "called");
 
-    *out_console_serial = SerialNumber("YUZ10000000001");
+    *out_console_serial = SerialNumber("SUY10000000001");
     R_SUCCEED();
 }
 

src/suyu/configuration/shared_translation.cpp

@@ -406,6 +406,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
                               PAIR(AspectRatio, R4_3, tr("Force 4:3")),
                               PAIR(AspectRatio, R21_9, tr("Force 21:9")),
                               PAIR(AspectRatio, R16_10, tr("Force 16:10")),
+                              PAIR(AspectRatio, R32_9, tr("Force 32:9")),
                               PAIR(AspectRatio, Stretch, tr("Stretch to Window")),
                           }});
     translations->insert({Settings::EnumMetadata<Settings::AnisotropyMode>::Index(),

src/suyu/uisettings.cpp

@@ -47,6 +47,8 @@ u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) {
         return height * 21 / 9;
     case Settings::AspectRatio::R16_10:
         return height * 16 / 10;
+    case Settings::AspectRatio::R32_9:
+        return height * 32 / 9;
     case Settings::AspectRatio::R16_9:
     case Settings::AspectRatio::Stretch:
         // TODO: Move this function wherever appropriate to implement Stretched aspect