radv: accumulate all ingoing external dependencies to the first subpass

In case two or more subpasses declare ingoing external dependencies.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
index 0a37392322f751abb4d75eba0402c2f3e1c39591..08ea2454750507d8a75ba300ee0ed16625b68e59 100644 (file)
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -42,6 +42,10 @@ radv_render_pass_add_subpass_dep(struct radv_render_pass *pass,
        if (src == dst)
                return;
 
+       /* Accumulate all ingoing external dependencies to the first subpass. */
+       if (src == VK_SUBPASS_EXTERNAL)
+               dst = 0;
+
        if (dst == VK_SUBPASS_EXTERNAL) {
                pass->end_barrier.src_stage_mask |= dep->srcStageMask;
                pass->end_barrier.src_access_mask |= dep->srcAccessMask;