summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2019-01-29 22:18:59 +0100
committerSamuel Pitoiset <[email protected]>2019-02-04 13:19:14 +0100
commiteaab35e5e328eec06bc5012624ee3585aa209c29 (patch)
tree93494e95956feeea21bf6fa2ab5eea8a9d6ed511 /src
parent6430616e77100036ae201c86f4db83a73298e80a (diff)
radv: handle subpass dependencies correctly
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 <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/amd/vulkan/radv_pass.c12
1 files 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;
}
}