Mesa (main): radv: Don't skip barriers that only change queues.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: f7c622307da7179adc879b4af9bc10217922997b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7c622307da7179adc879b4af9bc10217922997b

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri May 14 13:57:11 2021 +0200

radv: Don't skip barriers that only change queues.

We depend on the queue mask for some decisions ...

CC: mesa-stable
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10802>

---

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

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index fed80a1d767..b95347a2166 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -6502,14 +6502,14 @@ radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer, struct radv_ima
          return;
    }
 
-   if (src_layout == dst_layout && src_render_loop == dst_render_loop)
-      return;
-
    unsigned src_queue_mask =
       radv_image_queue_family_mask(image, src_family, cmd_buffer->queue_family_index);
    unsigned dst_queue_mask =
       radv_image_queue_family_mask(image, dst_family, cmd_buffer->queue_family_index);
 
+   if (src_layout == dst_layout && src_render_loop == dst_render_loop && src_queue_mask == dst_queue_mask)
+      return;
+
    if (vk_format_has_depth(image->vk_format)) {
       radv_handle_depth_image_transition(cmd_buffer, image, src_layout, src_render_loop, dst_layout,
                                          dst_render_loop, src_queue_mask, dst_queue_mask, range,