Merge branch 'master' into metal

UI: Fix compatibility list crashing (missing font)
Revert "Revert the Metal Experiment (#701 )"
2025-02-23 17:29:01 -06:00 · 2025-02-22 23:48:47 -06:00 · 2025-02-22 21:33:38 -06:00 · 2025-02-22 21:26:46 -06:00 · 2025-02-22 02:16:28 -06:00 · 2025-02-20 20:56:52 -06:00
11 changed files with 56 additions and 47 deletions
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -1436,7 +1436,7 @@
 010083A018262000,"Hitman: Blood Money — Reprisal",deadlock,ingame,2024-09-28 16:28:50
 01004B100A5CC000,"Hob: The Definitive Edition",,playable,2021-01-13 09:39:19
 0100F7300ED2C000,"Hoggy2",,playable,2022-10-10 13:53:35
-0100F7E00C70E000,"Hogwarts Legacy",slow,ingame,2024-09-03 19:53:58
+0100F7E00C70E000,"Hogwarts Legacy",UE4;slow,ingame,2024-09-03 19:53:58
 0100633007D48000,"Hollow Knight",nvdec,playable,2023-01-16 15:44:56
 0100F2100061E800,"Hollow0",UE4;gpu,ingame,2021-03-03 23:42:56
 0100342009E16000,"Holy Potatoes! What The Hell?!",,playable,2020-07-03 10:48:56
--- a/src/Ryujinx.Common/SharedConstants.cs
+++ b/src/Ryujinx.Common/SharedConstants.cs
@@ -0,0 +1,9 @@
+namespace Ryujinx.Common
+{
+    public static class SharedConstants
+    {
+        public const string DefaultLanPlayHost = "ryuldn.vudjun.com";
+        public const short LanPlayPort = 30456;
+        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
+    }
+}
--- a/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs
@@ -23,9 +23,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 {
    class IUserLocalCommunicationService : IpcService, IDisposable
    {
-        public static string DefaultLanPlayHost = "ryuldn.vudjun.com";
-        public static short LanPlayPort = 30456;
-
        public INetworkClient NetworkClient { get; private set; }

        private const int NifmRequestID = 90;
@@ -1092,20 +1089,18 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                            case MultiplayerMode.LdnRyu:
                                try
                                {
-                                    string ldnServer = context.Device.Configuration.MultiplayerLdnServer;
-                                    if (string.IsNullOrEmpty(ldnServer))
-                                    {
-                                        ldnServer = DefaultLanPlayHost;
-                                    }
+                                    string ldnServer = context.Device.Configuration.MultiplayerLdnServer 
+                                                       ?? throw new InvalidOperationException("Cannot initialize RyuLDN with a null Multiplayer server.");
+
                                    if (!IPAddress.TryParse(ldnServer, out IPAddress ipAddress))
                                    {
                                        ipAddress = Dns.GetHostEntry(ldnServer).AddressList[0];
                                    }
-                                    NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), LanPlayPort, context.Device.Configuration);
+                                    NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), SharedConstants.LanPlayPort, context.Device.Configuration);
                                }
                                catch (Exception ex)
                                {
-                                    Logger.Error?.Print(LogClass.ServiceLdn, "Could not locate LdnRyu server. Defaulting to stubbed wireless.");
+                                    Logger.Error?.Print(LogClass.ServiceLdn, "Could not locate RyuLDN server. Defaulting to stubbed wireless.");
                                    Logger.Error?.Print(LogClass.ServiceLdn, ex.Message);
                                    NetworkClient = new LdnDisabledClient();
                                }
--- a/src/Ryujinx.Input.SDL2/SDL2Gamepad.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Gamepad.cs
@@ -111,7 +111,7 @@ namespace Ryujinx.Input.SDL2
            byte blue = packedRgb > 0 ? (byte)(packedRgb % 256) : (byte)0;
            
            if (SDL_GameControllerSetLED(_gamepadHandle, red, green, blue) != 0)
-                Logger.Error?.Print(LogClass.Hid, "LED setting failed; probably in the middle of disconnecting.");
+                Logger.Debug?.Print(LogClass.Hid, "LED setting failed; probably in the middle of disconnecting.");
        }

        private GamepadFeaturesFlag GetFeaturesFlag()
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -951,7 +951,7 @@ namespace Ryujinx.Ava
                ConfigurationState.Instance.Multiplayer.Mode,
                ConfigurationState.Instance.Multiplayer.DisableP2p,
                ConfigurationState.Instance.Multiplayer.LdnPassphrase,
-                ConfigurationState.Instance.Multiplayer.LdnServer,
+                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
        }
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -468,7 +468,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Відкрити теку скріншотів",
-        "zh_CN": "",
+        "zh_CN": "打开截图文件夹",
        "zh_TW": ""
      }
    },
@@ -5143,7 +5143,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Ігнорувати Аплет Контролера",
-        "zh_CN": "",
+        "zh_CN": "忽略控制器小程序",
        "zh_TW": ""
      }
    },
@@ -16518,7 +16518,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Діалогове вікно Аплету Контролера не з'явиться, якщо геймпад було відключено під час роботи програми.\n\nЗалиште вимкненим якщо не впевнені.",
-        "zh_CN": "",
+        "zh_CN": "在应用程序运行时如果游戏手柄断开连接则不会显示控制器小程序对话框。\n\n如果不确定，请保持关闭状态。",
        "zh_TW": ""
      }
    },
@@ -17193,7 +17193,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Відкрити теку куди зберігаються скріншоти Ryujinx",
-        "zh_CN": "",
+        "zh_CN": "打开 Ryujinx 截图文件夹",
        "zh_TW": ""
      }
    },
@@ -24073,4 +24073,4 @@
      }
    }
  ]
-}
+}
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -189,17 +189,12 @@ namespace Ryujinx.Ava.UI.Windows
        {
            Dispatcher.UIThread.Post(() =>
            {
-                List<LdnGameData> ldnGameDataArray = e.LdnData.ToList();
                ViewModel.LdnData.Clear();
                foreach (ApplicationData application in ViewModel.Applications.Where(it => it.HasControlHolder))
                {
                    ref ApplicationControlProperty controlHolder = ref application.ControlHolder.Value;
-                    
-                    ViewModel.LdnData[application.IdString] = 
-                        LdnGameData.GetArrayForApp(
-                            ldnGameDataArray, 
-                            ref controlHolder
-                        );
+
+                    ViewModel.LdnData[application.IdString] = e.LdnData.Where(ref controlHolder);
                    
                    UpdateApplicationWithLdnData(application);
                }
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -42,7 +42,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 {
    public class ApplicationLibrary
    {
-        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
        public Language DesiredLanguage { get; set; }
        public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
        public event Action<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
@@ -826,7 +825,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary

        public async Task RefreshLdn()
        {
-
            if (ConfigurationState.Instance.Multiplayer.Mode == MultiplayerMode.LdnRyu)
            {
                try
@@ -834,33 +832,22 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                    string ldnWebHost = ConfigurationState.Instance.Multiplayer.LdnServer;
                    if (string.IsNullOrEmpty(ldnWebHost))
                    {
-                        ldnWebHost = DefaultLanPlayWebHost;
+                        ldnWebHost = SharedConstants.DefaultLanPlayWebHost;
                    }
-                    IEnumerable<LdnGameData> ldnGameDataArray = Array.Empty<LdnGameData>();
+                    
                    using HttpClient httpClient = new();
                    string ldnGameDataArrayString = await httpClient.GetStringAsync($"https://{ldnWebHost}/api/public_games");
-                    ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData);
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
-                    {
-                        LdnData = ldnGameDataArray
-                    });
+                    LdnGameData[] ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData).ToArray();
+                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs(ldnGameDataArray));
+                    return;
                }
                catch (Exception ex)
                {
                    Logger.Warning?.Print(LogClass.Application, $"Failed to fetch the public games JSON from the API. Player and game count in the game list will be unavailable.\n{ex.Message}");
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
-                    {
-                        LdnData = Array.Empty<LdnGameData>()
-                    });
                }
            }
-            else
-            {
-                LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
-                {
-                    LdnData = Array.Empty<LdnGameData>()
-                });
-            }
+            
+            LdnGameDataReceived?.Invoke(LdnGameDataReceivedEventArgs.Empty);
        }

        // Replace the currently stored DLC state for the game with the provided DLC state.
--- a/src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs
@@ -18,7 +18,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
        public IEnumerable<string> Players { get; set; }

        public static Array GetArrayForApp(
-            IEnumerable<LdnGameData> receivedData, ref ApplicationControlProperty acp)
+            LdnGameData[] receivedData, ref ApplicationControlProperty acp)
        {
            LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;

@@ -40,4 +40,10 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
            public int GameCount => _ldnDatas.Length;
        }
    }
+
+    public static class LdnGameDataHelper
+    {
+        public static LdnGameData.Array Where(this LdnGameData[] unfilteredDatas, ref ApplicationControlProperty acp) 
+            => LdnGameData.GetArrayForApp(unfilteredDatas, ref acp);
+    }
 }
--- a/src/Ryujinx/Utilities/AppLibrary/LdnGameDataReceivedEventArgs.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/LdnGameDataReceivedEventArgs.cs
@@ -5,6 +5,14 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 {
    public class LdnGameDataReceivedEventArgs : EventArgs
    {
-        public IEnumerable<LdnGameData> LdnData { get; set; }
+        public static new readonly LdnGameDataReceivedEventArgs Empty = new(null);
+        
+        public LdnGameDataReceivedEventArgs(LdnGameData[] ldnData)
+        {
+            LdnData = ldnData ?? [];
+        }
+        
+        
+        public LdnGameData[] LdnData { get; set; }
    }
 }
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
@@ -1,5 +1,6 @@
 using ARMeilleure;
 using Gommon;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
@@ -647,6 +648,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
            /// </summary>
            public ReactiveObject<string> LdnServer { get; private set; }

+            public string GetLdnServer()
+            {
+                string ldnServer = LdnServer;
+                return string.IsNullOrEmpty(ldnServer) 
+                    ? SharedConstants.DefaultLanPlayHost 
+                    : ldnServer;
+            }
+
            public MultiplayerSection()
            {
                LanInterfaceId = new ReactiveObject<string>();
Author	SHA1	Message	Date
Evan Husted	38ed71ddfe	Merge branch 'master' into metal	2025-02-23 17:29:01 -06:00
Evan Husted	3ffcc72117	UI: Fix compatibility list crashing (missing font)	2025-02-22 23:48:47 -06:00
Evan Husted	80d619f010	Revert "Revert the Metal Experiment (#701 )" This reverts commit `fe1617ffea`.	2025-02-22 21:33:38 -06:00
Evan Husted	fe1617ffea	Revert the Metal Experiment (#701 ) Metal sounded like a good idea to get in the emulator but frankly I underestimated just how experimental and not ready it was. From my write up in the Discord: ``` As is, Metal supports only a few games. The games it does support freeze on first use of not playing them via Vulkan, because shader translation is broken. So you need to use a dirty hack to not delete all your shaders. Not to mention it breaks many games via MoltenVK because of changes to the shared GPU code. Merging Metal seemed like a great idea, because of the few games it does support. But I don't think it's worth it. Many of the games it breaks via MoltenVK don't work via Metal. Which effectively makes current Ryubing worse for Mac users than Ryujinx 1.1.1403. I think what I'm gonna do is revert Metal, and reopen it as a PR. That way, you can still take advantage of the Metal backend as is, but without making other games worse with no solution. ``` For what it's worth, the shader translation part could at least be "fixed" by always applying a 30ms delay for shader translation to Metal. That being said, that solution sucks ass. The MoltenVK regressions are even worse. I hope this is not a let down to the Mac users. I hope you realize I'm reverting this because you're actively getting a worse experience with it in the emulator.	2025-02-22 21:26:46 -06:00
shinyoyo	eb6b0e9adc	Updated Zh-CN Simplified Chinese. (#703 )	2025-02-22 02:16:28 -06:00
Evan Husted	9631bdfe16	docs: compat: Hogwarts Legacy is an Unreal Engine 4 game	2025-02-20 20:56:52 -06:00
Evan Husted	2a84656ffc	misc: chore: use new array in LdnGameDataReceivedEventArgs instead of collecting the ldn datas into a list	2025-02-20 19:49:17 -06:00
Evan Husted	6c6580ddcc	misc: chore: Move the LDN constants into a SharedConstants class	2025-02-20 19:30:00 -06:00
Evan Husted	c47448628c	UI: Print LED setting failed on Debug	2025-02-20 19:29:18 -06:00