Merge branch 'update/molten-vk' into 'master'

Use Ryujinx.MoltenVK 1.4.0

See merge request [ryubing/ryujinx!142](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/142)

Directory.Packages.props

@@ -39,7 +39,7 @@
     <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.AllArch" Version="6.1.2-build3" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
+    <PackageVersion Include="Ryujinx.MoltenVK" Version="1.4.0" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.116" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />

distribution/macos/construct_universal_dylib.py

@@ -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 get_archs(dylib_path: Path) -> list[str]:
-def is_fat_file(dylib_path: Path) -> str:
+    res = subprocess.check_output([LIPO, "-info", str(dylib_path)]).decode("utf-8")
-    res = subprocess.check_output([LIPO, "-info", str(dylib_path.absolute())]).decode(
+    if res.startswith("Non-fat file"):
-        "utf-8"
+        return [res.split(":")[-1].strip()]
-    )
+    else:
-
+        return res.split("are:")[-1].strip().split()
-    return not res.split("\n")[0].startswith("Non-fat file")
-
 
 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():
+        arm64_archs = get_archs(arm64_input_dylib_path)
-            with open(output_dylib_path, "wb") as dst:
+        x86_64_archs = get_archs(x86_64_input_dylib_path) if x86_64_input_dylib_path.exists() else []
-                with open(arm64_input_dylib_path, "rb") as src:
+
-                    dst.write(src.read())
+        if "arm64" in arm64_archs and "x86_64" in arm64_archs:
-        else:
+            shutil.copy2(arm64_input_dylib_path, output_dylib_path)
+        elif x86_64_archs:
             subprocess.check_call(
                 [
                     LIPO,

src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Graphics.Vulkan
             DescriptorSetLayout[] layouts = new DescriptorSetLayout[setDescriptors.Count];
             bool[] updateAfterBindFlags = new bool[setDescriptors.Count];
 
-            bool isMoltenVk = gd.IsMoltenVk;
+            bool isMoltenVk = false; // gd.IsMoltenVk
 
             for (int setIndex = 0; setIndex < setDescriptors.Count; setIndex++)
             {

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -433,8 +433,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,
+                supportsPushDescriptors,
-                propertiesPushDescriptor.MaxPushDescriptors,
+                IsMoltenVk ? 16 : propertiesPushDescriptor.MaxPushDescriptors, // In case an old version of MoltenVK is used, apply a limit to prevent vertex explosions.
                 featuresPrimitiveTopologyListRestart.PrimitiveTopologyListRestart,
                 featuresPrimitiveTopologyListRestart.PrimitiveTopologyPatchListRestart,
                 supportsTransformFeedback,
@@ -773,7 +773,7 @@ namespace Ryujinx.Graphics.Vulkan
                 supportsShaderBallot: false,
                 supportsShaderBarrierDivergence: Vendor != Vendor.Intel,
                 supportsShaderFloat64: Capabilities.SupportsShaderFloat64,
-                supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended && !IsMoltenVk,
+                supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended && !IsMoltenVk, // MoltenVK 1.2.10 added support for it, but it doesn't work correctly.
                 supportsTextureShadowLod: false,
                 supportsVertexStoreAndAtomics: features2.Features.VertexPipelineStoresAndAtomics,
                 supportsViewportIndexVertexTessellation: featuresVk12.ShaderOutputViewportIndex,

src/Ryujinx/Ryujinx.csproj

@@ -64,7 +64,7 @@
     <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.AllArch" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
+    <PackageReference Include="Ryujinx.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
     <PackageReference Include="Ryujinx.UpdateClient" />
     <PackageReference Include="Ryujinx.Systems.Update.Common" />
     <PackageReference Include="securifybv.ShellLink" />