lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-11 12:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work around further broken Intel occlusion queries. Closes #2925

Browse Source
This commit is contained in:
baldurk
2023-05-16 17:31:13 +01:00
parent f621e5e083
commit 1a2db41fa8
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_pixelhistory.cpp
+26
View File
@@ -699,6 +699,9 @@ protected:
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_OP);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_WRITE_MASK_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_BLEND_ENABLE_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_BLEND_EQUATION_EXT);
if(disableTests)
{
@@ -766,7 +769,27 @@ protected:
VkPipelineColorBlendAttachmentState *atts =
(VkPipelineColorBlendAttachmentState *)cbs->pAttachments;
for(uint32_t i = 0; i < cbs->attachmentCount; i++)
{
atts[i].colorWriteMask = 0;
// on intel with a color write mask of 0, shader discards seem to be ignored for occlusion
// queries
if(m_pDriver->GetDriverInfo().IntelBrokenOcclusionQueries())
{
// only writemask alpha just in case some other bug manifests
atts[i].colorWriteMask = 0x8;
// disable logic ops
cbs->logicOpEnable = VK_FALSE;
// set blend state to source=0 and dest=1 with ADD, which is equivalent to a disabled
// write mask
atts[i].srcColorBlendFactor = atts[i].srcAlphaBlendFactor = VK_BLEND_FACTOR_ZERO;
atts[i].srcColorBlendFactor = atts[i].srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE;
atts[i].colorBlendOp = atts[i].alphaBlendOp = VK_BLEND_OP_ADD;
atts[i].blendEnable = VK_TRUE;
}
}
}
stages.resize(pipeCreateInfo.stageCount);
@@ -2964,6 +2987,9 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_OP);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_WRITE_MASK_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_BLEND_ENABLE_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_BLEND_EQUATION_EXT);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE);
m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP);