Mesa (staging/19.1): radv: Skip transitions coming from external queue.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 746025fd636838c54801dd3f4a7453aaa1ae2716
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=746025fd636838c54801dd3f4a7453aaa1ae2716

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu Jun 13 00:52:18 2019 +0200

radv: Skip transitions coming from external queue.

Transitions to external queue should do the transition & make sure
it works on all queues.

Fixes: 8ebc7dcb59a "radv: Allow fast clears with concurrent queue mask for some layouts."
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
(cherry picked from commit 0667c1f14b06b9a748619a1a6ba3e03388fa868b)

---

 src/amd/vulkan/radv_cmd_buffer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 3b87146ebd0..90c6153e875 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -4664,6 +4664,9 @@ static void radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer,
 		assert(src_family == cmd_buffer->queue_family_index ||
 		       dst_family == cmd_buffer->queue_family_index);
 
+		if (src_family == VK_QUEUE_FAMILY_EXTERNAL)
+			return;
+
 		if (cmd_buffer->queue_family_index == RADV_QUEUE_TRANSFER)
 			return;