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
14 changed files with 2 additions and 29 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -39,6 +39,7 @@
    <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" />
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavcodec.so.59
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavcodec.so.59
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavutil.so.57
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavutil.so.57
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavcodec.so.59
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavcodec.so.59
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavutil.so.57
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavutil.so.57
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavcodec.59.dylib
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavcodec.59.dylib
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavutil.57.dylib
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavutil.57.dylib
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavcodec.59.dylib
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavcodec.59.dylib
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavutil.57.dylib
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavutil.57.dylib
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avcodec-59.dll
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avcodec-59.dll
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avutil-57.dll
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avutil-57.dll
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
@@ -10,7 +10,6 @@ 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) },
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-    <RuntimeIdentifiers>win-x64;osx-x64;osx-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
  </PropertyGroup>

  <ItemGroup>
@@ -11,31 +10,4 @@
    <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>
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -58,6 +58,7 @@
    <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" />
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