diff options
| author | mageven <62494521+mageven@users.noreply.github.com> | 2020-04-17 06:46:49 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 11:16:49 +1000 |
| commit | 4960ab85f81f48553b7217261f4181e31d812a10 (patch) | |
| tree | 765970f8b028fa965abef43bda308964deaff32d /Ryujinx.Graphics.Gpu | |
| parent | 0a7c6caedffd59011077b49cd6493c7a841a66f5 (diff) | |
Implement Depth Clamping (#1120)
* Implement Depth Clamping and add misc enums
* Fix formatting
Diffstat (limited to 'Ryujinx.Graphics.Gpu')
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Engine/Methods.cs | 23 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/State/MethodOffset.cs | 1 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/State/ViewVolumeClipControl.cs | 12 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/State/YControl.cs | 11 |
4 files changed, 44 insertions, 3 deletions
diff --git a/Ryujinx.Graphics.Gpu/Engine/Methods.cs b/Ryujinx.Graphics.Gpu/Engine/Methods.cs index 50913801..b7f4e1d9 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Methods.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Methods.cs @@ -127,6 +127,11 @@ namespace Ryujinx.Graphics.Gpu.Engine UpdateScissorState(state); } + if (state.QueryModified(MethodOffset.ViewVolumeClipControl)) + { + UpdateDepthClampState(state); + } + if (state.QueryModified(MethodOffset.DepthTestEnable, MethodOffset.DepthWriteEnable, MethodOffset.DepthTestFunc)) @@ -134,7 +139,9 @@ namespace Ryujinx.Graphics.Gpu.Engine UpdateDepthTestState(state); } - if (state.QueryModified(MethodOffset.DepthMode, MethodOffset.ViewportTransform, MethodOffset.ViewportExtents)) + if (state.QueryModified(MethodOffset.DepthMode, + MethodOffset.ViewportTransform, + MethodOffset.ViewportExtents)) { UpdateViewportTransform(state); } @@ -363,6 +370,17 @@ namespace Ryujinx.Graphics.Gpu.Engine } /// <summary> + /// Updates host depth clamp state based on current GPU state. + /// </summary> + /// <param name="state">Current GPU state</param> + private void UpdateDepthClampState(GpuState state) + { + ViewVolumeClipControl clip = state.Get<ViewVolumeClipControl>(MethodOffset.ViewVolumeClipControl); + _context.Renderer.Pipeline.SetDepthClamp((clip & ViewVolumeClipControl.DepthClampNear) != 0, + (clip & ViewVolumeClipControl.DepthClampFar) != 0); + } + + /// <summary> /// Updates host depth test state based on current GPU state. /// </summary> /// <param name="state">Current GPU state</param> @@ -384,8 +402,7 @@ namespace Ryujinx.Graphics.Gpu.Engine _context.Renderer.Pipeline.SetDepthMode(depthMode); - bool flipY = (state.Get<int>(MethodOffset.YControl) & 1) != 0; - + bool flipY = (state.Get<YControl>(MethodOffset.YControl) & YControl.NegateY) != 0; float yFlip = flipY ? -1 : 1; Viewport[] viewports = new Viewport[Constants.TotalViewports]; diff --git a/Ryujinx.Graphics.Gpu/State/MethodOffset.cs b/Ryujinx.Graphics.Gpu/State/MethodOffset.cs index a178c2f8..b8ee7e91 100644 --- a/Ryujinx.Graphics.Gpu/State/MethodOffset.cs +++ b/Ryujinx.Graphics.Gpu/State/MethodOffset.cs @@ -75,6 +75,7 @@ namespace Ryujinx.Graphics.Gpu.State VertexBufferInstanced = 0x620, FaceState = 0x646, ViewportTransformEnable = 0x64b, + ViewVolumeClipControl = 0x64f, Clear = 0x674, RtColorMask = 0x680, ReportState = 0x6c0, diff --git a/Ryujinx.Graphics.Gpu/State/ViewVolumeClipControl.cs b/Ryujinx.Graphics.Gpu/State/ViewVolumeClipControl.cs new file mode 100644 index 00000000..4e12c424 --- /dev/null +++ b/Ryujinx.Graphics.Gpu/State/ViewVolumeClipControl.cs @@ -0,0 +1,12 @@ +using System; + +namespace Ryujinx.Graphics.Gpu.State +{ + [Flags] + enum ViewVolumeClipControl + { + ForceDepthRangeZeroToOne = 1 << 0, + DepthClampNear = 1 << 3, + DepthClampFar = 1 << 4, + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Gpu/State/YControl.cs b/Ryujinx.Graphics.Gpu/State/YControl.cs new file mode 100644 index 00000000..58e000d9 --- /dev/null +++ b/Ryujinx.Graphics.Gpu/State/YControl.cs @@ -0,0 +1,11 @@ +using System; + +namespace Ryujinx.Graphics.Gpu.State +{ + [Flags] + enum YControl + { + NegateY = 1 << 0, + TriangleRastFlip = 1 << 4 + } +}
\ No newline at end of file |
