From 545552c9b98dd4143021585e43d3401e1cd1fc6b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 29 Jan 2019 22:18:47 +0100 Subject: [PATCH] radv: remove unused radv_render_pass_attachment::view_mask Trivial. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_pass.c | 10 ---------- src/amd/vulkan/radv_private.h | 1 - 2 files changed, 11 deletions(-) diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index 3652eb7..3a70006 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -123,8 +123,6 @@ VkResult radv_CreateRenderPass( .attachment = desc->pInputAttachments[j].attachment, .layout = desc->pInputAttachments[j].layout, }; - if (desc->pInputAttachments[j].attachment != VK_ATTACHMENT_UNUSED) - pass->attachments[desc->pInputAttachments[j].attachment].view_mask |= subpass->view_mask; } } @@ -138,7 +136,6 @@ VkResult radv_CreateRenderPass( .layout = desc->pColorAttachments[j].layout, }; if (desc->pColorAttachments[j].attachment != VK_ATTACHMENT_UNUSED) { - pass->attachments[desc->pColorAttachments[j].attachment].view_mask |= subpass->view_mask; color_sample_count = pCreateInfo->pAttachments[desc->pColorAttachments[j].attachment].samples; } } @@ -157,7 +154,6 @@ VkResult radv_CreateRenderPass( }; if (a != VK_ATTACHMENT_UNUSED) { subpass->has_resolve = true; - pass->attachments[desc->pResolveAttachments[j].attachment].view_mask |= subpass->view_mask; } } } @@ -168,7 +164,6 @@ VkResult radv_CreateRenderPass( .layout = desc->pDepthStencilAttachment->layout, }; if (desc->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { - pass->attachments[desc->pDepthStencilAttachment->attachment].view_mask |= subpass->view_mask; depth_sample_count = pCreateInfo->pAttachments[desc->pDepthStencilAttachment->attachment].samples; } } else { @@ -290,8 +285,6 @@ VkResult radv_CreateRenderPass2KHR( .attachment = desc->pInputAttachments[j].attachment, .layout = desc->pInputAttachments[j].layout, }; - if (desc->pInputAttachments[j].attachment != VK_ATTACHMENT_UNUSED) - pass->attachments[desc->pInputAttachments[j].attachment].view_mask |= subpass->view_mask; } } @@ -305,7 +298,6 @@ VkResult radv_CreateRenderPass2KHR( .layout = desc->pColorAttachments[j].layout, }; if (desc->pColorAttachments[j].attachment != VK_ATTACHMENT_UNUSED) { - pass->attachments[desc->pColorAttachments[j].attachment].view_mask |= subpass->view_mask; color_sample_count = pCreateInfo->pAttachments[desc->pColorAttachments[j].attachment].samples; } } @@ -324,7 +316,6 @@ VkResult radv_CreateRenderPass2KHR( }; if (a != VK_ATTACHMENT_UNUSED) { subpass->has_resolve = true; - pass->attachments[desc->pResolveAttachments[j].attachment].view_mask |= subpass->view_mask; } } } @@ -335,7 +326,6 @@ VkResult radv_CreateRenderPass2KHR( .layout = desc->pDepthStencilAttachment->layout, }; if (desc->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { - pass->attachments[desc->pDepthStencilAttachment->attachment].view_mask |= subpass->view_mask; depth_sample_count = pCreateInfo->pAttachments[desc->pDepthStencilAttachment->attachment].samples; } } else { diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index e5b8286..4b2d27a 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1839,7 +1839,6 @@ struct radv_render_pass_attachment { VkAttachmentLoadOp stencil_load_op; VkImageLayout initial_layout; VkImageLayout final_layout; - uint32_t view_mask; }; struct radv_render_pass { -- 2.7.4