struct anv_render_pass_attachment *pass_att =
&pass->attachments[subpass_att->attachment];
- assert(__builtin_popcount(subpass_att->usage) == 1);
pass_att->usage |= subpass_att->usage;
pass_att->last_subpass_idx = i;
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);
- color_att->usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+ assert(color_att->usage == VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
+ color_pass_att->usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
}
}
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);
- ds_att->usage |= VK_IMAGE_USAGE_TRANSFER_SRC_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:
}
anv_multialloc_add(&ma, &subpass_attachments, subpass_attachment_count);
- if (!anv_multialloc_alloc2(&ma, &device->alloc, pAllocator,
+ if (!anv_multialloc_alloc2(&ma, &device->vk.alloc, pAllocator,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT))
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
* 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;
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,
+ .usage = VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
+ .attachment = desc->pInputAttachments[j].attachment,
+ .layout = desc->pInputAttachments[j].layout,
+ .stencil_layout = desc->pInputAttachments[j].layout,
};
}
}
for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) {
/* Convert to a Dependency2KHR */
- struct VkSubpassDependency2KHR dep2 = {
+ VkSubpassDependency2 dep2 = {
.srcSubpass = pCreateInfo->pDependencies[i].srcSubpass,
.dstSubpass = pCreateInfo->pDependencies[i].dstSubpass,
.srcStageMask = pCreateInfo->pDependencies[i].srcStageMask,
(ds_resolve && ds_resolve->pDepthStencilResolveAttachment);
}
-VkResult anv_CreateRenderPass2KHR(
+VkResult anv_CreateRenderPass2(
VkDevice _device,
const VkRenderPassCreateInfo2KHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
}
anv_multialloc_add(&ma, &subpass_attachments, subpass_attachment_count);
- if (!anv_multialloc_alloc2(&ma, &device->alloc, pAllocator,
+ if (!anv_multialloc_alloc2(&ma, &device->vk.alloc, pAllocator,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT))
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
* 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;
subpass_attachments += desc->inputAttachmentCount;
for (uint32_t j = 0; j < desc->inputAttachmentCount; j++) {
+ 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,
+ .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),
};
}
}
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_render_pass, pass, _pass);
- vk_free2(&device->alloc, pAllocator, pass);
+ if (!pass)
+ return;
+
+ vk_object_base_finish(&pass->base);
+ vk_free2(&device->vk.alloc, pAllocator, pass);
}
void anv_GetRenderAreaGranularity(