Merge 6e731ad942 into 9631bdfe16

Directory.Packages.props

@@ -39,7 +39,6 @@
     <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />

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

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs

@@ -10,6 +10,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
         public const string AvCodecLibraryName = "avcodec";
         public const string AvUtilLibraryName = "avutil";
 
+        // Library Name, Min Version, Max Version.
         private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
         {
             { AvCodecLibraryName, (58, 59) },

src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
+    <RuntimeIdentifiers>win-x64;osx-x64;osx-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,4 +11,31 @@
     <ProjectReference Include="..\Ryujinx.Graphics.Video\Ryujinx.Graphics.Video.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ContentWithTargetPath Include="Library\win-x64\*" Condition="'$(RuntimeIdentifier)' == 'win-x64'">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+
+    <ContentWithTargetPath Include="Library\osx-x64\*" Condition="'$(RuntimeIdentifier)' == 'osx-x64'">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+
+    <ContentWithTargetPath Include="Library\osx-arm64\*" Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+
+    <ContentWithTargetPath Include="Library\linux-x64\*" Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+
+    <ContentWithTargetPath Include="Library\linux-arm64\*" Condition="'$(RuntimeIdentifier)' == 'linux-arm64'">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+    </ContentWithTargetPath>
+  </ItemGroup>
+
 </Project>

src/Ryujinx/Ryujinx.csproj

@@ -58,7 +58,6 @@
     <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" />
     <PackageReference Include="OpenTK.Core" />
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
     <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
     <PackageReference Include="securifybv.ShellLink" />
     <PackageReference Include="Sep" />

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);
                 }

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);
+    }
 }