Vulkan: Add workarounds for MoltenVK #4202

riperiperi · 2023-01-03T22:03:12Z

This PR does the following things:

Adds MoltenVK configuration class and provides helpful configurations without manually specifying environment variables.
Portability subset workarounds for MoltenVK, based on properties/features:
- Enables vertex attribute restriding (always 4 byte for now)
- Enables triangle fan retopology conversion.
- Enables 3D texture view workaround.
Add shader specialization for output attribute types (float/int/uint)
- This should also prevent validation errors relating to this, though all desktop GPUs were OK with it before.
- This has been rewritten compared to what is in the macos build so it needs some testing.
Adds special treatement for duplicate render attachments when the GPU is detected as TBDR.
- Fixes some graphical issues in Mario Kart 8 and Zelda BOTW. The error is caused by two copies of the render target existing in tiled memory, where one that was not written may take priority and erase any changes made during the render pass. Generally when this happens, only one render target is enabled/written, so that target is selected and the other is masked out.
Add alternate versions of the clear shader for int and uint type targets.
Disable null descriptors if they are not available, but Secretly Use Them Anyways on MoltenVK as a Funny Joke.
- In all seriousness, using null descriptors avoids issues with stale resource usage.
- Rosetta doesn't seem to care. Nobody is allowed to gaslight me by saying rosetta doesn't work without this.
Actually check for individual ASTC formats before saying it is supported. MoltenVK on Rosetta supports the extension, but not the individual formats.
Minor additional changes/reordering.

This PR does not include other things mentioned on #4062, such as transform feedback or geometry shader emulation. It also doesn't include A64 JIT, hypervisor or any related workarounds, so things will only really work under Rosetta. The performance enhancement "buffer mirrors" also is not present, which may negatively impact some games. This may be lessened by recent changes to reduce inline updates.

One important thing this doesn't include is any sort of workaround for resource usage errors on MoltenVK. These issues are better explained on #4062, but I really have not had time to make some kind of reproduction for the issue to report it to them. I'd rather we didn't have to add some weird resource tracking to our descriptor set updater just for MoltenVK.

riperiperi · 2023-01-03T22:05:08Z

Note: there seems to be an issue with the attachment format specialization, though it happened randomly after like 4 races in Mario Kart 8 Deluxe. I'm looking into it.

[mvk-error] VK_ERROR_INITIALIZATION_FAILED: Render pipeline compile failed (Error code 3):
output of type uint4 is not compatible with a MTLPixelFormatRG11B10Float color attachement..

Ryujinx.Graphics.Gpu/Engine/Threed/SpecializationStateUpdater.cs

github-actions · 2023-01-03T22:30:55Z

Download the artifacts for this pull request:

Experimental GUI (Avalonia)

GUI-less (SDL2)

Only for Developers

Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs

Ryujinx.Graphics.Vulkan/Vendor.cs

Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs

Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs

Ryujinx.Graphics.Vulkan/HelperShader.cs

Ryujinx.Graphics.Vulkan/MoltenVK/MVKConfiguration.cs

Ryujinx.Graphics.Vulkan/Vendor.cs

…patible

…for invalid/unknown guest formats

Intel and AMD GPUs on moltenvk report with the those vendors - only apple silicon reports with vendor 0x106B.

Might have caused the crash in MK8

riperiperi · 2023-01-12T19:17:35Z

Ready for review.

Ryujinx.Graphics.Gpu/Engine/Threed/SpecializationStateUpdater.cs

Ryujinx.Graphics.Shader/IGpuAccessor.cs

Ryujinx.Graphics.Vulkan/FramebufferParams.cs

Ryujinx.Graphics.Vulkan/VertexBufferState.cs

Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

gdkchan · 2023-01-12T19:57:15Z

Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -515,12 +590,13 @@ private unsafe void PrintGpuInformation()

            IsAmdWindows = Vendor == Vendor.Amd && RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
            IsIntelWindows = Vendor == Vendor.Intel && RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            IsTBDR = IsMoltenVk || Vendor == Vendor.Qualcomm;


That doesn't look right when desktop GPUs will also be included here (AMD, there's also integrated Intel which I think it's also not TBDR)? Also should we include ARM (Mali) GPUs?

I don't know how Intel/AMD GPUs on macOS will behave in this situation, so the workaround was enabled there too.

Also, I do think other TBDR gpus should be included here, as they will definitely have the issue.

gdkchan · 2023-01-12T19:59:27Z

Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -434,7 +507,9 @@ public unsafe Capabilities GetCapabilities()
                GpuVendor,
                hasFrontFacingBug: IsIntelWindows,
                hasVectorIndexingBug: Vendor == Vendor.Qualcomm,
-                supportsAstcCompression: features2.Features.TextureCompressionAstcLdr,
+                needsFragmentOutputSpecialization: IsMoltenVk,
+                reduceShaderPrecision: IsMoltenVk,


Maybe we should include all mobile GPUs here too.

This one is enabled because of a weird behaviour with SPIRV-Cross that makes precise much slower. I'm not sure how much effect there will be on other GPUs from this, but it probably won't be anywhere near as extreme.

gdkchan

lgtm, thanks.

riperiperi added the gpu Related to Ryujinx.Graphics label Jan 3, 2023

riperiperi force-pushed the feat/mvk branch from c08bf4d to a28d82b Compare January 3, 2023 22:03

riperiperi mentioned this pull request Jan 3, 2023

MacOS upstreaming roadmap #4062

Closed

16 tasks

gdkchan reviewed Jan 3, 2023

View reviewed changes

Ryujinx.Graphics.Gpu/Engine/Threed/SpecializationStateUpdater.cs Outdated Show resolved Hide resolved

IsaacMarovitz reviewed Jan 4, 2023

View reviewed changes

Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs Outdated Show resolved Hide resolved

riperiperi force-pushed the feat/mvk branch from a28d82b to c64590f Compare January 6, 2023 19:57

gdkchan reviewed Jan 7, 2023

View reviewed changes

Ryujinx.Graphics.Vulkan/Vendor.cs Outdated Show resolved Hide resolved

gdkchan reviewed Jan 7, 2023

View reviewed changes

Ryujinx.Graphics.Vulkan/VulkanInitialization.cs Outdated Show resolved Hide resolved

riperiperi force-pushed the feat/mvk branch from c64590f to 8bd9a36 Compare January 11, 2023 19:03

riperiperi commented Jan 12, 2023

View reviewed changes

riperiperi and others added 18 commits January 12, 2023 19:14

Add MVK basics.

d77a67a

Use appropriate output attribute types

10aa387

4kb vertex alignment, bunch of fixes

ba59cbb

Add reduced shader precision mode for mvk.

72792f0

Disable ASTC on MVK for now

5e5094e

Only request robustnes2 when it is available.

8236298

It's just the one feature actually

696710a

Add triangle fan conversion

14a240b

Allow NullDescriptor on MVK for some reason.

f657edd

Force safe blit on MoltenVK

7ae2e0b

Use ASTC only when formats are all available.

3e0a931

Disable multilevel 3d texture views

2754870

Filter duplicate render targets (on backend)

dec6f21

Add Automatic MoltenVK Configuration

fd700bf

Do not create color attachment views with formats that are not RT com…

824fa03

…patible

Make sure that the host format matches the vertex shader input types …

3227eb4

…for invalid/unknown guest formats

FIx rebase for Vertex Attrib State

2d2fdc5

Fix 4b alignment for vertex

5e1d9a9

riperiperi and others added 18 commits January 12, 2023 19:15

Use asynchronous queue submits for MVK

8e60ba9

Ensure color clear shader has correct output type

bb3818a

Update MoltenVK config

b6510da

Always use MoltenVK workarounds on MacOS

76c0e90

Make MVK supersede all vendors

abd303d

Fix rebase

33b2996

Various fixes on rebase

4523e8c

Get portability flags from extension

8a11eee

Fix some minor rebasing issues

c17b01e

Style change

011762f

Use LibraryImport for MVKConfiguration

3961f78

Rename MoltenVK vendor to Apple

63096d2

Intel and AMD GPUs on moltenvk report with the those vendors - only apple silicon reports with vendor 0x106B.

Fix features2 rebase conflict

870cf3b

Rename fragment output type

388cff2

Add missing check for fragment output types

2cd1971

Might have caused the crash in MK8

Only do fragment output specialization on MoltenVK

2a26c82

Avoid copy when passing capabilities

a68dd53

Self feedback

a75cc41

riperiperi force-pushed the feat/mvk branch from 4f56c15 to a75cc41 Compare January 12, 2023 19:15

riperiperi marked this pull request as ready for review January 12, 2023 19:15

gdkchan reviewed Jan 12, 2023

View reviewed changes

Address feedback

a7573c0

gdkchan approved these changes Jan 12, 2023

View reviewed changes

AcK77 approved these changes Jan 13, 2023

View reviewed changes

AcK77 merged commit 8fa248c into Ryujinx:master Jan 13, 2023

gdkchan mentioned this pull request Feb 5, 2023

Insert bitcast for assignment of fragment integer outputs on GLSL #4369

Merged

shinra-electric mentioned this pull request Feb 5, 2023

RPCS3 Error: Thread terminated due to fatal error: Assertion Failed! Vulkan API call failed with unrecoverable error: Requested feature not available (VK_ERROR_FEATURE_NOT_PRESENT) RPCS3/rpcs3#12705

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vulkan: Add workarounds for MoltenVK #4202

Vulkan: Add workarounds for MoltenVK #4202

riperiperi commented Jan 3, 2023 •

edited

riperiperi commented Jan 3, 2023

github-actions bot commented Jan 3, 2023 •

edited

riperiperi commented Jan 12, 2023

gdkchan Jan 12, 2023

riperiperi Jan 12, 2023

riperiperi Jan 12, 2023

gdkchan Jan 12, 2023

riperiperi Jan 12, 2023 •

edited

gdkchan left a comment

Vulkan: Add workarounds for MoltenVK #4202

Vulkan: Add workarounds for MoltenVK #4202

Conversation

riperiperi commented Jan 3, 2023 • edited

riperiperi commented Jan 3, 2023

github-actions bot commented Jan 3, 2023 • edited

riperiperi commented Jan 12, 2023

gdkchan Jan 12, 2023

Choose a reason for hiding this comment

riperiperi Jan 12, 2023

Choose a reason for hiding this comment

riperiperi Jan 12, 2023

Choose a reason for hiding this comment

gdkchan Jan 12, 2023

Choose a reason for hiding this comment

riperiperi Jan 12, 2023 • edited

Choose a reason for hiding this comment

gdkchan left a comment

Choose a reason for hiding this comment

riperiperi commented Jan 3, 2023 •

edited

github-actions bot commented Jan 3, 2023 •

edited

riperiperi Jan 12, 2023 •

edited