[Mesa-dev] [PATCH 14/19] radv: handle subpass dependencies correctly

[Samuel Pitoiset]

The different masks should be accumulated. For example if two
subpasses declare an outgoing dependency (ie. dst ==
VK_SUBPASS_EXTERNAL).

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/amd/vulkan/radv_pass.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
index 4d9fb0bf7df..0a37392322f 100644
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -43,13 +43,13 @@ radv_render_pass_add_subpass_dep(struct radv_render_pass *pass,
 		return;
 
 	if (dst == VK_SUBPASS_EXTERNAL) {
-		pass->end_barrier.src_stage_mask = dep->srcStageMask;
-		pass->end_barrier.src_access_mask = dep->srcAccessMask;
-		pass->end_barrier.dst_access_mask = dep->dstAccessMask;
+		pass->end_barrier.src_stage_mask |= dep->srcStageMask;
+		pass->end_barrier.src_access_mask |= dep->srcAccessMask;
+		pass->end_barrier.dst_access_mask |= dep->dstAccessMask;
 	} else {
-		pass->subpasses[dst].start_barrier.src_stage_mask = dep->srcStageMask;
-		pass->subpasses[dst].start_barrier.src_access_mask = dep->srcAccessMask;
-		pass->subpasses[dst].start_barrier.dst_access_mask = dep->dstAccessMask;
+		pass->subpasses[dst].start_barrier.src_stage_mask |= dep->srcStageMask;
+		pass->subpasses[dst].start_barrier.src_access_mask |= dep->srcAccessMask;
+		pass->subpasses[dst].start_barrier.dst_access_mask |= dep->dstAccessMask;
 	}
 }
 
-- 
2.20.1