From 8fa248ceb4cbc9d199bbac1d968df8b168106c2c Mon Sep 17 00:00:00 2001 From: riperiperi Date: Fri, 13 Jan 2023 00:31:21 +0000 Subject: Vulkan: Add workarounds for MoltenVK (#4202) * Add MVK basics. * Use appropriate output attribute types * 4kb vertex alignment, bunch of fixes * Add reduced shader precision mode for mvk. * Disable ASTC on MVK for now * Only request robustnes2 when it is available. * It's just the one feature actually * Add triangle fan conversion * Allow NullDescriptor on MVK for some reason. * Force safe blit on MoltenVK * Use ASTC only when formats are all available. * Disable multilevel 3d texture views * Filter duplicate render targets (on backend) * Add Automatic MoltenVK Configuration * Do not create color attachment views with formats that are not RT compatible * Make sure that the host format matches the vertex shader input types for invalid/unknown guest formats * FIx rebase for Vertex Attrib State * Fix 4b alignment for vertex * Use asynchronous queue submits for MVK * Ensure color clear shader has correct output type * Update MoltenVK config * Always use MoltenVK workarounds on MacOS * Make MVK supersede all vendors * Fix rebase * Various fixes on rebase * Get portability flags from extension * Fix some minor rebasing issues * Style change * Use LibraryImport for MVKConfiguration * Rename MoltenVK vendor to Apple Intel and AMD GPUs on moltenvk report with the those vendors - only apple silicon reports with vendor 0x106B. * Fix features2 rebase conflict * Rename fragment output type * Add missing check for fragment output types Might have caused the crash in MK8 * Only do fragment output specialization on MoltenVK * Avoid copy when passing capabilities * Self feedback * Address feedback Co-authored-by: gdk Co-authored-by: nastys --- Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs') diff --git a/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs b/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs index 31acfc9b..0a4d365f 100644 --- a/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs +++ b/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs @@ -1,7 +1,20 @@ using Silk.NET.Vulkan; +using System; namespace Ryujinx.Graphics.Vulkan { + [Flags] + enum PortabilitySubsetFlags + { + None = 0, + + VertexBufferAlignment4B = 1, + NoTriangleFans = 1 << 1, + NoPointMode = 1 << 2, + No3DImageView = 1 << 3, + NoLodBias = 1 << 4 + } + readonly struct HardwareCapabilities { public readonly bool SupportsIndexTypeUint8; @@ -23,6 +36,7 @@ namespace Ryujinx.Graphics.Vulkan public readonly uint MaxSubgroupSize; public readonly ShaderStageFlags RequiredSubgroupSizeStages; public readonly SampleCountFlags SupportedSampleCounts; + public readonly PortabilitySubsetFlags PortabilitySubset; public HardwareCapabilities( bool supportsIndexTypeUint8, @@ -43,7 +57,8 @@ namespace Ryujinx.Graphics.Vulkan uint minSubgroupSize, uint maxSubgroupSize, ShaderStageFlags requiredSubgroupSizeStages, - SampleCountFlags supportedSampleCounts) + SampleCountFlags supportedSampleCounts, + PortabilitySubsetFlags portabilitySubset) { SupportsIndexTypeUint8 = supportsIndexTypeUint8; SupportsCustomBorderColor = supportsCustomBorderColor; @@ -64,6 +79,7 @@ namespace Ryujinx.Graphics.Vulkan MaxSubgroupSize = maxSubgroupSize; RequiredSubgroupSizeStages = requiredSubgroupSizeStages; SupportedSampleCounts = supportedSampleCounts; + PortabilitySubset = portabilitySubset; } } } -- cgit v1.2.3