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

Author: Chad Versace <[email protected]>
Date:   Thu Aug  4 12:42:30 2022 -0700

venus: Drop vn_present_src_attachment::acquire

The field is redundant.

Signed-off-by: Chad Versace <[email protected]>
Reviewed-by: Yiwei Zhang <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16681>

---

 src/virtio/vulkan/vn_command_buffer.c | 21 ++++++++++++---------
 src/virtio/vulkan/vn_render_pass.c    |  2 --
 src/virtio/vulkan/vn_render_pass.h    |  1 -
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/virtio/vulkan/vn_command_buffer.c 
b/src/virtio/vulkan/vn_command_buffer.c
index bab69feae52..38a23560b8a 100644
--- a/src/virtio/vulkan/vn_command_buffer.c
+++ b/src/virtio/vulkan/vn_command_buffer.c
@@ -304,17 +304,18 @@ static void
 vn_present_src_attachment_to_image_memory_barrier(
    const struct vn_image *img,
    const struct vn_present_src_attachment *att,
-   VkImageMemoryBarrier *img_barrier)
+   VkImageMemoryBarrier *img_barrier,
+   bool acquire)
 {
    *img_barrier = (VkImageMemoryBarrier)
    {
       .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
       .srcAccessMask = att->src_access_mask,
       .dstAccessMask = att->dst_access_mask,
-      .oldLayout = att->acquire ? VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
-                                : VN_PRESENT_SRC_INTERNAL_LAYOUT,
-      .newLayout = att->acquire ? VN_PRESENT_SRC_INTERNAL_LAYOUT
-                                : VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
+      .oldLayout = acquire ? VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
+                           : VN_PRESENT_SRC_INTERNAL_LAYOUT,
+      .newLayout = acquire ? VN_PRESENT_SRC_INTERNAL_LAYOUT
+                           : VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
       .image = vn_image_to_handle((struct vn_image *)img),
       .subresourceRange = {
          .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
@@ -327,6 +328,7 @@ vn_present_src_attachment_to_image_memory_barrier(
 static void
 vn_cmd_transfer_present_src_images(
    struct vn_command_buffer *cmd,
+   bool acquire,
    const struct vn_image *const *images,
    const struct vn_present_src_attachment *atts,
    uint32_t count)
@@ -344,8 +346,8 @@ vn_cmd_transfer_present_src_images(
       src_stage_mask |= atts[i].src_stage_mask;
       dst_stage_mask |= atts[i].dst_stage_mask;
 
-      vn_present_src_attachment_to_image_memory_barrier(images[i], &atts[i],
-                                                        &img_barriers[i]);
+      vn_present_src_attachment_to_image_memory_barrier(
+         images[i], &atts[i], &img_barriers[i], acquire);
       vn_cmd_fix_image_memory_barrier(cmd, &img_barriers[i],
                                       &img_barriers[i]);
    }
@@ -400,7 +402,7 @@ vn_cmd_begin_render_pass(struct vn_command_buffer *cmd,
    }
 
    if (pass->present_acquire_count) {
-      vn_cmd_transfer_present_src_images(cmd, images,
+      vn_cmd_transfer_present_src_images(cmd, true, images,
                                          pass->present_acquire_attachments,
                                          pass->present_acquire_count);
    }
@@ -424,7 +426,8 @@ vn_cmd_end_render_pass(struct vn_command_buffer *cmd)
 
    if (pass->present_release_count) {
       vn_cmd_transfer_present_src_images(
-         cmd, images + pass->present_acquire_count,
+         cmd, false,
+         images + pass->present_acquire_count,
          pass->present_release_attachments,
          pass->present_release_count);
    }
diff --git a/src/virtio/vulkan/vn_render_pass.c 
b/src/virtio/vulkan/vn_render_pass.c
index c3bfd11de93..f8bdf89ea3a 100644
--- a/src/virtio/vulkan/vn_render_pass.c
+++ b/src/virtio/vulkan/vn_render_pass.c
@@ -39,13 +39,11 @@
       for (uint32_t i = 0; i < att_count; i++) {                             \
          if (out_atts[i].initialLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR) { \
             out_atts[i].initialLayout = VN_PRESENT_SRC_INTERNAL_LAYOUT;      \
-            _acquire_atts->acquire = true;                                   \
             _acquire_atts->index = i;                                        \
             _acquire_atts++;                                                 \
          }                                                                   \
          if (out_atts[i].finalLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR) {   \
             out_atts[i].finalLayout = VN_PRESENT_SRC_INTERNAL_LAYOUT;        \
-            _release_atts->acquire = false;                                  \
             _release_atts->index = i;                                        \
             _release_atts++;                                                 \
          }                                                                   \
diff --git a/src/virtio/vulkan/vn_render_pass.h 
b/src/virtio/vulkan/vn_render_pass.h
index db8b285a7f3..5fa9a1ae8d8 100644
--- a/src/virtio/vulkan/vn_render_pass.h
+++ b/src/virtio/vulkan/vn_render_pass.h
@@ -14,7 +14,6 @@
 #include "vn_common.h"
 
 struct vn_present_src_attachment {
-   bool acquire;
    uint32_t index;
 
    VkPipelineStageFlags src_stage_mask;

Reply via email to