|
|
@ -281,12 +281,34 @@ void Scheduler::EndRenderPass() { |
|
|
Record([num_images = num_renderpass_images, images = renderpass_images, |
|
|
Record([num_images = num_renderpass_images, images = renderpass_images, |
|
|
ranges = renderpass_image_ranges](vk::CommandBuffer cmdbuf) { |
|
|
ranges = renderpass_image_ranges](vk::CommandBuffer cmdbuf) { |
|
|
std::array<VkImageMemoryBarrier, 9> barriers; |
|
|
std::array<VkImageMemoryBarrier, 9> barriers; |
|
|
|
|
|
VkPipelineStageFlags src_stages = 0; |
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num_images; ++i) { |
|
|
for (size_t i = 0; i < num_images; ++i) { |
|
|
|
|
|
const VkImageSubresourceRange& range = ranges[i]; |
|
|
|
|
|
const bool is_color = range.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT; |
|
|
|
|
|
const bool is_depth_stencil = range.aspectMask & |
|
|
|
|
|
(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); |
|
|
|
|
|
|
|
|
|
|
|
VkAccessFlags src_access = 0; |
|
|
|
|
|
VkPipelineStageFlags this_stage = 0; |
|
|
|
|
|
|
|
|
|
|
|
if (is_color) { |
|
|
|
|
|
src_access |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; |
|
|
|
|
|
this_stage |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (is_depth_stencil) { |
|
|
|
|
|
src_access |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; |
|
|
|
|
|
this_stage |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | |
|
|
|
|
|
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
src_stages |= this_stage; |
|
|
|
|
|
|
|
|
barriers[i] = VkImageMemoryBarrier{ |
|
|
barriers[i] = VkImageMemoryBarrier{ |
|
|
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, |
|
|
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, |
|
|
.pNext = nullptr, |
|
|
.pNext = nullptr, |
|
|
.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | |
|
|
|
|
|
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, |
|
|
|
|
|
|
|
|
.srcAccessMask = src_access, |
|
|
.dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT | |
|
|
.dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT | |
|
|
VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | |
|
|
VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | |
|
|
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | |
|
|
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | |
|
|
@ -297,16 +319,21 @@ void Scheduler::EndRenderPass() { |
|
|
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, |
|
|
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, |
|
|
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, |
|
|
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, |
|
|
.image = images[i], |
|
|
.image = images[i], |
|
|
.subresourceRange = ranges[i], |
|
|
|
|
|
|
|
|
.subresourceRange = range, |
|
|
}; |
|
|
}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
cmdbuf.EndRenderPass(); |
|
|
cmdbuf.EndRenderPass(); |
|
|
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | |
|
|
|
|
|
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | |
|
|
|
|
|
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, |
|
|
|
|
|
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, nullptr, nullptr, |
|
|
|
|
|
vk::Span(barriers.data(), num_images)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num_images; ++i) { |
|
|
|
|
|
cmdbuf.PipelineBarrier( |
|
|
|
|
|
src_stages, // OR compute per-image if needed
|
|
|
|
|
|
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, |
|
|
|
|
|
0, |
|
|
|
|
|
barriers[i]); |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
state.renderpass = nullptr; |
|
|
state.renderpass = nullptr; |
|
|
num_renderpass_images = 0; |
|
|
num_renderpass_images = 0; |
|
|
} |
|
|
} |
|
|
|