Add write access in subpass dependency.

Themaister · Themaister · commit b23a5936c11d · 2024-05-15T12:57:24.000+02:00
diff --git a/vulkan/render_pass.cpp b/vulkan/render_pass.cpp
@@ -793,6 +793,14 @@ RenderPass::RenderPass(Hash hash, Device *device_, const RenderPassInfo &info)
 		{
 			dep.dstStageMask |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
 			dep.dstAccessMask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
+
+			// The store op that comes later will need to write and storeOp accesses in WRITE_BIT.
+			// It's unclear if we need this barrier, but VVL complains if we don't ...
+			if (ds_store_op != VK_ATTACHMENT_STORE_OP_NONE &&
+			    (depth_stencil_attachment_write & (1u << (subpass - 1))))
+			{
+				dep.dstAccessMask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+			}
 		}
 
 		if (depth_stencil_attachment_write & (1u << subpass))

Original file line number	Diff line number	Diff line change
`@@ -793,6 +793,14 @@ RenderPass::RenderPass(Hash hash, Device *device_, const RenderPassInfo &info)`
`793`	`793`	`{`
`794`	`794`	`dep.dstStageMask \|= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT \| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;`
`795`	`795`	`dep.dstAccessMask \|= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;`
	`796`	`+`
	`797`	`+ // The store op that comes later will need to write and storeOp accesses in WRITE_BIT.`
	`798`	`+ // It's unclear if we need this barrier, but VVL complains if we don't ...`
	`799`	`+ if (ds_store_op != VK_ATTACHMENT_STORE_OP_NONE &&`
	`800`	`+ (depth_stencil_attachment_write & (1u << (subpass - 1))))`
	`801`	`+ {`
	`802`	`+ dep.dstAccessMask \|= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;`
	`803`	`+ }`
`796`	`804`	`}`
`797`	`805`
`798`	`806`	`if (depth_stencil_attachment_write & (1u << subpass))`