Mesa (master): radv: determine the first subpass id for every attachments
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 7 11:09:10 UTC 2019
Module: Mesa
Branch: master
Commit: d0d41e58c3c614f7a3191e94a5327916d23f0142
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0d41e58c3c614f7a3191e94a5327916d23f0142
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Thu May 30 14:10:42 2019 +0200
radv: determine the first subpass id for every attachments
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-By: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
---
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 4d1e38a780e..8fa098eaac8 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 9af8fb3b6db..b8f84c84913 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;
};
More information about the mesa-commit
mailing list