From d524eb8cc8bb88b59b5ff84099e9f825b34388af Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 4 Sep 2020 11:29:12 +0100
Subject: [PATCH] Fix overlay bugs with extended dynamic state

---
 renderdoc/driver/vulkan/vk_overlay.cpp | 43 ++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp
index 8f3b59184..79fc471b8 100644
--- a/renderdoc/driver/vulkan/vk_overlay.cpp
+++ b/renderdoc/driver/vulkan/vk_overlay.cpp
@@ -858,6 +858,14 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
     rs->cullMode = VK_CULL_MODE_NONE;
     rs->rasterizerDiscardEnable = false;
 
+    // disable tests in dynamic state too
+    m_pDriver->m_RenderState.depthTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthWriteEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthCompareOp = VK_COMPARE_OP_ALWAYS;
+    m_pDriver->m_RenderState.stencilTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthBoundsTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.cullMode = VK_CULL_MODE_NONE;
+
     // disable all discard rectangles
     RemoveNextStruct(&pipeCreateInfo,
                      VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT);
@@ -1123,6 +1131,14 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
     rs->cullMode = VK_CULL_MODE_NONE;    // first render without any culling
     rs->rasterizerDiscardEnable = false;
 
+    // disable tests in dynamic state too
+    m_pDriver->m_RenderState.depthTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthWriteEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthCompareOp = VK_COMPARE_OP_ALWAYS;
+    m_pDriver->m_RenderState.stencilTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthBoundsTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.cullMode = VK_CULL_MODE_NONE;
+
     if(m_pDriver->GetDeviceEnabledFeatures().depthClamp)
       rs->depthClampEnable = true;
 
@@ -1387,13 +1403,21 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
 
     VkPipelineRasterizationStateCreateInfo *rs =
         (VkPipelineRasterizationStateCreateInfo *)pipeCreateInfo.pRasterizationState;
-    VkCullModeFlags origCullMode = rs->cullMode;
+    VkCullModeFlags origCullMode = prevstate.cullMode;
     rs->cullMode = VK_CULL_MODE_NONE;    // first render without any culling
     rs->rasterizerDiscardEnable = false;
 
     if(m_pDriver->GetDeviceEnabledFeatures().depthClamp)
       rs->depthClampEnable = true;
 
+    // disable tests in dynamic state too
+    m_pDriver->m_RenderState.depthTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthWriteEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthCompareOp = VK_COMPARE_OP_ALWAYS;
+    m_pDriver->m_RenderState.stencilTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthBoundsTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.cullMode = VK_CULL_MODE_NONE;
+
     VkPipelineColorBlendStateCreateInfo *cb =
         (VkPipelineColorBlendStateCreateInfo *)pipeCreateInfo.pColorBlendState;
     cb->logicOpEnable = false;
@@ -1466,6 +1490,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
     m_pDriver->ReplayLog(0, eventId, eReplay_OnlyDraw);
 
     m_pDriver->m_RenderState.graphics.pipeline = GetResID(pipe[1]);
+    m_pDriver->m_RenderState.cullMode = origCullMode;
 
     m_pDriver->ReplayLog(0, eventId, eReplay_OnlyDraw);
 
@@ -1645,10 +1670,10 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
     // disable all tests possible
     VkPipelineDepthStencilStateCreateInfo *ds =
         (VkPipelineDepthStencilStateCreateInfo *)pipeCreateInfo.pDepthStencilState;
-    VkBool32 origDepthTest = ds->depthTestEnable;
+    VkBool32 origDepthTest = prevstate.depthTestEnable;
     ds->depthTestEnable = false;
     ds->depthWriteEnable = false;
-    VkBool32 origStencilTest = ds->stencilTestEnable;
+    VkBool32 origStencilTest = prevstate.stencilTestEnable;
     ds->stencilTestEnable = false;
     ds->depthBoundsTestEnable = false;
 
@@ -1741,6 +1766,13 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
 
     m_pDriver->m_RenderState.graphics.pipeline = GetResID(failpipe);
 
+    // disable tests in dynamic state too
+    m_pDriver->m_RenderState.depthTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthWriteEnable = VK_FALSE;
+    m_pDriver->m_RenderState.stencilTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.depthBoundsTestEnable = VK_FALSE;
+    m_pDriver->m_RenderState.cullMode = VK_CULL_MODE_NONE;
+
     vkr = vt->EndCommandBuffer(Unwrap(cmd));
     RDCASSERTEQUAL(vkr, VK_SUCCESS);
 
@@ -1753,6 +1785,11 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D
       m_pDriver->m_RenderState.SetFramebuffer(m_pDriver, GetResID(depthFB));
     }
 
+    if(overlay == DebugOverlay::Depth)
+      m_pDriver->m_RenderState.depthTestEnable = origDepthTest;
+    else
+      m_pDriver->m_RenderState.stencilTestEnable = origStencilTest;
+
     m_pDriver->ReplayLog(0, eventId, eReplay_OnlyDraw);
 
     // submit & flush so that we don't have to keep pipeline around for a while