From 461c24092ae6e148d896c18aa3e86220c89981f8 Mon Sep 17 00:00:00 2001 From: riperiperi Date: Tue, 1 Dec 2020 23:13:27 +0000 Subject: [PATCH] Implement Force Early Z Register (#1755) --- .../Shader/Cache/CacheHelper.cs | 18 ++++++++++++++++++ .../Cache/Definition/GuestGpuAccessorHeader.cs | 4 ++-- .../Cache/Definition/GuestGpuStateFlags.cs | 10 ++++++++++ .../Shader/CachedGpuAccessor.cs | 9 +++++++++ Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs | 9 +++++++++ Ryujinx.Graphics.Gpu/State/MethodOffset.cs | 1 + .../CodeGen/Glsl/Declarations.cs | 6 ++++++ Ryujinx.Graphics.Shader/IGpuAccessor.cs | 5 +++++ 8 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuStateFlags.cs diff --git a/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs b/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs index 1d492214eb..d10e46711a 100644 --- a/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs +++ b/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs @@ -332,6 +332,23 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache return null; } + /// + /// Builds gpu state flags using information from the given gpu accessor. + /// + /// The gpu accessor + /// The gpu state flags + private static GuestGpuStateFlags GetGpuStateFlags(IGpuAccessor gpuAccessor) + { + GuestGpuStateFlags flags = 0; + + if (gpuAccessor.QueryEarlyZForce()) + { + flags |= GuestGpuStateFlags.EarlyZForce; + } + + return flags; + } + /// /// Create a new instance of from an gpu accessor. /// @@ -347,6 +364,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache ComputeLocalMemorySize = gpuAccessor.QueryComputeLocalMemorySize(), ComputeSharedMemorySize = gpuAccessor.QueryComputeSharedMemorySize(), PrimitiveTopology = gpuAccessor.QueryPrimitiveTopology(), + StateFlags = GetGpuStateFlags(gpuAccessor) }; } diff --git a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuAccessorHeader.cs b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuAccessorHeader.cs index 396b044309..610b2da10e 100644 --- a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuAccessorHeader.cs +++ b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuAccessorHeader.cs @@ -55,8 +55,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache.Definition public ushort Reserved2; /// - /// Unused/reserved. + /// GPU boolean state that can influence shader compilation. /// - public byte Reserved3; + public GuestGpuStateFlags StateFlags; } } diff --git a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuStateFlags.cs b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuStateFlags.cs new file mode 100644 index 0000000000..4b1fbb066d --- /dev/null +++ b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestGpuStateFlags.cs @@ -0,0 +1,10 @@ +using System; + +namespace Ryujinx.Graphics.Gpu.Shader.Cache.Definition +{ + [Flags] + enum GuestGpuStateFlags : byte + { + EarlyZForce = 1 << 0 + } +} diff --git a/Ryujinx.Graphics.Gpu/Shader/CachedGpuAccessor.cs b/Ryujinx.Graphics.Gpu/Shader/CachedGpuAccessor.cs index 021369821b..f714d97bd0 100644 --- a/Ryujinx.Graphics.Gpu/Shader/CachedGpuAccessor.cs +++ b/Ryujinx.Graphics.Gpu/Shader/CachedGpuAccessor.cs @@ -150,5 +150,14 @@ namespace Ryujinx.Graphics.Gpu.Shader return textureDescriptor; } + + /// + /// Queries if host state forces early depth testing. + /// + /// True if early depth testing is forced + public bool QueryEarlyZForce() + { + return (_header.StateFlags & GuestGpuStateFlags.EarlyZForce) != 0; + } } } diff --git a/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs b/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs index 2783714b3a..c0ad481ea3 100644 --- a/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs +++ b/Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs @@ -196,5 +196,14 @@ namespace Ryujinx.Graphics.Gpu.Shader return _context.Methods.TextureManager.GetGraphicsTextureDescriptor(_state, _stageIndex, handle); } } + + /// + /// Queries if host state forces early depth testing. + /// + /// True if early depth testing is forced + public bool QueryEarlyZForce() + { + return _state.Get(MethodOffset.EarlyZForce); + } } } diff --git a/Ryujinx.Graphics.Gpu/State/MethodOffset.cs b/Ryujinx.Graphics.Gpu/State/MethodOffset.cs index 3293ae8ec8..6ec94c1b01 100644 --- a/Ryujinx.Graphics.Gpu/State/MethodOffset.cs +++ b/Ryujinx.Graphics.Gpu/State/MethodOffset.cs @@ -13,6 +13,7 @@ namespace Ryujinx.Graphics.Gpu.State LaunchDma = 0x6c, LoadInlineData = 0x6d, CopyDstTexture = 0x80, + EarlyZForce = 0x84, CopySrcTexture = 0x8c, DispatchParamsAddress = 0xad, Dispatch = 0xaf, diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs index 825564b8c5..d43fe6324d 100644 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs +++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs @@ -141,6 +141,12 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl { if (context.Config.Stage == ShaderStage.Fragment) { + if (context.Config.GpuAccessor.QueryEarlyZForce()) + { + context.AppendLine("layout(early_fragment_tests) in;"); + context.AppendLine(); + } + context.AppendLine($"uniform bool {DefaultNames.IsBgraName}[8];"); context.AppendLine(); } diff --git a/Ryujinx.Graphics.Shader/IGpuAccessor.cs b/Ryujinx.Graphics.Shader/IGpuAccessor.cs index cb9db92218..fe034c57cb 100644 --- a/Ryujinx.Graphics.Shader/IGpuAccessor.cs +++ b/Ryujinx.Graphics.Shader/IGpuAccessor.cs @@ -78,5 +78,10 @@ { return TextureFormat.R8G8B8A8Unorm; } + + bool QueryEarlyZForce() + { + return false; + } } }