From ee1460dcaa8cf32d5b775162c17211d878c8c837 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sat, 10 Oct 2015 22:44:05 +0200
Subject: [PATCH] Update C# vulkan pipeline state structs to match

---
 renderdocui/Interop/VulkanPipelineState.cs             | 10 ++--------
 .../Windows/PipelineState/VulkanPipelineStateViewer.cs |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/renderdocui/Interop/VulkanPipelineState.cs b/renderdocui/Interop/VulkanPipelineState.cs
index a6ee5fc4b..fda62bb34 100644
--- a/renderdocui/Interop/VulkanPipelineState.cs
+++ b/renderdocui/Interop/VulkanPipelineState.cs
@@ -165,8 +165,6 @@ namespace renderdoc
         [StructLayout(LayoutKind.Sequential)]
         public class ViewState
         {
-            public ResourceId state;
-
             [StructLayout(LayoutKind.Sequential)]
             public class ViewportScissor
             {
@@ -205,7 +203,6 @@ namespace renderdoc
             public TriangleCullMode CullMode;
 
             // from dynamic state
-            public ResourceId state;
             public float depthBias;
             public float depthBiasClamp;
             public float slopeScaledDepthBias;
@@ -257,7 +254,6 @@ namespace renderdoc
             [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]
             public Attachment[] attachments;
 
-            public ResourceId state;
             [CustomMarshalAs(CustomUnmanagedType.FixedArray, FixedLength = 4)]
             public float[] blendConst;
         };
@@ -286,16 +282,14 @@ namespace renderdoc
                 public string passOp;
                 [CustomMarshalAs(CustomUnmanagedType.UTF8TemplatedString)]
                 public string func;
-                public UInt32 stencilref;
+
+                public UInt32 stencilref, compareMask, writeMask;
             };
             [CustomMarshalAs(CustomUnmanagedType.CustomClass)]
             public StencilOp front, back;
 
-            public ResourceId State;
             public float minDepthBounds;
             public float maxDepthBounds;
-            public UInt32 StencilReadMask;
-            public UInt32 StencilWriteMask;
         };
         [CustomMarshalAs(CustomUnmanagedType.CustomClass)]
         public DepthStencil DS;
diff --git a/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs b/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs
index c1db5bf46..70d7ab0ca 100644
--- a/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs
+++ b/renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs
@@ -905,8 +905,8 @@ namespace renderdocui.Windows.PipelineState
             depthWrite.Image = state.DS.depthWriteEnable ? tick : cross;
 
             stencilEnable.Image = state.DS.stencilTestEnable ? tick : cross;
-            stencilReadMask.Text = state.DS.StencilReadMask.ToString("X2");
-            stencilWriteMask.Text = state.DS.StencilWriteMask.ToString("X2");
+            stencilReadMask.Text = state.DS.front.compareMask.ToString("X2");
+            stencilWriteMask.Text = state.DS.front.writeMask.ToString("X2");
             stencilRef.Text = state.DS.front.stencilref.ToString("X2");
 
             stencilFuncs.BeginUpdate();