Module: Mesa Branch: main Commit: b18bc028ee9d9360b86f1d55682d5dc34005706a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b18bc028ee9d9360b86f1d55682d5dc34005706a
Author: Iván Briano <[email protected]> Date: Mon Nov 8 16:00:11 2021 -0800 anv: Remove unused struct member Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13980> --- src/intel/vulkan/anv_private.h | 1 - src/intel/vulkan/genX_cmd_buffer.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index becbb2b153a..bdb5391c157 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -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; diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 40ae1b75754..f08aa26a7a0 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -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
