Vulkan Package Update - Part 1 (#16 )

As described. Should hopefully bring speed-ups for macOS devices (thanks Ori!) and general improvements across the board for the vulkan backend (maybe). This will be followed up with a PR from @KeatonTheBot. Co-authored-by: V380-Ori <infiniteloop0finsanity@gmail.com> Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/16
Fix crash on Mac and Android caused by a buffer validation error fix in #92 (#105 )
2026-05-20 12:15:46 +00:00 · 2026-05-19 20:23:06 +00:00 · 2026-05-18 16:34:04 +00:00 · 2026-05-16 13:28:02 +00:00
8 changed files with 99 additions and 57 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -45,7 +45,7 @@
    <!--<PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />-->
    <PackageVersion Include="Ryujinx.Audio.OpenAL" Version="1.25.1" />
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.4-build6" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.3" />
    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
    <PackageVersion Include="Ryujinx.UpdateClient" Version="2.0.6" />
    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />
@@ -53,9 +53,10 @@
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
    <PackageVersion Include="Sep" Version="0.14.1" />
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.23.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.23.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
    <PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9" />
    <PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9" />
@@ -64,4 +65,4 @@
    <PackageVersion Include="System.IO.Hashing" Version="9.0.15" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.3" />
  </ItemGroup>
-</Project>
+</Project>
--- a/assets/Locales/Root.json
+++ b/assets/Locales/Root.json
@@ -6107,8 +6107,8 @@
        "de_DE": "",
        "el_GR": "",
        "en_US": "Enable Net Logs",
-        "es_ES": "Habilitar registros de red.",
-        "fr_FR": "",
+        "es_ES": "Habilitar Registros de Red.",
+        "fr_FR": "Activer les Journaux Réseau.",
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
@@ -17108,7 +17108,7 @@
        "el_GR": "",
        "en_US": "Prints network log messages in the console.",
        "es_ES": "Imprimir registros de red en la consola.",
-        "fr_FR": "",
+        "fr_FR": "Affiche les journaux réseau dans la console.",
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
--- a/distribution/macos/construct_universal_dylib.py
+++ b/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 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,
--- a/src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs
@@ -16,15 +16,15 @@ 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++)
@@ -42,12 +42,13 @@ namespace Ryujinx.Graphics.Vulkan
                    ResourceDescriptor descriptor = rdc.Descriptors[descIndex];
                    ResourceStages stages = descriptor.Stages;

-                    if (descriptor.Type == ResourceType.StorageBuffer && isMoltenVk)
+                    if (descriptor.Type == ResourceType.StorageBuffer && gd.IsMoltenVk)
                    {
-                        // There's a bug on MoltenVK where using the same buffer across different stages
+                        // There's a bug in MoltenVK where using the same buffer across different stages
                        // causes invalid resource errors, allow the binding on all active stages as workaround.
+                        // https://github.com/KhronosGroup/MoltenVK/issues/1870
                        stages = activeStages;
-                    }
+                    }   

                    layoutBindings[descIndex] = new DescriptorSetLayoutBinding
                    {
--- a/src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Buffers;
 using VkBuffer = Silk.NET.Vulkan.Buffer;

 namespace Ryujinx.Graphics.Vulkan
@@ -61,29 +62,65 @@ namespace Ryujinx.Graphics.Vulkan
        {
            if (_count != 0)
            {
-                for (int i = 0; i < _count; i++)
-                {
-                    _buffers[i] = _bufferAutos[i].Get(cbs, _bufferOffsetsForGet[i], _bufferSizesForGet[i]).Value;
-                    _bufferAutos[i] = null;
-                }
-
-                if (_gd.Capabilities.SupportsExtendedDynamicState)
-                {
-                    _gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
-                        cbs.CommandBuffer,
-                        _baseBinding,
-                        _count,
-                        _buffers.Pointer,
-                        _offsets.Pointer,
-                        _sizes.Pointer,
-                        _strides.Pointer);
-                }
-                else
-                {
-                    _gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, _baseBinding, _count, _buffers.Pointer, _offsets.Pointer);
-                }
-
+                int count = (int)_count;
+                uint baseBinding = _baseBinding;
                _count = 0;
+
+                Auto<DisposableBuffer>[] autos = ArrayPool<Auto<DisposableBuffer>>.Shared.Rent(count);
+                Span<int> getOffsets = stackalloc int[Constants.MaxVertexBuffers];
+                Span<int> getSizes = stackalloc int[Constants.MaxVertexBuffers];
+                Span<ulong> offsets = stackalloc ulong[Constants.MaxVertexBuffers];
+                Span<ulong> sizes = stackalloc ulong[Constants.MaxVertexBuffers];
+                Span<ulong> strides = stackalloc ulong[Constants.MaxVertexBuffers];
+                Span<VkBuffer> buffers = stackalloc VkBuffer[Constants.MaxVertexBuffers];
+
+                for (int i = 0; i < count; i++)
+                {
+                    autos[i] = _bufferAutos[i];
+                    _bufferAutos[i] = null;
+                    getOffsets[i] = _bufferOffsetsForGet[i];
+                    getSizes[i] = _bufferSizesForGet[i];
+                    offsets[i] = _offsets[i];
+                    sizes[i] = _sizes[i];
+                    strides[i] = _strides[i];
+                }
+
+                try
+                {
+                    for (int i = 0; i < count; i++)
+                    {
+                        buffers[i] = autos[i].Get(cbs, getOffsets[i], getSizes[i]).Value;
+                        autos[i] = null;
+                    }
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        _buffers[i] = buffers[i];
+                        _offsets[i] = offsets[i];
+                        _sizes[i] = sizes[i];
+                        _strides[i] = strides[i];
+                    }
+
+                    if (_gd.Capabilities.SupportsExtendedDynamicState)
+                    {
+                        _gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
+                            cbs.CommandBuffer,
+                            baseBinding,
+                            (uint)count,
+                            _buffers.Pointer,
+                            _offsets.Pointer,
+                            _sizes.Pointer,
+                            _strides.Pointer);
+                    }
+                    else
+                    {
+                        _gd.Api.CmdBindVertexBuffers(cbs.CommandBuffer, baseBinding, (uint)count, _buffers.Pointer, _offsets.Pointer);
+                    }
+                }
+                finally
+                {
+                    ArrayPool<Auto<DisposableBuffer>>.Shared.Return(autos, clearArray: true);
+                }
            }
        }

--- a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
@@ -435,8 +435,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, // In case an old version of MoltenVK is used, apply a limit to prevent vertex explosions.
                featuresPrimitiveTopologyListRestart.PrimitiveTopologyListRestart,
                featuresPrimitiveTopologyListRestart.PrimitiveTopologyPatchListRestart,
                supportsTransformFeedback,
@@ -775,10 +775,11 @@ namespace Ryujinx.Graphics.Vulkan
                supportsShaderBallot: false,
                supportsShaderBarrierDivergence: Vendor != Vendor.Intel,
                supportsShaderFloat64: Capabilities.SupportsShaderFloat64,
+
                supportsShaderNonUniformIndexing:
                    featuresVk12.ShaderSampledImageArrayNonUniformIndexing &&
                    featuresVk12.ShaderStorageImageArrayNonUniformIndexing,
-                supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended && !IsMoltenVk,
+                supportsTextureGatherOffsets: features2.Features.ShaderImageGatherExtended,
                supportsTextureShadowLod: false,
                supportsVertexStoreAndAtomics: features2.Features.VertexPipelineStoresAndAtomics,
                supportsViewportIndexVertexTessellation: featuresVk12.ShaderOutputViewportIndex,
--- a/src/Ryujinx.HLE.Generators/Ryujinx.HLE.Generators.csproj
+++ b/src/Ryujinx.HLE.Generators/Ryujinx.HLE.Generators.csproj
@@ -14,7 +14,10 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+      
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" >
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
    </ItemGroup>

 </Project>
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -28,14 +28,14 @@
    <PublishTrimmed>true</PublishTrimmed>
    <TrimMode>partial</TrimMode>
  </PropertyGroup>
-  
+
  <!--
    FluentAvalonia, used in the Avalonia UI, requires a workaround for the json serializer used internally when using .NET 8+ System.Text.Json.
    See:
      https://github.com/amwx/FluentAvalonia/issues/481
      https://devblogs.microsoft.com/dotnet/system-text-json-in-dotnet-8/
  -->
-  
+
  <PropertyGroup>
    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
  </PropertyGroup>
@@ -63,7 +63,7 @@
    <PackageReference Include="OpenTK.Core" />
    <PackageReference Include="Ryujinx.Audio.OpenAL" 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.Graphics.Vulkan.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" />
@@ -73,7 +73,7 @@
    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
    <PackageReference Include="SPB" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\Ryujinx.Graphics.RenderDocApi\Ryujinx.Graphics.RenderDocApi.csproj" />
    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj" />