diff options
| author | Nanley Chery <[email protected]> | 2017-03-31 13:52:53 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-07-22 20:12:09 -0700 |
| commit | dcff5ab9f164afbc29c051b18990a377bb46e4bc (patch) | |
| tree | a0bacae022c1b28dfb7114a58aefe8f2022a8199 /src/intel/vulkan/anv_pass.c | |
| parent | 9ffe87122bedefd48d2618e85df44e6507be80af (diff) | |
anv/cmd_buffer: Restrict fast clears in the GENERAL layout
v2: Remove ::first_subpass_layout assertion (Jason Ekstrand).
v3: Allow some fast clears in the GENERAL layout.
v4: Remove extra '||' and adjust line break (Jason Ekstrand).
Signed-off-by: Nanley Chery <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/intel/vulkan/anv_pass.c')
| -rw-r--r-- | src/intel/vulkan/anv_pass.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index 1b30c1409d9..ab0733fc103 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -34,6 +34,16 @@ num_subpass_attachments(const VkSubpassDescription *desc) (desc->pDepthStencilAttachment != NULL); } +static void +init_first_subpass_layout(struct anv_render_pass_attachment * const att, + const VkAttachmentReference att_ref) +{ + if (att->first_subpass_layout == VK_IMAGE_LAYOUT_UNDEFINED) { + att->first_subpass_layout = att_ref.layout; + assert(att->first_subpass_layout != VK_IMAGE_LAYOUT_UNDEFINED); + } +} + VkResult anv_CreateRenderPass( VkDevice _device, const VkRenderPassCreateInfo* pCreateInfo, @@ -91,6 +101,7 @@ VkResult anv_CreateRenderPass( att->stencil_load_op = pCreateInfo->pAttachments[i].stencilLoadOp; att->initial_layout = pCreateInfo->pAttachments[i].initialLayout; att->final_layout = pCreateInfo->pAttachments[i].finalLayout; + att->first_subpass_layout = VK_IMAGE_LAYOUT_UNDEFINED; att->subpass_usage = subpass_usages; subpass_usages += pass->subpass_count; } @@ -119,6 +130,8 @@ VkResult anv_CreateRenderPass( pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_INPUT; pass->attachments[a].last_subpass_idx = i; + init_first_subpass_layout(&pass->attachments[a], + desc->pInputAttachments[j]); if (desc->pDepthStencilAttachment && a == desc->pDepthStencilAttachment->attachment) subpass->has_ds_self_dep = true; @@ -138,6 +151,9 @@ VkResult anv_CreateRenderPass( pass->attachments[a].usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW; pass->attachments[a].last_subpass_idx = i; + + init_first_subpass_layout(&pass->attachments[a], + desc->pColorAttachments[j]); } } } @@ -162,6 +178,9 @@ VkResult anv_CreateRenderPass( pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_RESOLVE_DST; pass->attachments[a].last_subpass_idx = i; + + init_first_subpass_layout(&pass->attachments[a], + desc->pResolveAttachments[j]); } } } @@ -176,6 +195,9 @@ VkResult anv_CreateRenderPass( VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW; pass->attachments[a].last_subpass_idx = i; + + init_first_subpass_layout(&pass->attachments[a], + *desc->pDepthStencilAttachment); } } else { subpass->depth_stencil_attachment.attachment = VK_ATTACHMENT_UNUSED; |