Revert "infra: Conditionally compile Metal & OpenGL depending on if the target RuntimeIdentifier is mac"

This reverts commit 2f93a0f706.

docs/compatibility.csv

@@ -3348,7 +3348,7 @@
 01001C400482C000,"Wunderling DX",audio;crash,ingame,2022-09-10 13:20:12
 01003B401148E000,"Wurroom",,playable,2020-10-07 22:46:21
 010081700EDF4000,"WWE 2K Battlegrounds",nvdec;online-broken;UE4,playable,2022-10-07 12:44:40
-010009800203E000,"WWE 2K18",nvdec,playable,2023-10-21 17:22:01
+010009800203E000,"WWE 2K18",nvdec;online-broken,ingame,2025-01-17 11:36:56
 0100DF100B97C000,"X-Morph: Defense",,playable,2020-06-22 11:05:31
 0100D0B00FB74000,"XCOM® 2 Collection",gpu;crash,ingame,2022-10-04 09:38:30
 0100CC9015360000,"XEL",gpu,ingame,2022-10-03 10:19:39
@@ -3421,4 +3421,4 @@
 0100936018EB4000,"牧場物語 Welcome！ワンダフルライフ",crash,ingame,2023-04-25 19:43:52
 0100F4401940A000,"超探偵事件簿 レインコード  (Master Detective Archives: Rain Code)",crash,ingame,2024-02-12 20:58:31
 010064801A01C000,"超次元ゲイム ネプテューヌ GameMaker R:Evolution",crash,nothing,2023-10-30 22:37:40
-0100F3400332C000,"ゼノブレイド2",deadlock;amd-vendor-bug,ingame,2024-03-28 14:31:41
+0100F3400332C000,"ゼノブレイド2",deadlock;amd-vendor-bug,ingame,2024-03-28 14:31:41

src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs

@@ -176,9 +176,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                         AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                         AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);
 
-                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
-                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
-                        else if (isApplication)
+                        if (isApplication)
                             Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");
 
                         break;

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -228,8 +228,6 @@ namespace Ryujinx.Headless
             _inputConfiguration ??= [];
             _enableKeyboard = option.EnableKeyboard;
             _enableMouse = option.EnableMouse;
-
-
             
             LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
             LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
@@ -301,7 +299,10 @@ namespace Ryujinx.Headless
                 _userChannelPersistence.ShouldRestart = false;
             }
 
-            _inputManager.Dispose();
+            try
+            {
+                _inputManager.Dispose();
+            } catch {}
 
             return;
             
@@ -338,12 +339,12 @@ namespace Ryujinx.Headless
         {
             string label = state switch
             {
-                LoadState => $"PTC : {current}/{total}",
-                ShaderCacheState => $"Shaders : {current}/{total}",
-                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}"),
+                LoadState => "PTC",
+                ShaderCacheState => "Shaders",
+                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}")
             };
 
-            Logger.Info?.Print(LogClass.Application, label);
+            Logger.Info?.Print(LogClass.Application, $"{label} : {current}/{total}");
         }
 
         private static WindowBase CreateWindow(Options options)

src/Ryujinx/Headless/Windows/MetalWindow.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Headless
             bool ignoreControllerApplet)
             : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_METAL;
 
         protected override void InitializeWindowRenderer()
         {

src/Ryujinx/Headless/Windows/OpenGLWindow.cs

@@ -124,7 +124,7 @@ namespace Ryujinx.Headless
             _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;
 
         protected override void InitializeWindowRenderer()
         {

src/Ryujinx/Headless/Windows/VulkanWindow.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Headless
             _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_VULKAN;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_VULKAN;
 
         protected override void InitializeWindowRenderer() { }
 

src/Ryujinx/Headless/Windows/WindowBase.cs

@@ -1,6 +1,7 @@
 using Humanizer;
 using LibHac.Tools.Fs;
 using Ryujinx.Ava;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
@@ -137,7 +138,7 @@ namespace Ryujinx.Headless
 
         private void SetWindowIcon()
         {
-            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
+            Stream iconStream = EmbeddedResources.GetStream("Ryujinx/Assets/UIImages/Logo_Ryujinx.png");
             byte[] iconBytes = new byte[iconStream!.Length];
 
             if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
@@ -191,7 +192,7 @@ namespace Ryujinx.Headless
                 FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
             }
 
-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);
 
             if (WindowHandle == nint.Zero)
             {
@@ -246,7 +247,7 @@ namespace Ryujinx.Headless
 
         protected abstract void SwapBuffers();
 
-        public abstract SDL_WindowFlags GetWindowFlags();
+        public abstract SDL_WindowFlags WindowFlags { get; }
 
         private string GetGpuDriverName()
         {

src/Ryujinx/Ryujinx.csproj

@@ -166,7 +166,6 @@
     <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
-    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />

src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml

@@ -7,6 +7,7 @@
     Title="Ryujinx - Waiting"
     SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterOwner"
+    CanResize="False"
     mc:Ignorable="d"
     Focusable="True">
     <Grid

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -136,6 +136,12 @@
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                             </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
+                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel