X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_pass.c;h=93f14830cc5ec8381709a7ae2156510291f06d94;hb=b86dba8a0eee6be283a96481c0c2b1fb1e882824;hp=d07e9fec6cccf881b22a0d7a2cd85b36d5c14009;hpb=e26a978773ba8fbff04cd2ab3342fcb02e90c06e;p=mesa.git diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index d07e9fec6cc..93f14830cc5 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -23,6 +23,17 @@ #include "anv_private.h" +#include "util/vk_util.h" + +static unsigned +num_subpass_attachments(const VkSubpassDescription *desc) +{ + return desc->inputAttachmentCount + + desc->colorAttachmentCount + + (desc->pResolveAttachments ? desc->colorAttachmentCount : 0) + + (desc->pDepthStencilAttachment != NULL); +} + VkResult anv_CreateRenderPass( VkDevice _device, const VkRenderPassCreateInfo* pCreateInfo, @@ -30,107 +41,242 @@ VkResult anv_CreateRenderPass( VkRenderPass* pRenderPass) { ANV_FROM_HANDLE(anv_device, device, _device); - struct anv_render_pass *pass; - size_t size; - size_t attachments_offset; assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO); - size = sizeof(*pass); - size += pCreateInfo->subpassCount * sizeof(pass->subpasses[0]); - attachments_offset = size; - size += pCreateInfo->attachmentCount * sizeof(pass->attachments[0]); + struct anv_render_pass *pass; + struct anv_subpass *subpasses; + struct anv_render_pass_attachment *attachments; + enum anv_pipe_bits *subpass_flushes; + + ANV_MULTIALLOC(ma); + anv_multialloc_add(&ma, &pass, 1); + anv_multialloc_add(&ma, &subpasses, pCreateInfo->subpassCount); + anv_multialloc_add(&ma, &attachments, pCreateInfo->attachmentCount); + anv_multialloc_add(&ma, &subpass_flushes, pCreateInfo->subpassCount + 1); + + VkAttachmentReference *subpass_attachments; + uint32_t subpass_attachment_count = 0; + for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) { + subpass_attachment_count += + num_subpass_attachments(&pCreateInfo->pSubpasses[i]); + } + anv_multialloc_add(&ma, &subpass_attachments, subpass_attachment_count); + + enum anv_subpass_usage *subpass_usages; + anv_multialloc_add(&ma, &subpass_usages, + pCreateInfo->subpassCount * pCreateInfo->attachmentCount); - pass = anv_alloc2(&device->alloc, pAllocator, size, 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (pass == NULL) + if (!anv_multialloc_alloc2(&ma, &device->alloc, pAllocator, + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT)) return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); /* Clear the subpasses along with the parent pass. This required because * each array member of anv_subpass must be a valid pointer if not NULL. */ - memset(pass, 0, size); + memset(pass, 0, ma.size); pass->attachment_count = pCreateInfo->attachmentCount; pass->subpass_count = pCreateInfo->subpassCount; - pass->attachments = (void *) pass + attachments_offset; + pass->attachments = attachments; + pass->subpass_flushes = subpass_flushes; for (uint32_t i = 0; i < pCreateInfo->attachmentCount; i++) { struct anv_render_pass_attachment *att = &pass->attachments[i]; - att->format = anv_format_for_vk_format(pCreateInfo->pAttachments[i].format); + att->format = pCreateInfo->pAttachments[i].format; att->samples = pCreateInfo->pAttachments[i].samples; + att->usage = 0; att->load_op = pCreateInfo->pAttachments[i].loadOp; + att->store_op = pCreateInfo->pAttachments[i].storeOp; att->stencil_load_op = pCreateInfo->pAttachments[i].stencilLoadOp; - // att->store_op = pCreateInfo->pAttachments[i].storeOp; - // att->stencil_store_op = pCreateInfo->pAttachments[i].stencilStoreOp; + att->initial_layout = pCreateInfo->pAttachments[i].initialLayout; + att->final_layout = pCreateInfo->pAttachments[i].finalLayout; + att->subpass_usage = subpass_usages; + subpass_usages += pass->subpass_count; } - uint32_t subpass_attachment_count = 0, *p; - for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) { - const VkSubpassDescription *desc = &pCreateInfo->pSubpasses[i]; - - subpass_attachment_count += - desc->inputAttachmentCount + - desc->colorAttachmentCount + - /* Count colorAttachmentCount again for resolve_attachments */ - desc->colorAttachmentCount; - } - - pass->subpass_attachments = - anv_alloc2(&device->alloc, pAllocator, - subpass_attachment_count * sizeof(uint32_t), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (pass->subpass_attachments == NULL) { - anv_free2(&device->alloc, pAllocator, pass); - return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); - } - - p = pass->subpass_attachments; + bool has_color = false, has_depth = false, has_input = false; for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) { const VkSubpassDescription *desc = &pCreateInfo->pSubpasses[i]; struct anv_subpass *subpass = &pass->subpasses[i]; subpass->input_count = desc->inputAttachmentCount; subpass->color_count = desc->colorAttachmentCount; + subpass->attachment_count = num_subpass_attachments(desc); + subpass->attachments = subpass_attachments; + subpass->view_mask = 0; if (desc->inputAttachmentCount > 0) { - subpass->input_attachments = p; - p += desc->inputAttachmentCount; + subpass->input_attachments = subpass_attachments; + subpass_attachments += desc->inputAttachmentCount; for (uint32_t j = 0; j < desc->inputAttachmentCount; j++) { - subpass->input_attachments[j] - = desc->pInputAttachments[j].attachment; + uint32_t a = desc->pInputAttachments[j].attachment; + subpass->input_attachments[j] = desc->pInputAttachments[j]; + if (a != VK_ATTACHMENT_UNUSED) { + has_input = true; + pass->attachments[a].usage |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT; + pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_INPUT; + pass->attachments[a].last_subpass_idx = i; + + if (desc->pDepthStencilAttachment && + a == desc->pDepthStencilAttachment->attachment) + subpass->has_ds_self_dep = true; + } } } if (desc->colorAttachmentCount > 0) { - subpass->color_attachments = p; - p += desc->colorAttachmentCount; + subpass->color_attachments = subpass_attachments; + subpass_attachments += desc->colorAttachmentCount; for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) { - subpass->color_attachments[j] - = desc->pColorAttachments[j].attachment; + uint32_t a = desc->pColorAttachments[j].attachment; + subpass->color_attachments[j] = desc->pColorAttachments[j]; + if (a != VK_ATTACHMENT_UNUSED) { + has_color = true; + 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; + } } } subpass->has_resolve = false; if (desc->pResolveAttachments) { - subpass->resolve_attachments = p; - p += desc->colorAttachmentCount; + subpass->resolve_attachments = subpass_attachments; + subpass_attachments += desc->colorAttachmentCount; for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) { uint32_t a = desc->pResolveAttachments[j].attachment; - subpass->resolve_attachments[j] = a; - if (a != VK_ATTACHMENT_UNUSED) + subpass->resolve_attachments[j] = desc->pResolveAttachments[j]; + if (a != VK_ATTACHMENT_UNUSED) { subpass->has_resolve = true; + uint32_t color_att = desc->pColorAttachments[j].attachment; + pass->attachments[color_att].usage |= + VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + pass->attachments[a].usage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT; + + pass->attachments[color_att].subpass_usage[i] |= + ANV_SUBPASS_USAGE_RESOLVE_SRC; + pass->attachments[a].subpass_usage[i] |= + ANV_SUBPASS_USAGE_RESOLVE_DST; + pass->attachments[a].last_subpass_idx = i; + } } } if (desc->pDepthStencilAttachment) { - subpass->depth_stencil_attachment = - desc->pDepthStencilAttachment->attachment; + uint32_t a = desc->pDepthStencilAttachment->attachment; + *subpass_attachments++ = subpass->depth_stencil_attachment = + *desc->pDepthStencilAttachment; + if (a != VK_ATTACHMENT_UNUSED) { + has_depth = true; + pass->attachments[a].usage |= + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW; + pass->attachments[a].last_subpass_idx = i; + } } else { - subpass->depth_stencil_attachment = VK_ATTACHMENT_UNUSED; + subpass->depth_stencil_attachment.attachment = VK_ATTACHMENT_UNUSED; + subpass->depth_stencil_attachment.layout = VK_IMAGE_LAYOUT_UNDEFINED; + } + } + + for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) { + const VkSubpassDependency *dep = &pCreateInfo->pDependencies[i]; + if (dep->dstSubpass == VK_SUBPASS_EXTERNAL) { + pass->subpass_flushes[pass->subpass_count] |= + anv_pipe_invalidate_bits_for_access_flags(dep->dstAccessMask); + } else { + assert(dep->dstSubpass < pass->subpass_count); + pass->subpass_flushes[dep->dstSubpass] |= + anv_pipe_invalidate_bits_for_access_flags(dep->dstAccessMask); + } + + if (dep->srcSubpass == VK_SUBPASS_EXTERNAL) { + pass->subpass_flushes[0] |= + anv_pipe_flush_bits_for_access_flags(dep->srcAccessMask); + } else { + assert(dep->srcSubpass < pass->subpass_count); + pass->subpass_flushes[dep->srcSubpass + 1] |= + anv_pipe_flush_bits_for_access_flags(dep->srcAccessMask); + } + } + + /* From the Vulkan 1.0.39 spec: + * + * If there is no subpass dependency from VK_SUBPASS_EXTERNAL to the + * first subpass that uses an attachment, then an implicit subpass + * dependency exists from VK_SUBPASS_EXTERNAL to the first subpass it is + * used in. The subpass dependency operates as if defined with the + * following parameters: + * + * VkSubpassDependency implicitDependency = { + * .srcSubpass = VK_SUBPASS_EXTERNAL; + * .dstSubpass = firstSubpass; // First subpass attachment is used in + * .srcStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; + * .dstStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + * .srcAccessMask = 0; + * .dstAccessMask = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | + * VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + * VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + * VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | + * VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + * .dependencyFlags = 0; + * }; + * + * Similarly, if there is no subpass dependency from the last subpass + * that uses an attachment to VK_SUBPASS_EXTERNAL, then an implicit + * subpass dependency exists from the last subpass it is used in to + * VK_SUBPASS_EXTERNAL. The subpass dependency operates as if defined + * with the following parameters: + * + * VkSubpassDependency implicitDependency = { + * .srcSubpass = lastSubpass; // Last subpass attachment is used in + * .dstSubpass = VK_SUBPASS_EXTERNAL; + * .srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + * .dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; + * .srcAccessMask = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | + * VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + * VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + * VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | + * VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + * .dstAccessMask = 0; + * .dependencyFlags = 0; + * }; + * + * We could implement this by walking over all of the attachments and + * subpasses and checking to see if any of them don't have an external + * dependency. Or, we could just be lazy and add a couple extra flushes. + * We choose to be lazy. + */ + if (has_input) { + pass->subpass_flushes[0] |= + ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT; + } + if (has_color) { + pass->subpass_flushes[pass->subpass_count] |= + ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT; + } + if (has_depth) { + pass->subpass_flushes[pass->subpass_count] |= + ANV_PIPE_DEPTH_CACHE_FLUSH_BIT; + } + + vk_foreach_struct(ext, pCreateInfo->pNext) { + switch (ext->sType) { + case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX: { + VkRenderPassMultiviewCreateInfoKHX *mv = (void *)ext; + + for (uint32_t i = 0; i < mv->subpassCount; i++) { + pass->subpasses[i].view_mask = mv->pViewMasks[i]; + } + break; + } + + default: + anv_debug_ignored_stype(ext->sType); } } @@ -147,8 +293,7 @@ void anv_DestroyRenderPass( ANV_FROM_HANDLE(anv_device, device, _device); ANV_FROM_HANDLE(anv_render_pass, pass, _pass); - anv_free2(&device->alloc, pAllocator, pass->subpass_attachments); - anv_free2(&device->alloc, pAllocator, pass); + vk_free2(&device->alloc, pAllocator, pass); } void anv_GetRenderAreaGranularity( @@ -156,5 +301,18 @@ void anv_GetRenderAreaGranularity( VkRenderPass renderPass, VkExtent2D* pGranularity) { + ANV_FROM_HANDLE(anv_render_pass, pass, renderPass); + + /* This granularity satisfies HiZ fast clear alignment requirements + * for all sample counts. + */ + for (unsigned i = 0; i < pass->subpass_count; ++i) { + if (pass->subpasses[i].depth_stencil_attachment.attachment != + VK_ATTACHMENT_UNUSED) { + *pGranularity = (VkExtent2D) { .width = 8, .height = 4 }; + return; + } + } + *pGranularity = (VkExtent2D) { 1, 1 }; }