X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_pass.c;h=49ad604357381df82b8f65923a3f9ede41501ef2;hb=a0d67b7a1c32f4fcfdc8c6a66bc3359b1003c752;hp=1b40ef14670e2b5a97041a327eaf86d8dedc4a23;hpb=3f1eda0b42eae5009a96b7f3c088b2d85eea44db;p=mesa.git diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index 1b40ef14670..49ad6043573 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -23,6 +23,213 @@ #include "anv_private.h" +#include "vk_util.h" + +static void +anv_render_pass_add_subpass_dep(struct anv_render_pass *pass, + const VkSubpassDependency2KHR *dep) +{ + 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); + } +} + +/* Do a second "compile" step on a render pass */ +static void +anv_render_pass_compile(struct anv_render_pass *pass) +{ + /* The CreateRenderPass code zeros the entire render pass and also uses a + * designated initializer for filling these out. There's no need for us to + * do it again. + * + * for (uint32_t i = 0; i < pass->attachment_count; i++) { + * pass->attachments[i].usage = 0; + * pass->attachments[i].first_subpass_layout = VK_IMAGE_LAYOUT_UNDEFINED; + * } + */ + + VkImageUsageFlags all_usage = 0; + for (uint32_t i = 0; i < pass->subpass_count; i++) { + struct anv_subpass *subpass = &pass->subpasses[i]; + + /* We don't allow depth_stencil_attachment to be non-NULL and be + * VK_ATTACHMENT_UNUSED. This way something can just check for NULL + * and be guaranteed that they have a valid attachment. + */ + if (subpass->depth_stencil_attachment && + subpass->depth_stencil_attachment->attachment == VK_ATTACHMENT_UNUSED) + subpass->depth_stencil_attachment = NULL; + + if (subpass->ds_resolve_attachment && + subpass->ds_resolve_attachment->attachment == VK_ATTACHMENT_UNUSED) + subpass->ds_resolve_attachment = NULL; + + for (uint32_t j = 0; j < subpass->attachment_count; j++) { + struct anv_subpass_attachment *subpass_att = &subpass->attachments[j]; + if (subpass_att->attachment == VK_ATTACHMENT_UNUSED) + continue; + + struct anv_render_pass_attachment *pass_att = + &pass->attachments[subpass_att->attachment]; + + pass_att->usage |= subpass_att->usage; + pass_att->last_subpass_idx = i; + + all_usage |= subpass_att->usage; + + if (pass_att->first_subpass_layout == VK_IMAGE_LAYOUT_UNDEFINED) { + pass_att->first_subpass_layout = subpass_att->layout; + assert(pass_att->first_subpass_layout != VK_IMAGE_LAYOUT_UNDEFINED); + } + + if (subpass_att->usage == VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT && + subpass->depth_stencil_attachment && + subpass_att->attachment == subpass->depth_stencil_attachment->attachment) + subpass->has_ds_self_dep = true; + } + + /* We have to handle resolve attachments specially */ + subpass->has_color_resolve = false; + if (subpass->resolve_attachments) { + for (uint32_t j = 0; j < subpass->color_count; j++) { + struct anv_subpass_attachment *color_att = + &subpass->color_attachments[j]; + struct anv_subpass_attachment *resolve_att = + &subpass->resolve_attachments[j]; + if (resolve_att->attachment == VK_ATTACHMENT_UNUSED) + continue; + + subpass->has_color_resolve = true; + + assert(color_att->attachment < pass->attachment_count); + struct anv_render_pass_attachment *color_pass_att = + &pass->attachments[color_att->attachment]; + + assert(resolve_att->usage == VK_IMAGE_USAGE_TRANSFER_DST_BIT); + assert(color_att->usage == VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + color_pass_att->usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + } + } + + if (subpass->ds_resolve_attachment) { + struct anv_subpass_attachment *ds_att = + subpass->depth_stencil_attachment; + UNUSED struct anv_subpass_attachment *resolve_att = + subpass->ds_resolve_attachment; + + assert(ds_att->attachment < pass->attachment_count); + struct anv_render_pass_attachment *ds_pass_att = + &pass->attachments[ds_att->attachment]; + + assert(resolve_att->usage == VK_IMAGE_USAGE_TRANSFER_DST_BIT); + assert(ds_att->usage == VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); + ds_pass_att->usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + } + + for (uint32_t j = 0; j < subpass->attachment_count; j++) + assert(__builtin_popcount(subpass->attachments[j].usage) == 1); + } + + /* 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. + * + * From the documentation for vkCmdNextSubpass: + * + * "Moving to the next subpass automatically performs any multisample + * resolve operations in the subpass being ended. End-of-subpass + * multisample resolves are treated as color attachment writes for the + * purposes of synchronization. This applies to resolve operations for + * both color and depth/stencil attachments. That is, they are + * considered to execute in the + * VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT pipeline stage and + * their writes are synchronized with + * VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT." + * + * Therefore, the above flags concerning color attachments also apply to + * color and depth/stencil resolve attachments. + */ + if (all_usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) { + pass->subpass_flushes[0] |= + ANV_PIPE_TEXTURE_CACHE_INVALIDATE_BIT; + } + if (all_usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | + VK_IMAGE_USAGE_TRANSFER_DST_BIT)) { + pass->subpass_flushes[pass->subpass_count] |= + ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT; + } + if (all_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) { + pass->subpass_flushes[pass->subpass_count] |= + ANV_PIPE_DEPTH_CACHE_FLUSH_BIT; + } +} + +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,143 +237,349 @@ 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); + + struct anv_subpass_attachment *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); - pass = vk_alloc2(&device->alloc, pAllocator, size, 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (pass == NULL) + if (!anv_multialloc_alloc2(&ma, &device->vk.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); + vk_object_base_init(&device->vk, &pass->base, VK_OBJECT_TYPE_RENDER_PASS); pass->attachment_count = pCreateInfo->attachmentCount; pass->subpass_count = pCreateInfo->subpassCount; - pass->attachments = (void *) pass + attachments_offset; - - pass->subpass_usages = - vk_zalloc2(&device->alloc, pAllocator, - pass->subpass_count * pass->attachment_count * - sizeof(*pass->subpass_usages), - 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (pass->subpass_usages == NULL) { - vk_free2(&device->alloc, pAllocator, pass); - return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); - } + pass->attachments = attachments; + pass->subpass_flushes = subpass_flushes; - enum anv_subpass_usage *usages = pass->subpass_usages; for (uint32_t i = 0; i < pCreateInfo->attachmentCount; i++) { - struct anv_render_pass_attachment *att = &pass->attachments[i]; + pass->attachments[i] = (struct anv_render_pass_attachment) { + .format = pCreateInfo->pAttachments[i].format, + .samples = pCreateInfo->pAttachments[i].samples, + .load_op = pCreateInfo->pAttachments[i].loadOp, + .store_op = pCreateInfo->pAttachments[i].storeOp, + .stencil_load_op = pCreateInfo->pAttachments[i].stencilLoadOp, + .initial_layout = pCreateInfo->pAttachments[i].initialLayout, + .final_layout = pCreateInfo->pAttachments[i].finalLayout, - 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->subpass_usage = usages; - usages += pass->subpass_count; + .stencil_initial_layout = pCreateInfo->pAttachments[i].initialLayout, + .stencil_final_layout = pCreateInfo->pAttachments[i].finalLayout, + }; } - uint32_t subpass_attachment_count = 0, *p; 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 = subpass_attachments; + subpass_attachments += desc->inputAttachmentCount; + + for (uint32_t j = 0; j < desc->inputAttachmentCount; j++) { + subpass->input_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, + .attachment = desc->pInputAttachments[j].attachment, + .layout = desc->pInputAttachments[j].layout, + .stencil_layout = desc->pInputAttachments[j].layout, + }; + } + } + + if (desc->colorAttachmentCount > 0) { + subpass->color_attachments = subpass_attachments; + subpass_attachments += desc->colorAttachmentCount; + + for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) { + subpass->color_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + .attachment = desc->pColorAttachments[j].attachment, + .layout = desc->pColorAttachments[j].layout, + }; + } + } + + if (desc->pResolveAttachments) { + subpass->resolve_attachments = subpass_attachments; + subpass_attachments += desc->colorAttachmentCount; + + for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) { + subpass->resolve_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT, + .attachment = desc->pResolveAttachments[j].attachment, + .layout = desc->pResolveAttachments[j].layout, + }; + } + } + + if (desc->pDepthStencilAttachment) { + subpass->depth_stencil_attachment = subpass_attachments++; + + *subpass->depth_stencil_attachment = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, + .attachment = desc->pDepthStencilAttachment->attachment, + .layout = desc->pDepthStencilAttachment->layout, + .stencil_layout = desc->pDepthStencilAttachment->layout, + }; + } + } + + for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) { + /* Convert to a Dependency2KHR */ + VkSubpassDependency2 dep2 = { + .srcSubpass = pCreateInfo->pDependencies[i].srcSubpass, + .dstSubpass = pCreateInfo->pDependencies[i].dstSubpass, + .srcStageMask = pCreateInfo->pDependencies[i].srcStageMask, + .dstStageMask = pCreateInfo->pDependencies[i].dstStageMask, + .srcAccessMask = pCreateInfo->pDependencies[i].srcAccessMask, + .dstAccessMask = pCreateInfo->pDependencies[i].dstAccessMask, + .dependencyFlags = pCreateInfo->pDependencies[i].dependencyFlags, + }; + anv_render_pass_add_subpass_dep(pass, &dep2); + } + + vk_foreach_struct(ext, pCreateInfo->pNext) { + switch (ext->sType) { + case VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO: + /* We don't care about this information */ + break; + + case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO: { + VkRenderPassMultiviewCreateInfo *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); + } + } + + anv_render_pass_compile(pass); + + *pRenderPass = anv_render_pass_to_handle(pass); + + return VK_SUCCESS; +} + +static unsigned +num_subpass_attachments2(const VkSubpassDescription2KHR *desc) +{ + const VkSubpassDescriptionDepthStencilResolveKHR *ds_resolve = + vk_find_struct_const(desc->pNext, + SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR); + + return desc->inputAttachmentCount + + desc->colorAttachmentCount + + (desc->pResolveAttachments ? desc->colorAttachmentCount : 0) + + (desc->pDepthStencilAttachment != NULL) + + (ds_resolve && ds_resolve->pDepthStencilResolveAttachment); +} + +VkResult anv_CreateRenderPass2( + VkDevice _device, + const VkRenderPassCreateInfo2KHR* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkRenderPass* pRenderPass) +{ + ANV_FROM_HANDLE(anv_device, device, _device); + + assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR); + + 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); + + struct anv_subpass_attachment *subpass_attachments; + uint32_t subpass_attachment_count = 0; + for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) { subpass_attachment_count += - desc->inputAttachmentCount + - desc->colorAttachmentCount + - /* Count colorAttachmentCount again for resolve_attachments */ - desc->colorAttachmentCount; - } - - pass->subpass_attachments = - vk_alloc2(&device->alloc, pAllocator, - subpass_attachment_count * sizeof(uint32_t), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (pass->subpass_attachments == NULL) { - vk_free2(&device->alloc, pAllocator, pass->subpass_usages); - vk_free2(&device->alloc, pAllocator, pass); + num_subpass_attachments2(&pCreateInfo->pSubpasses[i]); + } + anv_multialloc_add(&ma, &subpass_attachments, subpass_attachment_count); + + if (!anv_multialloc_alloc2(&ma, &device->vk.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, ma.size); + vk_object_base_init(&device->vk, &pass->base, VK_OBJECT_TYPE_RENDER_PASS); + pass->attachment_count = pCreateInfo->attachmentCount; + pass->subpass_count = pCreateInfo->subpassCount; + pass->attachments = attachments; + pass->subpass_flushes = subpass_flushes; + + for (uint32_t i = 0; i < pCreateInfo->attachmentCount; i++) { + const VkAttachmentDescriptionStencilLayoutKHR *stencil_layout = + vk_find_struct_const(pCreateInfo->pAttachments[i].pNext, + ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); + + pass->attachments[i] = (struct anv_render_pass_attachment) { + .format = pCreateInfo->pAttachments[i].format, + .samples = pCreateInfo->pAttachments[i].samples, + .load_op = pCreateInfo->pAttachments[i].loadOp, + .store_op = pCreateInfo->pAttachments[i].storeOp, + .stencil_load_op = pCreateInfo->pAttachments[i].stencilLoadOp, + .initial_layout = pCreateInfo->pAttachments[i].initialLayout, + .final_layout = pCreateInfo->pAttachments[i].finalLayout, + + .stencil_initial_layout = (stencil_layout ? + stencil_layout->stencilInitialLayout : + pCreateInfo->pAttachments[i].initialLayout), + .stencil_final_layout = (stencil_layout ? + stencil_layout->stencilFinalLayout : + pCreateInfo->pAttachments[i].finalLayout), + }; } - p = pass->subpass_attachments; for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) { - const VkSubpassDescription *desc = &pCreateInfo->pSubpasses[i]; + const VkSubpassDescription2KHR *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_attachments2(desc); + subpass->attachments = subpass_attachments; + subpass->view_mask = desc->viewMask; 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++) { - uint32_t a = desc->pInputAttachments[j].attachment; - subpass->input_attachments[j] = a; - pass->attachments[a].usage |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT; - pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_INPUT; + const VkAttachmentReferenceStencilLayoutKHR *stencil_layout = + vk_find_struct_const(desc->pInputAttachments[j].pNext, + ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); + + subpass->input_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, + .attachment = desc->pInputAttachments[j].attachment, + .layout = desc->pInputAttachments[j].layout, + .stencil_layout = (stencil_layout ? + stencil_layout->stencilLayout : + desc->pInputAttachments[j].layout), + }; } } 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++) { - uint32_t a = desc->pColorAttachments[j].attachment; - subpass->color_attachments[j] = a; - pass->attachments[a].usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; - pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW; + subpass->color_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + .attachment = desc->pColorAttachments[j].attachment, + .layout = desc->pColorAttachments[j].layout, + }; } } - 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->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; - } + subpass->resolve_attachments[j] = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT, + .attachment = desc->pResolveAttachments[j].attachment, + .layout = desc->pResolveAttachments[j].layout, + }; } } if (desc->pDepthStencilAttachment) { - uint32_t a = desc->pDepthStencilAttachment->attachment; - subpass->depth_stencil_attachment = a; - if (a != VK_ATTACHMENT_UNUSED) { - pass->attachments[a].usage |= - VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; - pass->attachments[a].subpass_usage[i] |= ANV_SUBPASS_USAGE_DRAW; - } - } else { - subpass->depth_stencil_attachment = VK_ATTACHMENT_UNUSED; + subpass->depth_stencil_attachment = subpass_attachments++; + + const VkAttachmentReferenceStencilLayoutKHR *stencil_attachment = + vk_find_struct_const(desc->pDepthStencilAttachment->pNext, + ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); + + *subpass->depth_stencil_attachment = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, + .attachment = desc->pDepthStencilAttachment->attachment, + .layout = desc->pDepthStencilAttachment->layout, + .stencil_layout = stencil_attachment ? + stencil_attachment->stencilLayout : + desc->pDepthStencilAttachment->layout, + }; + } + + const VkSubpassDescriptionDepthStencilResolveKHR *ds_resolve = + vk_find_struct_const(desc->pNext, + SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR); + + if (ds_resolve && ds_resolve->pDepthStencilResolveAttachment) { + subpass->ds_resolve_attachment = subpass_attachments++; + + const VkAttachmentReferenceStencilLayoutKHR *stencil_resolve_attachment = + vk_find_struct_const(ds_resolve->pDepthStencilResolveAttachment->pNext, + ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); + + *subpass->ds_resolve_attachment = (struct anv_subpass_attachment) { + .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT, + .attachment = ds_resolve->pDepthStencilResolveAttachment->attachment, + .layout = ds_resolve->pDepthStencilResolveAttachment->layout, + .stencil_layout = stencil_resolve_attachment ? + stencil_resolve_attachment->stencilLayout : + ds_resolve->pDepthStencilResolveAttachment->layout, + }; + subpass->depth_resolve_mode = ds_resolve->depthResolveMode; + subpass->stencil_resolve_mode = ds_resolve->stencilResolveMode; + } + } + + for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) + anv_render_pass_add_subpass_dep(pass, &pCreateInfo->pDependencies[i]); + + vk_foreach_struct(ext, pCreateInfo->pNext) { + switch (ext->sType) { + default: + anv_debug_ignored_stype(ext->sType); } } + anv_render_pass_compile(pass); + *pRenderPass = anv_render_pass_to_handle(pass); return VK_SUCCESS; @@ -183,9 +596,8 @@ void anv_DestroyRenderPass( if (!pass) return; - vk_free2(&device->alloc, pAllocator, pass->subpass_attachments); - vk_free2(&device->alloc, pAllocator, pass->subpass_usages); - vk_free2(&device->alloc, pAllocator, pass); + vk_object_base_finish(&pass->base); + vk_free2(&device->vk.alloc, pAllocator, pass); } void anv_GetRenderAreaGranularity( @@ -199,8 +611,7 @@ void anv_GetRenderAreaGranularity( * for all sample counts. */ for (unsigned i = 0; i < pass->subpass_count; ++i) { - if (pass->subpasses[i].depth_stencil_attachment != - VK_ATTACHMENT_UNUSED) { + if (pass->subpasses[i].depth_stencil_attachment) { *pGranularity = (VkExtent2D) { .width = 8, .height = 4 }; return; }