From d0d41e58c3c614f7a3191e94a5327916d23f0142 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 30 May 2019 14:10:42 +0200 Subject: [PATCH] radv: determine the first subpass id for every attachments Signed-off-by: Samuel Pitoiset Reviewed-By: Bas Nieuwenhuizen --- src/amd/vulkan/radv_pass.c | 18 ++++++++++++++++++ src/amd/vulkan/radv_private.h | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index 4d1e38a..8fa098e 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -64,6 +64,22 @@ radv_render_pass_compile(struct radv_render_pass *pass) { for (uint32_t i = 0; i < pass->subpass_count; i++) { struct radv_subpass *subpass = &pass->subpasses[i]; + + 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->first_subpass_idx = UINT32_MAX; + } + } + + for (uint32_t i = 0; i < pass->subpass_count; i++) { + struct radv_subpass *subpass = &pass->subpasses[i]; uint32_t color_sample_count = 1, depth_sample_count = 1; /* We don't allow depth_stencil_attachment to be non-NULL and @@ -84,6 +100,8 @@ radv_render_pass_compile(struct radv_render_pass *pass) struct radv_render_pass_attachment *pass_att = &pass->attachments[subpass_att->attachment]; + if (i < pass_att->first_subpass_idx) + pass_att->first_subpass_idx = i; pass_att->last_subpass_idx = i; } diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 9af8fb3..b8f84c8 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1921,7 +1921,8 @@ struct radv_render_pass_attachment { VkImageLayout initial_layout; VkImageLayout final_layout; - /* The subpass id in which the attachment will be used last. */ + /* The subpass id in which the attachment will be used first/last. */ + uint32_t first_subpass_idx; uint32_t last_subpass_idx; }; -- 2.7.4