OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Remove unused struct member

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13980>
This commit is contained in:
Iván Briano
2021-11-08 16:00:11 -08:00
parent 6612dcc425
commit b18bc028ee
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/vulkan/anv_private.h
View File

@@ -2758,7 +2758,6 @@ struct anv_attachment_state {
VkImageLayout current_layout; VkImageLayout current_layout;
VkImageLayout current_stencil_layout; VkImageLayout current_stencil_layout;
VkImageAspectFlags pending_clear_aspects; VkImageAspectFlags pending_clear_aspects;
VkImageAspectFlags pending_load_aspects;
bool fast_clear; bool fast_clear;
VkClearValue clear_value; VkClearValue clear_value;

10
src/intel/vulkan/genX_cmd_buffer.c
View 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]; struct anv_attachment_state *att_state = &state->attachments[i];
VkImageAspectFlags att_aspects = vk_format_aspects(pass_att->format); VkImageAspectFlags att_aspects = vk_format_aspects(pass_att->format);
VkImageAspectFlags clear_aspects = 0; VkImageAspectFlags clear_aspects = 0;
VkImageAspectFlags load_aspects = 0;
if (att_aspects & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV) { if (att_aspects & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV) {
/* color attachment */ /* color attachment */
if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) { if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
clear_aspects |= VK_IMAGE_ASPECT_COLOR_BIT; 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 { } else {
/* depthstencil attachment */ /* depthstencil attachment */
if (att_aspects & VK_IMAGE_ASPECT_DEPTH_BIT) { if (att_aspects & VK_IMAGE_ASPECT_DEPTH_BIT) {
if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) { if (pass_att->load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
clear_aspects |= VK_IMAGE_ASPECT_DEPTH_BIT; 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 (att_aspects & VK_IMAGE_ASPECT_STENCIL_BIT) {
if (pass_att->stencil_load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) { if (pass_att->stencil_load_op == VK_ATTACHMENT_LOAD_OP_CLEAR) {
clear_aspects |= VK_IMAGE_ASPECT_STENCIL_BIT; 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_layout = pass_att->initial_layout;
att_state->current_stencil_layout = pass_att->stencil_initial_layout; att_state->current_stencil_layout = pass_att->stencil_initial_layout;
att_state->pending_clear_aspects = clear_aspects; att_state->pending_clear_aspects = clear_aspects;
att_state->pending_load_aspects = load_aspects;
if (clear_aspects) if (clear_aspects)
att_state->clear_value = begin->pClearValues[i]; 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)) { current_subpass_is_last_for_attachment(cmd_state, a)) {
att_state->pending_clear_aspects = 0; att_state->pending_clear_aspects = 0;
} }
att_state->pending_load_aspects = 0;
} }
/* We've transitioned all our images possibly fast clearing them. Now we /* We've transitioned all our images possibly fast clearing them. Now we