anv: Remove unused struct member
authorIván Briano <ivan.briano@intel.com>
Tue, 9 Nov 2021 00:00:11 +0000 (16:00 -0800)
committerIván Briano <ivan.briano@intel.com>
Wed, 26 Jan 2022 02:13:51 +0000 (18:13 -0800)
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13980>

src/intel/vulkan/anv_private.h
src/intel/vulkan/genX_cmd_buffer.c

index becbb2b..bdb5391 100644 (file)
@@ -2758,7 +2758,6 @@ struct anv_attachment_state {
    VkImageLayout                                current_layout;
    VkImageLayout                                current_stencil_layout;
    VkImageAspectFlags                           pending_clear_aspects;
-   VkImageAspectFlags                           pending_load_aspects;
    bool                                         fast_clear;
    VkClearValue                                 clear_value;
 
index 40ae1b7..f08aa26 100644 (file)
@@ -1586,29 +1586,22 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer,
          struct anv_attachment_state *att_state = &state->attachments[i];
          VkImageAspectFlags att_aspects = vk_format_aspects(pass_att->format);
          VkImageAspectFlags clear_aspects = 0;
-         VkImageAspectFlags load_aspects = 0;
 
          if (att_aspects & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV) {
             /* color attachment */
             if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
                clear_aspects |= VK_IMAGE_ASPECT_COLOR_BIT;
-            } else if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_LOAD) {
-               load_aspects |= VK_IMAGE_ASPECT_COLOR_BIT;
             }
          } else {
             /* depthstencil attachment */
             if (att_aspects & VK_IMAGE_ASPECT_DEPTH_BIT) {
                if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
                   clear_aspects |= VK_IMAGE_ASPECT_DEPTH_BIT;
-               } else if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_LOAD) {
-                  load_aspects |= VK_IMAGE_ASPECT_DEPTH_BIT;
                }
             }
             if (att_aspects & VK_IMAGE_ASPECT_STENCIL_BIT) {
                if (pass_att->stencil_load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
                   clear_aspects |= VK_IMAGE_ASPECT_STENCIL_BIT;
-               } else if (pass_att->stencil_load_op == VK_ATTACHMENT_LOAD_OP_LOAD) {
-                  load_aspects |= VK_IMAGE_ASPECT_STENCIL_BIT;
                }
             }
          }
@@ -1616,7 +1609,6 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer,
          att_state->current_layout = pass_att->initial_layout;
          att_state->current_stencil_layout = pass_att->stencil_initial_layout;
          att_state->pending_clear_aspects = clear_aspects;
-         att_state->pending_load_aspects = load_aspects;
          if (clear_aspects)
             att_state->clear_value = begin->pClearValues[i];
 
@@ -6292,8 +6284,6 @@ cmd_buffer_begin_subpass(struct anv_cmd_buffer *cmd_buffer,
           current_subpass_is_last_for_attachment(cmd_state, a)) {
          att_state->pending_clear_aspects = 0;
       }
-
-      att_state->pending_load_aspects = 0;
    }
 
    /* We've transitioned all our images possibly fast clearing them.  Now we