From 5699ac0078520396ce003b2482bf17942e157322 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 29 Jan 2019 22:18:53 +0100 Subject: [PATCH] radv: determine the last subpass id for every attachments Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_pass.c | 12 ++++++++++++ src/amd/vulkan/radv_private.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index 1102ef689b2..ac9f9381216 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -42,6 +42,18 @@ radv_render_pass_compile(struct radv_render_pass *pass) if (subpass->depth_stencil_attachment && subpass->depth_stencil_attachment->attachment == VK_ATTACHMENT_UNUSED) subpass->depth_stencil_attachment = NULL; + + for (uint32_t j = 0; j < subpass->attachment_count; j++) { + struct radv_subpass_attachment *subpass_att = + &subpass->attachments[j]; + if (subpass_att->attachment == VK_ATTACHMENT_UNUSED) + continue; + + struct radv_render_pass_attachment *pass_att = + &pass->attachments[subpass_att->attachment]; + + pass_att->last_subpass_idx = i; + } } } diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 4863841a0ac..3d1782b559d 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1841,6 +1841,9 @@ struct radv_render_pass_attachment { VkAttachmentLoadOp stencil_load_op; VkImageLayout initial_layout; VkImageLayout final_layout; + + /* The subpass id in which the attachment will be used last. */ + uint32_t last_subpass_idx; }; struct radv_render_pass { -- 2.30.2