Use Ryujinx.MoltenVK 1.4.1

Vulkan: remove InvalidResource workaround, as it is no longer needed since macOS Sonoma. Vulkan: enable textureGatherOffsets on MoltenVK.
2026-09-20 09:41:14 +02:00 · 2025-12-26 15:19:19 -06:00
parent fba786cd38
commit a2c53ed6cf
5 changed files with 17 additions and 37 deletions
@@ -36,7 +36,7 @@
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Linux" Version="6.1.4-build6" />
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.macOS" Version="5.0.3-build14" />
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Windows" Version="6.1.4-build6" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
+    <PackageVersion Include="Ryujinx.MoltenVK" Version="1.4.1" />
    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.126" />
    <PackageVersion Include="Ryujinx.SDL2-CS-Redux" Version="2.32.10" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
@@ -47,14 +47,12 @@ def get_new_name(
    input_component = str(input_dylib_path).replace(str(input_directory), "")[1:]
    return Path(os.path.join(output_directory, input_component))

-
-def is_fat_file(dylib_path: Path) -> str:
-    res = subprocess.check_output([LIPO, "-info", str(dylib_path.absolute())]).decode(
-        "utf-8"
-    )
-
-    return not res.split("\n")[0].startswith("Non-fat file")
-
+def get_archs(dylib_path: Path) -> list[str]:
+    res = subprocess.check_output([LIPO, "-info", str(dylib_path)]).decode("utf-8")
+    if res.startswith("Non-fat file"):
+        return [res.split(":")[-1].strip()]
+    else:
+        return res.split("are:")[-1].strip().split()

 def construct_universal_dylib(
    arm64_input_dylib_path: Path, x86_64_input_dylib_path: Path, output_dylib_path: Path
@@ -69,11 +67,12 @@ def construct_universal_dylib(
            os.path.basename(arm64_input_dylib_path.resolve()), output_dylib_path
        )
    else:
-        if is_fat_file(arm64_input_dylib_path) or not x86_64_input_dylib_path.exists():
-            with open(output_dylib_path, "wb") as dst:
-                with open(arm64_input_dylib_path, "rb") as src:
-                    dst.write(src.read())
-        else:
+        arm64_archs = get_archs(arm64_input_dylib_path)
+        x86_64_archs = get_archs(x86_64_input_dylib_path) if x86_64_input_dylib_path.exists() else []
+
+        if "arm64" in arm64_archs and "x86_64" in arm64_archs:
+            shutil.copy2(arm64_input_dylib_path, output_dylib_path)
+        elif x86_64_archs:
            subprocess.check_call(
                [
                    LIPO,
@@ -17,22 +17,10 @@ namespace Ryujinx.Graphics.Vulkan
            DescriptorSetLayout[] layouts = new DescriptorSetLayout[setDescriptors.Count];
            bool[] updateAfterBindFlags = new bool[setDescriptors.Count];

-            bool isMoltenVk = gd.IsMoltenVk;
-
            for (int setIndex = 0; setIndex < setDescriptors.Count; setIndex++)
            {
                ResourceDescriptorCollection rdc = setDescriptors[setIndex];

-                ResourceStages activeStages = ResourceStages.None;
-
-                if (isMoltenVk)
-                {
-                    for (int descIndex = 0; descIndex < rdc.Descriptors.Count; descIndex++)
-                    {
-                        activeStages |= rdc.Descriptors[descIndex].Stages;
-                    }
-                }
-
                DescriptorSetLayoutBinding[] layoutBindings = new DescriptorSetLayoutBinding[rdc.Descriptors.Count];

                bool hasArray = false;
@@ -42,13 +30,6 @@ namespace Ryujinx.Graphics.Vulkan
                    ResourceDescriptor descriptor = rdc.Descriptors[descIndex];
                    ResourceStages stages = descriptor.Stages;

-                    if (descriptor.Type == ResourceType.StorageBuffer && isMoltenVk)
-                    {
-                        // There's a bug on MoltenVK where using the same buffer across different stages
-                        // causes invalid resource errors, allow the binding on all active stages as workaround.
-                        stages = activeStages;
-                    }
-
                    layoutBindings[descIndex] = new DescriptorSetLayoutBinding
                    {
                        Binding = (uint)descriptor.Binding,
@@ -426,8 +426,8 @@ namespace Ryujinx.Graphics.Vulkan
                _physicalDevice.IsDeviceExtensionPresent(ExtExtendedDynamicState.ExtensionName),
                features2.Features.MultiViewport && !(IsMoltenVk && Vendor == Vendor.Amd), // Workaround for AMD on MoltenVK issue
                featuresRobustness2.NullDescriptor || IsMoltenVk,
-                supportsPushDescriptors && !IsMoltenVk,
-                propertiesPushDescriptor.MaxPushDescriptors,
+                supportsPushDescriptors,
+                IsMoltenVk ? 16 : propertiesPushDescriptor.MaxPushDescriptors, // Prevents vertex explosions on MoltenVK.
                featuresPrimitiveTopologyListRestart.PrimitiveTopologyListRestart,
                featuresPrimitiveTopologyListRestart.PrimitiveTopologyPatchListRestart,
                supportsTransformFeedback,
@@ -766,7 +766,7 @@ namespace Ryujinx.Graphics.Vulkan
                supportsShaderBallot: false,
                supportsShaderBarrierDivergence: Vendor != Vendor.Intel,
                supportsShaderFloat64: Capabilities.SupportsShaderFloat64,
-                supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended && !IsMoltenVk,
+                supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended,
                supportsTextureShadowLod: false,
                supportsVertexStoreAndAtomics: features2.Features.VertexPipelineStoresAndAtomics,
                supportsViewportIndexVertexTessellation: featuresVk12.ShaderOutputViewportIndex,
@@ -40,7 +40,7 @@
    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.Linux" Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64'" />
    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.macOS" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.Windows" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
+    <PackageReference Include="Ryujinx.MoltenVK" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
    <PackageReference Include="Silk.NET.Vulkan" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />