diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-12-19 18:48:06 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-01-04 11:42:21 +0100 |
commit | 8bd58a97d70027575b7f4ec227e7a57ed11990bc (patch) | |
tree | 3f5bc9ec05892751b1193c716e9d972f139aa910 /src/gui/rhi/qrhivulkan.cpp | |
parent | c715974dc266cd96c0de0daccf72a20a3cf36905 (diff) |
rhi: vk: Fix DS WAW hazard reported from sync validation
Running with synchronization validation (SDK 1.2.154) we get:
Hazard WRITE_AFTER_WRITE vs. layout transition in subpass 0 for attachment 1
aspect depth during load with loadOp VK_ATTACHMENT_LOAD_OP_CLEAR
Attempt to fix this with an appropriate subpass dependency.
Fixes: QTBUG-89760
Pick-to: 6.0
Change-Id: I67e15a09aab564f63aab646761ccdb1f8b82111d
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui/rhi/qrhivulkan.cpp')
-rw-r--r-- | src/gui/rhi/qrhivulkan.cpp | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp index 232b1be408..394a578e9f 100644 --- a/src/gui/rhi/qrhivulkan.cpp +++ b/src/gui/rhi/qrhivulkan.cpp @@ -1178,14 +1178,25 @@ bool QRhiVulkan::createDefaultRenderPass(QVkRenderPassDescriptor *rpD, bool hasD subpassDesc.pDepthStencilAttachment = hasDepthStencil ? &rpD->dsRef : nullptr; // Replace the first implicit dep (TOP_OF_PIPE / ALL_COMMANDS) with our own. - VkSubpassDependency subpassDep; - memset(&subpassDep, 0, sizeof(subpassDep)); - subpassDep.srcSubpass = VK_SUBPASS_EXTERNAL; - subpassDep.dstSubpass = 0; - subpassDep.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - subpassDep.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - subpassDep.srcAccessMask = 0; - subpassDep.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + VkSubpassDependency subpassDeps[2]; + memset(subpassDeps, 0, sizeof(subpassDeps)); + subpassDeps[0].srcSubpass = VK_SUBPASS_EXTERNAL; + subpassDeps[0].dstSubpass = 0; + subpassDeps[0].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + subpassDeps[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + subpassDeps[0].srcAccessMask = 0; + subpassDeps[0].dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + if (hasDepthStencil) { + subpassDeps[1].srcSubpass = VK_SUBPASS_EXTERNAL; + subpassDeps[1].dstSubpass = 0; + subpassDeps[1].srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT + | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + subpassDeps[1].dstStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT + | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + subpassDeps[1].srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + subpassDeps[1].dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT + | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + } VkRenderPassCreateInfo rpInfo; memset(&rpInfo, 0, sizeof(rpInfo)); @@ -1195,10 +1206,12 @@ bool QRhiVulkan::createDefaultRenderPass(QVkRenderPassDescriptor *rpD, bool hasD rpInfo.subpassCount = 1; rpInfo.pSubpasses = &subpassDesc; rpInfo.dependencyCount = 1; - rpInfo.pDependencies = &subpassDep; + rpInfo.pDependencies = subpassDeps; - if (hasDepthStencil) + if (hasDepthStencil) { rpInfo.attachmentCount += 1; + rpInfo.dependencyCount += 1; + } if (samples > VK_SAMPLE_COUNT_1_BIT) { rpInfo.attachmentCount += 1; |