lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-21 22:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overlay bugs with extended dynamic state

Browse Source
This commit is contained in:
baldurk
2020-09-04 11:29:12 +01:00
parent c96b05ec3b
commit d524eb8cc8
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_overlay.cpp
+40 -3
View File
@@ -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