1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: vk: Fix DS WAW hazard reported from sync validation

Browse Source 
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
Change-Id: I67e15a09aab564f63aab646761ccdb1f8b82111d
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 8bd58a97d70027575b7f4ec227e7a57ed11990bc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2020-12-19 18:48:06 +01:00 committed by Qt Cherry-pick Bot
parent 2491c47458
commit fc33f71f81
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/rhi/qrhivulkan.cpp
View File

@ -1178,14 +1178,25 @@ bool QRhiVulkan::createDefaultRenderPass(QVkRenderPassDescriptor *rpD, bool hasD
subpassDesc.pDepthStencilAttachment = hasDepthStencil ? &rpD->dsRef : nullptr; subpassDesc.pDepthStencilAttachment = hasDepthStencil ? &rpD->dsRef : nullptr;
// Replace the first implicit dep (TOP_OF_PIPE / ALL_COMMANDS) with our own. // Replace the first implicit dep (TOP_OF_PIPE / ALL_COMMANDS) with our own.
VkSubpassDependency subpassDep; VkSubpassDependency subpassDeps[2];
memset(&subpassDep, 0, sizeof(subpassDep)); memset(subpassDeps, 0, sizeof(subpassDeps));
subpassDep.srcSubpass = VK_SUBPASS_EXTERNAL; subpassDeps[0].srcSubpass = VK_SUBPASS_EXTERNAL;
subpassDep.dstSubpass = 0; subpassDeps[0].dstSubpass = 0;
subpassDep.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; subpassDeps[0].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
subpassDep.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; subpassDeps[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
subpassDep.srcAccessMask = 0; subpassDeps[0].srcAccessMask = 0;
subpassDep.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; 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; VkRenderPassCreateInfo rpInfo;
memset(&rpInfo, 0, sizeof(rpInfo)); memset(&rpInfo, 0, sizeof(rpInfo));
@ -1195,10 +1206,12 @@ bool QRhiVulkan::createDefaultRenderPass(QVkRenderPassDescriptor *rpD, bool hasD
rpInfo.subpassCount = 1; rpInfo.subpassCount = 1;
rpInfo.pSubpasses = &subpassDesc; rpInfo.pSubpasses = &subpassDesc;
rpInfo.dependencyCount = 1; rpInfo.dependencyCount = 1;
rpInfo.pDependencies = &subpassDep; rpInfo.pDependencies = subpassDeps;
if (hasDepthStencil) if (hasDepthStencil) {
rpInfo.attachmentCount += 1; rpInfo.attachmentCount += 1;
rpInfo.dependencyCount += 1;
}
if (samples > VK_SAMPLE_COUNT_1_BIT) { if (samples > VK_SAMPLE_COUNT_1_BIT) {
rpInfo.attachmentCount += 1; rpInfo.attachmentCount += 1;