VulkanDevice: Only create swap chain framebuffer without dynamic rendering

This commit is contained in:
Stenzek 2024-11-30 01:08:50 +10:00
parent ee750b44e3
commit dfacf9e8db
No known key found for this signature in database

View File

@ -534,13 +534,13 @@ bool VulkanSwapChain::CreateSwapChainImages(VulkanDevice& dev, Error* error)
return false; return false;
} }
Vulkan::FramebufferBuilder fbb;
m_images.reserve(image_count); m_images.reserve(image_count);
m_current_image = 0; m_current_image = 0;
for (u32 i = 0; i < image_count; i++) for (u32 i = 0; i < image_count; i++)
{ {
Image& image = m_images.emplace_back(); Image& image = m_images.emplace_back();
image.image = images[i]; image.image = images[i];
image.framebuffer = VK_NULL_HANDLE;
const VkImageViewCreateInfo view_info = { const VkImageViewCreateInfo view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
@ -560,6 +560,9 @@ bool VulkanSwapChain::CreateSwapChainImages(VulkanDevice& dev, Error* error)
return false; return false;
} }
if (!dev.GetOptionalExtensions().vk_khr_dynamic_rendering)
{
Vulkan::FramebufferBuilder fbb;
fbb.AddAttachment(image.view); fbb.AddAttachment(image.view);
fbb.SetRenderPass(render_pass); fbb.SetRenderPass(render_pass);
fbb.SetSize(m_window_info.surface_width, m_window_info.surface_height, 1); fbb.SetSize(m_window_info.surface_width, m_window_info.surface_height, 1);
@ -571,6 +574,7 @@ bool VulkanSwapChain::CreateSwapChainImages(VulkanDevice& dev, Error* error)
return false; return false;
} }
} }
}
m_current_semaphore = 0; m_current_semaphore = 0;
for (u32 i = 0; i < NUM_SEMAPHORES; i++) for (u32 i = 0; i < NUM_SEMAPHORES; i++)
@ -621,6 +625,7 @@ void VulkanSwapChain::DestroySwapChainImages()
for (const auto& it : m_images) for (const auto& it : m_images)
{ {
// don't defer view destruction, images are no longer valid // don't defer view destruction, images are no longer valid
if (it.framebuffer != VK_NULL_HANDLE)
vkDestroyFramebuffer(vkdev, it.framebuffer, nullptr); vkDestroyFramebuffer(vkdev, it.framebuffer, nullptr);
vkDestroyImageView(vkdev, it.view, nullptr); vkDestroyImageView(vkdev, it.view, nullptr);
} }