443 -libarmeillure-macos (#142)

Fixes [#443](https://github.com/Ryubing/Issues/issues/433)

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/142

distribution/macos/construct_universal_dylib.py

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

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++)
@@ -48,7 +48,7 @@ namespace Ryujinx.Graphics.Vulkan
                         // 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
                     {

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -439,7 +439,7 @@ namespace Ryujinx.Graphics.Vulkan
                 features2.Features.MultiViewport && !(IsMoltenVk && Vendor == Vendor.Amd), // Workaround for AMD on MoltenVK issue
                 featuresRobustness2.NullDescriptor || IsMoltenVk,
                 supportsPushDescriptors,
-                IsMoltenVk ? 16 : propertiesPushDescriptor.MaxPushDescriptors, // In case an old version of MoltenVK is used, apply a limit to prevent vertex explosions.
+                IsMoltenVk ? 16 : propertiesPushDescriptor.MaxPushDescriptors, // Prevents vertex explosions on MoltenVK.
                 featuresPrimitiveTopologyListRestart.PrimitiveTopologyListRestart,
                 featuresPrimitiveTopologyListRestart.PrimitiveTopologyPatchListRestart,
                 supportsTransformFeedback,

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>
@@ -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" />