Correctly handle vk::Result::eOutOfDate from vk::raii::SwapchainKHR::acquireNextImage and vk::raii::Queue::presentKHR

Author: asuessenbach

attachments/17_swap_chain_recreation.cpp

@@ -67,7 +67,7 @@ class HelloTriangleApplication
 	std::vector<vk::raii::Semaphore> presentCompleteSemaphores;
 	std::vector<vk::raii::Semaphore> renderFinishedSemaphores;
 	std::vector<vk::raii::Fence>     inFlightFences;
-	uint32_t                         frameIndex   = 0;
+	uint32_t                         frameIndex = 0;
 
 	bool framebufferResized = false;
 
@@ -340,7 +340,7 @@ class HelloTriangleApplication
 		assert(swapChainImageViews.empty());
 
 		vk::ImageViewCreateInfo imageViewCreateInfo{.viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format, .subresourceRange = {vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1}};
-		for (auto& image : swapChainImages)
+		for (auto &image : swapChainImages)
 		{
 			imageViewCreateInfo.image = image;
 			swapChainImageViews.emplace_back(device, imageViewCreateInfo);
@@ -509,9 +509,13 @@ class HelloTriangleApplication
 			;
 		device.resetFences(*inFlightFences[frameIndex]);
 
-		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
-
-		if (result == vk::Result::eErrorOutOfDateKHR)
+		vk::Result result;
+		uint32_t   imageIndex;
+		try
+		{
+			std::tie(result, imageIndex) = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
+		}
+		catch (vk::OutOfDateKHRError const &error)
 		{
 			recreateSwapChain();
 			return;
@@ -535,40 +539,31 @@ class HelloTriangleApplication
 		                                  .pSignalSemaphores    = &*renderFinishedSemaphores[imageIndex]};
 		queue.submit(submitInfo, *inFlightFences[frameIndex]);
 
+		const vk::PresentInfoKHR presentInfoKHR{.waitSemaphoreCount = 1,
+		                                        .pWaitSemaphores    = &*renderFinishedSemaphores[imageIndex],
+		                                        .swapchainCount     = 1,
+		                                        .pSwapchains        = &*swapChain,
+		                                        .pImageIndices      = &imageIndex};
 		try
 		{
-			const vk::PresentInfoKHR presentInfoKHR{.waitSemaphoreCount = 1,
-			                                        .pWaitSemaphores    = &*renderFinishedSemaphores[imageIndex],
-			                                        .swapchainCount     = 1,
-			                                        .pSwapchains        = &*swapChain,
-			                                        .pImageIndices      = &imageIndex};
 			result = queue.presentKHR(presentInfoKHR);
-			if (result == vk::Result::eSuboptimalKHR || framebufferResized)
-			{
-				framebufferResized = false;
-				recreateSwapChain();
-			}
-			else if (result != vk::Result::eSuccess)
-			{
-				throw std::runtime_error("failed to present swap chain image!");
-			}
 		}
-		catch (const vk::SystemError &e)
+		catch (vk::OutOfDateKHRError const &error)
 		{
-			if (e.code().value() == static_cast<int>(vk::Result::eErrorOutOfDateKHR))
-			{
-				recreateSwapChain();
-				return;
-			}
-			else
-			{
-				throw;
-			}
+			recreateSwapChain();
+			return;
+		}
+		assert(result == vk::Result::eSuccess || result == vk::Result::eSuboptimalKHR);
+		if (result == vk::Result::eSuboptimalKHR || framebufferResized)
+		{
+			framebufferResized = false;
+			recreateSwapChain();
 		}
-		frameIndex   = (frameIndex + 1) % MAX_FRAMES_IN_FLIGHT;
+		frameIndex = (frameIndex + 1) % MAX_FRAMES_IN_FLIGHT;
 	}
 
-	[[nodiscard]] vk::raii::ShaderModule createShaderModule(const std::vector<char> &code) const
+	[[nodiscard]] vk::raii::ShaderModule
+	    createShaderModule(const std::vector<char> &code) const
 	{
 		vk::ShaderModuleCreateInfo createInfo{.codeSize = code.size() * sizeof(char), .pCode = reinterpret_cast<const uint32_t *>(code.data())};
 		vk::raii::ShaderModule     shaderModule{device, createInfo};