UI: Directly proxy window properties on the view model back to the stored window

UI: Redirect IME errors to Debug instead of error
UI: Set title bar icon to the already loaded one
2025-09-11 20:37:35 +00:00 · 2024-12-26 23:32:53 -06:00 · 2024-12-26 23:13:35 -06:00 · 2024-12-26 22:58:49 -06:00 · 2024-12-26 22:46:18 -06:00 · 2024-12-26 00:29:00 -06:00
20 changed files with 286 additions and 269 deletions
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -80,11 +80,16 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal.SharpMetalExtensions", "src/Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj", "{81EA598C-DBA1-40B0-8DA4-4796B78F2037}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -94,8 +99,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.BuildValidationTasks", "src\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj", "{4A89A234-4F19-497D-A576-DDE8CDFC5B22}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,6 +268,10 @@ Global
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
+++ b/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
@@ -1,4 +1,5 @@
 using ARMeilleure.State;
+using Humanizer;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
@@ -58,8 +59,8 @@ namespace ARMeilleure.Translation.PTC
        {
            _ptc = ptc;

-            _timer = new Timer(SaveInterval * 1000d);
-            _timer.Elapsed += PreSave;
+            _timer = new Timer(SaveInterval.Seconds());
+            _timer.Elapsed += TimerElapsed;

            _outerHeaderMagic = BinaryPrimitives.ReadUInt64LittleEndian(EncodingCache.UTF8NoBOM.GetBytes(OuterHeaderMagicString).AsSpan());

@@ -72,6 +73,9 @@ namespace ARMeilleure.Translation.PTC
            Enabled = false;
        }

+        private void TimerElapsed(object _, ElapsedEventArgs __) 
+            => new Thread(PreSave) { Name = "Ptc.DiskWriter" }.Start();
+
        public void AddEntry(ulong address, ExecutionMode mode, bool highCq)
        {
            if (IsAddressInStaticCodeRange(address))
@@ -262,7 +266,7 @@ namespace ARMeilleure.Translation.PTC
            compressedStream.SetLength(0L);
        }

-        private void PreSave(object source, ElapsedEventArgs e)
+        private void PreSave()
        {
            _waitEvent.Reset();

@@ -428,7 +432,7 @@ namespace ARMeilleure.Translation.PTC
            {
                _disposed = true;

-                _timer.Elapsed -= PreSave;
+                _timer.Elapsed -= TimerElapsed;
                _timer.Dispose();

                Wait();
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -0,0 +1,190 @@
+using Gommon;
+using Ryujinx.Common.Configuration;
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Common
+{
+    public static class TitleIDs
+    {
+        public static GraphicsBackend SelectGraphicsBackend(string titleId, GraphicsBackend currentBackend)
+        {
+            switch (currentBackend)
+            {
+                case GraphicsBackend.OpenGl when OperatingSystem.IsMacOS():
+                    return GraphicsBackend.Vulkan;
+                case GraphicsBackend.Vulkan or GraphicsBackend.OpenGl or GraphicsBackend.Metal:
+                    return currentBackend;
+            }
+
+            if (!(OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture is Architecture.Arm64))
+                return GraphicsBackend.Vulkan;
+
+            return GreatMetalTitles.ContainsIgnoreCase(titleId) ? GraphicsBackend.Metal : GraphicsBackend.Vulkan;
+        }
+        
+        public static readonly string[] GreatMetalTitles =
+        [
+            "01006f8002326000", // Animal Crossings: New Horizons
+            "01009bf0072d4000", // Captain Toad: Treasure Tracker
+            "0100a5c00d162000", // Cuphead
+            "010023800d64a000", // Deltarune
+            "010028600EBDA000", // Mario 3D World
+            "0100152000022000", // Mario Kart 8 Deluxe
+            "01005CA01580E000", // Persona 5
+            "01008C0016544000", // Sea of Stars
+            "01006A800016E000", // Smash Ultimate
+            "0100000000010000", // Super Mario Odyessy
+        ];
+        
+        public static string GetDiscordGameAsset(string titleId) 
+            => DiscordGameAssetKeys.Contains(titleId) ? titleId : "game";
+
+        public static readonly string[] DiscordGameAssetKeys =
+        [
+            "010055d009f78000", // Fire Emblem: Three Houses
+            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
+            "0100a6301214e000", // Fire Emblem Engage
+            "0100f15003e64000", // Fire Emblem Warriors
+            "010071f0143ea000", // Fire Emblem Warriors: Three Hopes
+
+            "01007e3006dda000", // Kirby Star Allies
+            "01004d300c5ae000", // Kirby and the Forgotten Land
+            "01006b601380e000", // Kirby's Return to Dream Land Deluxe
+            "01003fb00c5a8000", // Super Kirby Clash
+            "0100227010460000", // Kirby Fighters 2
+            "0100a8e016236000", // Kirby's Dream Buffet
+
+            "01007ef00011e000", // The Legend of Zelda: Breath of the Wild
+            "01006bb00c6f0000", // The Legend of Zelda: Link's Awakening
+            "01002da013484000", // The Legend of Zelda: Skyward Sword HD
+            "0100f2c0115b6000", // The Legend of Zelda: Tears of the Kingdom
+            "01008cf01baac000", // The Legend of Zelda: Echoes of Wisdom
+            "01000b900d8b0000", // Cadence of Hyrule
+            "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
+            "01002b00111a2000", // Hyrule Warriors: Age of Calamity
+
+            "010048701995e000", // Luigi's Mansion 2 HD
+            "0100dca0064a6000", // Luigi's Mansion 3
+
+            "010093801237c000", // Metroid Dread
+            "010012101468c000", // Metroid Prime Remastered
+
+            "0100000000010000", // SUPER MARIO ODYSSEY
+            "0100ea80032ea000", // Super Mario Bros. U Deluxe
+            "01009b90006dc000", // Super Mario Maker 2
+            "010049900f546000", // Super Mario 3D All-Stars
+            "010049900F546001", // ^ 64
+            "010049900F546002", // ^ Sunshine
+            "010049900F546003", // ^ Galaxy
+            "010028600ebda000", // Super Mario 3D World + Bowser's Fury
+            "010015100b514000", // Super Mario Bros. Wonder
+            "0100152000022000", // Mario Kart 8 Deluxe
+            "010036b0034e4000", // Super Mario Party
+            "01006fe013472000", // Mario Party Superstars
+            "0100965017338000", // Super Mario Party Jamboree
+            "01006d0017f7a000", // Mario & Luigi: Brothership
+            "010067300059a000", // Mario + Rabbids: Kingdom Battle
+            "0100317013770000", // Mario + Rabbids: Sparks of Hope
+            "0100a3900c3e2000", // Paper Mario: The Origami King
+            "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
+            "0100bc0018138000", // Super Mario RPG
+            "0100bde00862a000", // Mario Tennis Aces
+            "0100c9c00e25c000", // Mario Golf: Super Rush
+            "010019401051c000", // Mario Strikers: Battle League
+            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
+            "0100b99019412000", // Mario vs. Donkey Kong
+
+            "0100aa80194b0000", // Pikmin 1
+            "0100d680194b2000", // Pikmin 2
+            "0100f4c009322000", // Pikmin 3 Deluxe
+            "0100b7c00933a000", // Pikmin 4
+
+            "010003f003a34000", // Pokémon: Let's Go Pikachu!
+            "0100187003a36000", // Pokémon: Let's Go Eevee!
+            "0100abf008968000", // Pokémon Sword
+            "01008db008c2c000", // Pokémon Shield
+            "0100000011d90000", // Pokémon Brilliant Diamond
+            "010018e011d92000", // Pokémon Shining Pearl
+            "01001f5010dfa000", // Pokémon Legends: Arceus
+            "0100a3d008c5c000", // Pokémon Scarlet
+            "01008f6008c5e000", // Pokémon Violet
+            "0100b3f000be2000", // Pokkén Tournament DX
+            "0100f4300bf2c000", // New Pokémon Snap
+
+            "01003bc0000a0000", // Splatoon 2 (US)
+            "0100f8f0000a2000", // Splatoon 2 (EU)
+            "01003c700009c000", // Splatoon 2 (JP)
+            "0100c2500fc20000", // Splatoon 3
+            "0100ba0018500000", // Splatoon 3: Splatfest World Premiere
+
+            "010040600c5ce000", // Tetris 99
+            "0100277011f1a000", // Super Mario Bros. 35
+            "0100ad9012510000", // PAC-MAN 99
+            "0100ccf019c8c000", // F-ZERO 99
+            "0100d870045b6000", // NES - Nintendo Switch Online
+            "01008d300c50c000", // SNES - Nintendo Switch Online
+            "0100c9a00ece6000", // N64 - Nintendo Switch Online
+            "0100e0601c632000", // N64 - Nintendo Switch Online 18+
+            "0100c62011050000", // GB - Nintendo Switch Online
+            "010012f017576000", // GBA - Nintendo Switch Online
+
+            "01000320000cc000", // 1-2 Switch
+            "0100300012f2a000", // Advance Wars 1+2: Re-Boot Camp
+            "01006f8002326000", // Animal Crossing: New Horizons
+            "0100620012d6e000", // Big Brain Academy: Brain vs. Brain
+            "010018300d006000", // BOXBOY! + BOXGIRL!
+            "0100c1f0051b6000", // Donkey Kong Country: Tropical Freeze
+            "0100ed000d390000", // Dr. Kawashima's Brain Training
+            "010067b017588000", // Endless Ocean Luminous
+            "0100d2f00d5c0000", // Nintendo Switch Sports
+            "01006b5012b32000", // Part Time UFO
+            "0100704000B3A000", // Snipperclips
+            "01006a800016e000", // Super Smash Bros. Ultimate
+            "0100a9400c9c2000", // Tokyo Mirage Sessions #FE Encore
+
+            "010076f0049a2000", // Bayonetta
+            "01007960049a0000", // Bayonetta 2
+            "01004a4010fea000", // Bayonetta 3
+            "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
+
+            "0100dcd01525a000", // Persona 3 Portable
+            "010062b01525c000", // Persona 4 Golden
+            "010075a016a3a000", // Persona 4 Arena Ultimax
+            "01005ca01580e000", // Persona 5 Royal
+            "0100801011c3e000", // Persona 5 Strikers
+            "010087701b092000", // Persona 5 Tactica
+
+            "01009aa000faa000", // Sonic Mania
+            "01004ad014bf0000", // Sonic Frontiers
+            "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
+            "01005ea01c0fc001", // ^
+
+            "010056e00853a000", // A Hat in Time
+            "0100dbf01000a000", // Burnout Paradise Remastered
+            "0100744001588000", // Cars 3: Driven to Win
+            "0100b41013c82000", // Cruis'n Blast
+            "01001b300b9be000", // Diablo III: Eternal Collection
+            "01008c8012920000", // Dying Light Platinum Edition
+            "010073c01af34000", // LEGO Horizon Adventures
+            "0100770008dd8000", // Monster Hunter Generations Ultimate
+            "0100b04011742000", // Monster Hunter Rise
+            "0100853015e86000", // No Man's Sky
+            "01007bb017812000", // Portal
+            "0100abd01785c000", // Portal 2
+            "01008e200c5c2000", // Muse Dash
+            "01007820196a6000", // Red Dead Redemption
+            "01002f7013224000", // Rune Factory 5
+            "01008d100d43e000", // Saints Row IV
+            "0100de600beee000", // Saints Row: The Third - The Full Package
+            "01001180021fa000", // Shovel Knight: Specter of Torment
+            "0100d7a01b7a2000", // Star Wars: Bounty Hunter
+            "0100800015926000", // Suika Game
+            "0100e46006708000", // Terraria
+            "01000a10041ea000", // The Elder Scrolls V: Skyrim
+            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
+            "010080b00ad66000", // Undertale
+        ];
+    }
+}
--- a/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/CAMetalLayerExtensions.cs
+++ b/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/CAMetalLayerExtensions.cs
@@ -0,0 +1,21 @@
+using SharpMetal;
+using SharpMetal.ObjectiveCCore;
+using SharpMetal.QuartzCore;
+using System.Runtime.Versioning;
+// ReSharper disable InconsistentNaming
+
+namespace Ryujinx.Graphics.Metal.SharpMetalExtensions
+{
+    [SupportedOSPlatform("OSX")]
+    public static class CAMetalLayerExtensions
+    {
+        private static readonly Selector sel_displaySyncEnabled = "displaySyncEnabled";
+        private static readonly Selector sel_setDisplaySyncEnabled = "setDisplaySyncEnabled:";
+        
+        public static bool IsDisplaySyncEnabled(this CAMetalLayer metalLayer) 
+            => ObjectiveCRuntime.bool_objc_msgSend(metalLayer.NativePtr, sel_displaySyncEnabled);
+
+        public static void SetDisplaySyncEnabled(this CAMetalLayer metalLayer, bool enabled) 
+            => ObjectiveCRuntime.objc_msgSend(metalLayer.NativePtr, sel_setDisplaySyncEnabled, enabled);
+    }
+}
--- a/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj
+++ b/src/Ryujinx.Graphics.Metal.SharpMetalExtensions/Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="SharpMetal" />
+  </ItemGroup>
+</Project>
--- a/src/Ryujinx.Graphics.Metal/Ryujinx.Graphics.Metal.csproj
+++ b/src/Ryujinx.Graphics.Metal/Ryujinx.Graphics.Metal.csproj
@@ -5,12 +5,9 @@
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-        <ProjectReference Include="..\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="SharpMetal" />
+      <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
+      <ProjectReference Include="..\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
+      <ProjectReference Include="..\Ryujinx.Graphics.Metal.SharpMetalExtensions\Ryujinx.Graphics.Metal.SharpMetalExtensions.csproj" />
    </ItemGroup>

    <ItemGroup>
--- a/src/Ryujinx.Graphics.Metal/Window.cs
+++ b/src/Ryujinx.Graphics.Metal/Window.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Metal.Effects;
+using Ryujinx.Graphics.Metal.SharpMetalExtensions;
 using SharpMetal.ObjectiveCCore;
 using SharpMetal.QuartzCore;
 using System;
@@ -140,7 +141,15 @@ namespace Ryujinx.Graphics.Metal
        
        public void ChangeVSyncMode(VSyncMode vSyncMode)
        {
-            //_vSyncMode = vSyncMode;
+            switch (vSyncMode)
+            {
+                case VSyncMode.Unbounded: 
+                    _metalLayer.SetDisplaySyncEnabled(false);
+                    break;
+                case VSyncMode.Switch:
+                    _metalLayer.SetDisplaySyncEnabled(true);
+                    break;
+            }
        }

        public void SetAntiAliasing(AntiAliasing effect)
--- a/src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
@@ -42,7 +42,7 @@ namespace Ryujinx.Graphics.OpenGL.Queries

            _current = new CounterQueueEvent(this, glType, 0);

-            _consumerThread = new Thread(EventConsumer);
+            _consumerThread = new Thread(EventConsumer) { Name = "CPU.CounterQueue." + (int)type };
            _consumerThread.Start();
        }

--- a/src/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
@@ -52,7 +52,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries

            _current = new CounterQueueEvent(this, type, 0);

-            _consumerThread = new Thread(EventConsumer);
+            _consumerThread = new Thread(EventConsumer) { Name = "CPU.CounterQueue." + (int)type };
            _consumerThread.Start();
        }

--- a/src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs
@@ -181,7 +181,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                is64Bits = true;
            }

-            HostThread = new Thread(ThreadStart);
+            HostThread = new Thread(ThreadStart) { Name = "HLE.KThread" };

            Context = owner?.CreateExecutionContext() ?? new ProcessExecutionContext();

--- a/src/Ryujinx.UI.Common/DiscordIntegrationModule.cs
+++ b/src/Ryujinx.UI.Common/DiscordIntegrationModule.cs
@@ -76,7 +76,7 @@ namespace Ryujinx.UI.Common
            {
                Assets = new Assets
                {
-                    LargeImageKey = _discordGameAssetKeys.Contains(procRes.ProgramIdText) ? procRes.ProgramIdText : "game",
+                    LargeImageKey = TitleIDs.GetDiscordGameAsset(procRes.ProgramIdText),
                    LargeImageText = TruncateToByteLength($"{appMeta.Title} (v{procRes.DisplayVersion})"),
                    SmallImageKey = "ryujinx",
                    SmallImageText = TruncateToByteLength(_description)
@@ -122,151 +122,5 @@ namespace Ryujinx.UI.Common
        {
            _discordClient?.Dispose();
        }
-
-        private static readonly string[] _discordGameAssetKeys =
-        [
-            "010055d009f78000", // Fire Emblem: Three Houses
-            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
-            "0100a6301214e000", // Fire Emblem Engage
-            "0100f15003e64000", // Fire Emblem Warriors
-            "010071f0143ea000", // Fire Emblem Warriors: Three Hopes
-
-            "01007e3006dda000", // Kirby Star Allies
-            "01004d300c5ae000", // Kirby and the Forgotten Land
-            "01006b601380e000", // Kirby's Return to Dream Land Deluxe
-            "01003fb00c5a8000", // Super Kirby Clash
-            "0100227010460000", // Kirby Fighters 2
-            "0100a8e016236000", // Kirby's Dream Buffet
-
-            "01007ef00011e000", // The Legend of Zelda: Breath of the Wild
-            "01006bb00c6f0000", // The Legend of Zelda: Link's Awakening
-            "01002da013484000", // The Legend of Zelda: Skyward Sword HD
-            "0100f2c0115b6000", // The Legend of Zelda: Tears of the Kingdom
-            "01008cf01baac000", // The Legend of Zelda: Echoes of Wisdom
-            "01000b900d8b0000", // Cadence of Hyrule
-            "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
-            "01002b00111a2000", // Hyrule Warriors: Age of Calamity
-
-            "010048701995e000", // Luigi's Mansion 2 HD
-            "0100dca0064a6000", // Luigi's Mansion 3
-
-            "010093801237c000", // Metroid Dread
-            "010012101468c000", // Metroid Prime Remastered
-
-            "0100000000010000", // SUPER MARIO ODYSSEY
-            "0100ea80032ea000", // Super Mario Bros. U Deluxe
-            "01009b90006dc000", // Super Mario Maker 2
-            "010049900f546000", // Super Mario 3D All-Stars
-            "010049900F546001", // ^ 64
-            "010049900F546002", // ^ Sunshine
-            "010049900F546003", // ^ Galaxy
-            "010028600ebda000", // Super Mario 3D World + Bowser's Fury
-            "010015100b514000", // Super Mario Bros. Wonder
-            "0100152000022000", // Mario Kart 8 Deluxe
-            "010036b0034e4000", // Super Mario Party
-            "01006fe013472000", // Mario Party Superstars
-            "0100965017338000", // Super Mario Party Jamboree
-            "01006d0017f7a000", // Mario & Luigi: Brothership
-            "010067300059a000", // Mario + Rabbids: Kingdom Battle
-            "0100317013770000", // Mario + Rabbids: Sparks of Hope
-            "0100a3900c3e2000", // Paper Mario: The Origami King
-            "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
-            "0100bc0018138000", // Super Mario RPG
-            "0100bde00862a000", // Mario Tennis Aces
-            "0100c9c00e25c000", // Mario Golf: Super Rush
-            "010019401051c000", // Mario Strikers: Battle League
-            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
-            "0100b99019412000", // Mario vs. Donkey Kong
-
-            "0100aa80194b0000", // Pikmin 1
-            "0100d680194b2000", // Pikmin 2
-            "0100f4c009322000", // Pikmin 3 Deluxe
-            "0100b7c00933a000", // Pikmin 4
-
-            "010003f003a34000", // Pokémon: Let's Go Pikachu!
-            "0100187003a36000", // Pokémon: Let's Go Eevee!
-            "0100abf008968000", // Pokémon Sword
-            "01008db008c2c000", // Pokémon Shield
-            "0100000011d90000", // Pokémon Brilliant Diamond
-            "010018e011d92000", // Pokémon Shining Pearl
-            "01001f5010dfa000", // Pokémon Legends: Arceus
-            "0100a3d008c5c000", // Pokémon Scarlet
-            "01008f6008c5e000", // Pokémon Violet
-            "0100b3f000be2000", // Pokkén Tournament DX
-            "0100f4300bf2c000", // New Pokémon Snap
-
-            "01003bc0000a0000", // Splatoon 2 (US)
-            "0100f8f0000a2000", // Splatoon 2 (EU)
-            "01003c700009c000", // Splatoon 2 (JP)
-            "0100c2500fc20000", // Splatoon 3
-            "0100ba0018500000", // Splatoon 3: Splatfest World Premiere
-
-            "010040600c5ce000", // Tetris 99
-            "0100277011f1a000", // Super Mario Bros. 35
-            "0100ad9012510000", // PAC-MAN 99
-            "0100ccf019c8c000", // F-ZERO 99
-            "0100d870045b6000", // NES - Nintendo Switch Online
-            "01008d300c50c000", // SNES - Nintendo Switch Online
-            "0100c9a00ece6000", // N64 - Nintendo Switch Online
-            "0100e0601c632000", // N64 - Nintendo Switch Online 18+
-            "0100c62011050000", // GB - Nintendo Switch Online
-            "010012f017576000", // GBA - Nintendo Switch Online
-
-            "01000320000cc000", // 1-2 Switch
-            "0100300012f2a000", // Advance Wars 1+2: Re-Boot Camp
-            "01006f8002326000", // Animal Crossing: New Horizons
-            "0100620012d6e000", // Big Brain Academy: Brain vs. Brain
-            "010018300d006000", // BOXBOY! + BOXGIRL!
-            "0100c1f0051b6000", // Donkey Kong Country: Tropical Freeze
-            "0100ed000d390000", // Dr. Kawashima's Brain Training
-            "010067b017588000", // Endless Ocean Luminous
-            "0100d2f00d5c0000", // Nintendo Switch Sports
-            "01006b5012b32000", // Part Time UFO
-            "0100704000B3A000", // Snipperclips
-            "01006a800016e000", // Super Smash Bros. Ultimate
-            "0100a9400c9c2000", // Tokyo Mirage Sessions #FE Encore
-
-            "010076f0049a2000", // Bayonetta
-            "01007960049a0000", // Bayonetta 2
-            "01004a4010fea000", // Bayonetta 3
-            "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
-
-            "0100dcd01525a000", // Persona 3 Portable
-            "010062b01525c000", // Persona 4 Golden
-            "010075a016a3a000", // Persona 4 Arena Ultimax
-            "01005ca01580e000", // Persona 5 Royal
-            "0100801011c3e000", // Persona 5 Strikers
-            "010087701b092000", // Persona 5 Tactica
-
-            "01009aa000faa000", // Sonic Mania
-            "01004ad014bf0000", // Sonic Frontiers
-            "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
-            "01005ea01c0fc001", // ^
-
-            "010056e00853a000", // A Hat in Time
-            "0100dbf01000a000", // Burnout Paradise Remastered
-            "0100744001588000", // Cars 3: Driven to Win
-            "0100b41013c82000", // Cruis'n Blast
-            "01001b300b9be000", // Diablo III: Eternal Collection
-            "01008c8012920000", // Dying Light Platinum Edition
-            "010073c01af34000", // LEGO Horizon Adventures
-            "0100770008dd8000", // Monster Hunter Generations Ultimate
-            "0100b04011742000", // Monster Hunter Rise
-            "0100853015e86000", // No Man's Sky
-            "01007bb017812000", // Portal
-            "0100abd01785c000", // Portal 2
-            "01008e200c5c2000", // Muse Dash
-            "01007820196a6000", // Red Dead Redemption
-            "01002f7013224000", // Rune Factory 5
-            "01008d100d43e000", // Saints Row IV
-            "0100de600beee000", // Saints Row: The Third - The Full Package
-            "01001180021fa000", // Shovel Knight: Specter of Torment
-            "0100d7a01b7a2000", // Star Wars: Bounty Hunter
-            "0100800015926000", // Suika Game
-            "0100e46006708000", // Terraria
-            "01000a10041ea000", // The Elder Scrolls V: Skyrim
-            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
-            "010080b00ad66000", // Undertale
-        ];
    }
 }
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -143,23 +143,6 @@ namespace Ryujinx.Ava
        public ulong ApplicationId { get; private set; }
        public bool ScreenshotRequested { get; set; }

-        public bool ShouldInitMetal
-        {
-            get
-            {
-                return OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64 && 
-                    (
-                        (
-                            (
-                                ConfigurationState.Instance.Graphics.GraphicsBackend.Value == GraphicsBackend.Auto &&
-                                RendererHost.KnownGreatMetalTitles.ContainsIgnoreCase(ApplicationId.ToString("X16"))
-                            ) || 
-                            ConfigurationState.Instance.Graphics.GraphicsBackend.Value == GraphicsBackend.Metal
-                        )
-                     );
-            }
-        }
-
        public AppHost(
            RendererHost renderer,
            InputManager inputManager,
@@ -912,27 +895,20 @@ namespace Ryujinx.Ava
            VirtualFileSystem.ReloadKeySet();

            // Initialize Renderer.
-            IRenderer renderer;
-            GraphicsBackend backend = ConfigurationState.Instance.Graphics.GraphicsBackend;
+            GraphicsBackend backend = TitleIDs.SelectGraphicsBackend(ApplicationId.ToString("X16"), ConfigurationState.Instance.Graphics.GraphicsBackend);

-            if (ShouldInitMetal)
+            IRenderer renderer = backend switch
            {
 #pragma warning disable CA1416 // This call site is reachable on all platforms
-                // The condition does a check for Mac, on top of checking if it's an ARM Mac. This isn't a problem.
-                renderer = new MetalRenderer((RendererHost.EmbeddedWindow as EmbeddedWindowMetal)!.CreateSurface);
+                // SelectGraphicsBackend does a check for Mac, on top of checking if it's an ARM Mac. This isn't a problem.
+                GraphicsBackend.Metal => new MetalRenderer((RendererHost.EmbeddedWindow as EmbeddedWindowMetal)!.CreateSurface),
 #pragma warning restore CA1416
-            }
-            else if (backend == GraphicsBackend.Vulkan || (backend == GraphicsBackend.Auto && !ShouldInitMetal))
-            {
-                renderer = VulkanRenderer.Create(
+                GraphicsBackend.Vulkan => VulkanRenderer.Create(
                    ConfigurationState.Instance.Graphics.PreferredGpu,
                    (RendererHost.EmbeddedWindow as EmbeddedWindowVulkan)!.CreateSurface,
-                    VulkanHelper.GetRequiredInstanceExtensions);
-            }
-            else
-            {
-                renderer = new OpenGLRenderer();
-            }
+                    VulkanHelper.GetRequiredInstanceExtensions),
+                _ => new OpenGLRenderer()
+            };

            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;

--- a/src/Ryujinx/RyujinxApp.axaml.cs
+++ b/src/Ryujinx/RyujinxApp.axaml.cs
@@ -33,11 +33,8 @@ namespace Ryujinx.Ava
            .ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
            .MainWindow.Cast<MainWindow>();

-        public static bool IsClipboardAvailable(out IClipboard clipboard)
-        {
-            clipboard = MainWindow.Clipboard;
-            return clipboard != null;
-        }
+        public static bool IsClipboardAvailable(out IClipboard clipboard) 
+            => (clipboard = MainWindow.Clipboard) != null;

        public static void SetTaskbarProgress(TaskBarProgressBarState state) => MainWindow.PlatformFeatures.SetTaskBarProgressBarState(state);
        public static void SetTaskbarProgressValue(ulong current, ulong total) => MainWindow.PlatformFeatures.SetTaskBarProgressBarValue(current, total);
--- a/src/Ryujinx/UI/Helpers/LoggerAdapter.cs
+++ b/src/Ryujinx/UI/Helpers/LoggerAdapter.cs
@@ -19,7 +19,7 @@ namespace Ryujinx.Ava.UI.Helpers
            AvaLogger.Sink = new LoggerAdapter();
        }

-        private static RyuLogger.Log? GetLog(AvaLogLevel level)
+        private static RyuLogger.Log? GetLog(AvaLogLevel level, string area)
        {
            return level switch
            {
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.Helpers
                AvaLogLevel.Debug => RyuLogger.Debug,
                AvaLogLevel.Information => RyuLogger.Debug,
                AvaLogLevel.Warning => RyuLogger.Debug,
-                AvaLogLevel.Error => RyuLogger.Error,
+                AvaLogLevel.Error => area is "IME" ? RyuLogger.Debug : RyuLogger.Error,
                AvaLogLevel.Fatal => RyuLogger.Error,
                _ => throw new ArgumentOutOfRangeException(nameof(level), level, null),
            };
@@ -35,17 +35,17 @@ namespace Ryujinx.Ava.UI.Helpers

        public bool IsEnabled(AvaLogLevel level, string area)
        {
-            return GetLog(level) != null;
+            return GetLog(level, area) != null;
        }

        public void Log(AvaLogLevel level, string area, object source, string messageTemplate)
        {
-            GetLog(level)?.PrintMsg(RyuLogClass.UI, Format(level, area, messageTemplate, source, null));
+            GetLog(level, area)?.PrintMsg(RyuLogClass.UI, Format(level, area, messageTemplate, source, null));
        }

        public void Log(AvaLogLevel level, string area, object source, string messageTemplate, params object[] propertyValues)
        {
-            GetLog(level)?.PrintMsg(RyuLogClass.UI, Format(level, area, messageTemplate, source, propertyValues));
+            GetLog(level, area)?.PrintMsg(RyuLogClass.UI, Format(level, area, messageTemplate, source, propertyValues));
        }

        private static string Format(AvaLogLevel level, string area, string template, object source, object[] v)
--- a/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs
+++ b/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Gommon;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.UI.Common.Configuration;
@@ -31,20 +32,6 @@ namespace Ryujinx.Ava.UI.Renderer
            Initialize();
        }

-        public static readonly string[] KnownGreatMetalTitles =
-        [
-            "01006f8002326000", // Animal Crossings: New Horizons
-            "01009bf0072d4000", // Captain Toad: Treasure Tracker
-            "0100a5c00d162000", // Cuphead
-            "010023800d64a000", // Deltarune
-            "010028600EBDA000", // Mario 3D World
-            "0100152000022000", // Mario Kart 8 Deluxe
-            "01005CA01580E000", // Persona 5
-            "01008C0016544000", // Sea of Stars
-            "01006A800016E000", // Smash Ultimate
-            "0100000000010000", // Super Mario Odyessy
-        ];
-
        public GraphicsBackend Backend =>
            EmbeddedWindow switch
            {
@@ -58,16 +45,8 @@ namespace Ryujinx.Ava.UI.Renderer
        {
            InitializeComponent();

-            switch (ConfigurationState.Instance.Graphics.GraphicsBackend.Value)
+            switch (TitleIDs.SelectGraphicsBackend(titleId, ConfigurationState.Instance.Graphics.GraphicsBackend))
            {
-                case GraphicsBackend.Auto:
-                    EmbeddedWindow = 
-                        OperatingSystem.IsMacOS() && 
-                        RuntimeInformation.ProcessArchitecture == Architecture.Arm64 && 
-                        KnownGreatMetalTitles.ContainsIgnoreCase(titleId) 
-                            ? new EmbeddedWindowMetal() 
-                            : new EmbeddedWindowVulkan();
-                    break;
                case GraphicsBackend.OpenGl:
                    EmbeddedWindow = new EmbeddedWindowOpenGL();
                    break;
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -109,13 +109,8 @@ namespace Ryujinx.Ava.UI.ViewModels

        private bool _areMimeTypesRegistered = FileAssociationHelper.AreMimeTypesRegistered;
        private bool _canUpdate = true;
-        private Cursor _cursor;
-        private string _title;
        private ApplicationData _currentApplicationData;
        private readonly AutoResetEvent _rendererWaitEvent;
-        private WindowState _windowState;
-        private double _windowWidth;
-        private double _windowHeight;
        private int _customVSyncInterval;
        private int _customVSyncIntervalPercentageProxy;

@@ -216,7 +211,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool CanUpdate
        {
-            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate(false);
+            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate();
            set
            {
                _canUpdate = value;
@@ -226,12 +221,8 @@ namespace Ryujinx.Ava.UI.ViewModels

        public Cursor Cursor
        {
-            get => _cursor;
-            set
-            {
-                _cursor = value;
-                OnPropertyChanged();
-            }
+            get => Window.Cursor;
+            set => Window.Cursor = value;
        }

        public ReadOnlyObservableCollection<ApplicationData> AppsObservableList
@@ -813,35 +804,23 @@ namespace Ryujinx.Ava.UI.ViewModels

        public WindowState WindowState
        {
-            get => _windowState;
+            get => Window.WindowState;
            internal set
            {
-                _windowState = value;
-
-                OnPropertyChanged();
+                Window.WindowState = value;
            }
        }

        public double WindowWidth
        {
-            get => _windowWidth;
-            set
-            {
-                _windowWidth = value;
-
-                OnPropertyChanged();
-            }
+            get => Window.Width;
+            set => Window.Width = value;
        }

        public double WindowHeight
        {
-            get => _windowHeight;
-            set
-            {
-                _windowHeight = value;
-
-                OnPropertyChanged();
-            }
+            get => Window.Height;
+            set => Window.Height = value;
        }

        public bool IsGrid => Glyph == Glyph.Grid;
@@ -889,11 +868,11 @@ namespace Ryujinx.Ava.UI.ViewModels

        public string Title
        {
-            get => _title;
+            get => Window.Title;
            set
            {
-                _title = value;
-
+                Window.Title = value;
+                
                OnPropertyChanged();
            }
        }
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -17,8 +17,7 @@
            Margin="7, 0"
            Height="25"
            Width="25"
-            ToolTip.Tip="{Binding Title}"
-            Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png?assembly=Ryujinx.UI.Common" />
+            ToolTip.Tip="{Binding Title}" />
        <Menu
            Name="Menu"
            Height="32"
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -29,6 +29,7 @@ namespace Ryujinx.Ava.UI.Views.Main
            InitializeComponent();

            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;

            ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
            ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
@@ -7,7 +7,6 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:local="clr-namespace:Ryujinx.Ava.UI.Views.Main"
    xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
    x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml
@@ -9,11 +9,6 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    xmlns:main="clr-namespace:Ryujinx.Ava.UI.Views.Main"
-    Cursor="{Binding Cursor}"
-    Title="{Binding Title}"
-    WindowState="{Binding WindowState}"
-    Width="{Binding WindowWidth}"
-    Height="{Binding WindowHeight}"
    MinWidth="800"
    MinHeight="500"
    d:DesignHeight="720"
Author	SHA1	Message	Date
Evan Husted	9754d247b5	UI: Directly proxy window properties on the view model back to the stored window	2024-12-26 23:32:53 -06:00
Evan Husted	267e9f6350	UI: Redirect IME errors to Debug instead of error	2024-12-26 23:13:35 -06:00
Evan Husted	d7b3dd12d1	UI: Set title bar icon to the already loaded one	2024-12-26 22:58:49 -06:00
Evan Husted	c9b2a6b1f1	metal: Try and see if this lets VSync turn off. (cherry picked from commit 9558b3771634d144501dedf3f081afc485a49d9d)	2024-12-26 22:46:18 -06:00
Evan Husted	17233d30da	misc: give various threads dedicated names Move all title ID lists into a TitleIDs class in Ryujinx.Common, with helpers. Unify & simplify Auto graphics backend selection logic	2024-12-26 00:29:00 -06:00