From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 20 Nov 2018 12:48:34 +0000 (+0100)
Subject: radv: ignore subpass self-dependencies
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=457ac6ce1e2ba98d5c1afb9e78298fd8eb126b81;p=mesa.git

radv: ignore subpass self-dependencies

Unnecessary as they allow the app to call vkCmdPipelineBarrier()
inside the render pass.

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 9cd1b31a0a0..f8e5ea40954 100644
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -337,7 +337,17 @@ VkResult radv_CreateRenderPass2KHR(
 	}
 
 	for (unsigned i = 0; i < pCreateInfo->dependencyCount; ++i) {
+		uint32_t src = pCreateInfo->pDependencies[i].srcSubpass;
 		uint32_t dst = pCreateInfo->pDependencies[i].dstSubpass;
+
+		/* Ignore subpass self-dependencies as they allow the app to
+		 * call vkCmdPipelineBarrier() inside the render pass and the
+		 * driver should only do the barrier when called, not when
+		 * starting the render pass.
+		 */
+		if (src == dst)
+			continue;
+
 		if (dst == VK_SUBPASS_EXTERNAL) {
 			pass->end_barrier.src_stage_mask = pCreateInfo->pDependencies[i].srcStageMask;
 			pass->end_barrier.src_access_mask = pCreateInfo->pDependencies[i].srcAccessMask;