claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Framebuffer class generates sub pass dependencies for layout transitions, no longer requires layout cmd buffer (Refs #155)

Browse source
This commit is contained in:
saschawillems 2016-08-12 22:00:17 +02:00
parent 2f8c9477f2
commit dae07726dc
1 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

53
base/vulkanframebuffer.hpp
View file

@ -129,11 +129,10 @@ namespace vk
* Add a new attachment described by createinfo to the framebuffer's attachment list * Add a new attachment described by createinfo to the framebuffer's attachment list
* *
* @param createinfo Structure that specifices the framebuffer to be constructed * @param createinfo Structure that specifices the framebuffer to be constructed
* @param layoutCmd A valid and active command buffer used for the initial layout transitions
* *
* @return Index of the new attachment * @return Index of the new attachment
*/ */
uint32_t addAttachment(vk::AttachmentCreateInfo createinfo, VkCommandBuffer layoutCmd) uint32_t addAttachment(vk::AttachmentCreateInfo createinfo)
{ {
vk::FramebufferAttachment attachment; vk::FramebufferAttachment attachment;
@ -197,16 +196,6 @@ namespace vk
attachment.subresourceRange.levelCount = 1; attachment.subresourceRange.levelCount = 1;
attachment.subresourceRange.layerCount = createinfo.layerCount; attachment.subresourceRange.layerCount = createinfo.layerCount;
// Set the initial layout to shader read instead of attachment
// Note that the render loop has to take care of the transition from read to attachment
vkTools::setImageLayout(
layoutCmd,
attachment.image,
aspectMask,
VK_IMAGE_LAYOUT_UNDEFINED,
imageLayout,
attachment.subresourceRange);
VkImageViewCreateInfo imageView = vkTools::initializers::imageViewCreateInfo(); VkImageViewCreateInfo imageView = vkTools::initializers::imageViewCreateInfo();
imageView.viewType = (createinfo.layerCount == 1) ? VK_IMAGE_VIEW_TYPE_2D : VK_IMAGE_VIEW_TYPE_2D_ARRAY; imageView.viewType = (createinfo.layerCount == 1) ? VK_IMAGE_VIEW_TYPE_2D : VK_IMAGE_VIEW_TYPE_2D_ARRAY;
imageView.format = createinfo.format; imageView.format = createinfo.format;
@ -224,15 +213,24 @@ namespace vk
attachment.description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachment.description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
attachment.description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; attachment.description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
attachment.description.format = createinfo.format; attachment.description.format = createinfo.format;
if (attachment.hasDepth() || attachment.hasStencil()) attachment.description.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
// Final layout
if ((createinfo.usage & VK_IMAGE_USAGE_SAMPLED_BIT))
{ {
attachment.description.initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; // If sampled, final layout is always SHADER_READ
attachment.description.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachment.description.finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
} }
else else
{ {
attachment.description.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; // If not, final layout depends on attachment type
attachment.description.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; if (attachment.hasDepth() || attachment.hasStencil())
{
attachment.description.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
}
else
{
attachment.description.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
}
} }
attachments.push_back(attachment); attachments.push_back(attachment);
@ -319,6 +317,25 @@ namespace vk
subpass.pDepthStencilAttachment = &depthReference; subpass.pDepthStencilAttachment = &depthReference;
} }
// Use subpass dependencies for attachment layout transitions
std::array<VkSubpassDependency, 2> dependencies;
dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL;
dependencies[0].dstSubpass = 0;
dependencies[0].srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
dependencies[0].dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
dependencies[0].srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
dependencies[0].dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
dependencies[0].dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
dependencies[1].srcSubpass = 0;
dependencies[1].dstSubpass = VK_SUBPASS_EXTERNAL;
dependencies[1].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
dependencies[1].dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
dependencies[1].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
dependencies[1].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
dependencies[1].dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
// Create render pass // Create render pass
VkRenderPassCreateInfo renderPassInfo = {}; VkRenderPassCreateInfo renderPassInfo = {};
renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
@ -326,6 +343,8 @@ namespace vk
renderPassInfo.attachmentCount = static_cast<uint32_t>(attachmentDescriptions.size()); renderPassInfo.attachmentCount = static_cast<uint32_t>(attachmentDescriptions.size());
renderPassInfo.subpassCount = 1; renderPassInfo.subpassCount = 1;
renderPassInfo.pSubpasses = &subpass; renderPassInfo.pSubpasses = &subpass;
renderPassInfo.dependencyCount = 2;
renderPassInfo.pDependencies = dependencies.data();
VK_CHECK_RESULT(vkCreateRenderPass(vulkanDevice->logicalDevice, &renderPassInfo, nullptr, &renderPass)); VK_CHECK_RESULT(vkCreateRenderPass(vulkanDevice->logicalDevice, &renderPassInfo, nullptr, &renderPass));
std::vector<VkImageView> attachmentViews; std::vector<VkImageView> attachmentViews;