rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-07 16:54:14 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Recreate swap chain on presentation failure

Browse Source
This commit is contained in:
Philip Rebohle 2018-04-14 22:45:30 +02:00
parent 5fa8174816
commit a6406e3b60
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dxvk/dxvk_swapchain.cpp
View File

@ -45,7 +45,7 @@ namespace dxvk {
if (status != VK_SUCCESS if (status != VK_SUCCESS
&& status != VK_SUBOPTIMAL_KHR) && status != VK_SUBOPTIMAL_KHR)
throw DxvkError("DxvkSwapchain::getFramebuffer: Failed to acquire image"); throw DxvkError("DxvkSwapchain: Failed to acquire image");
return m_framebuffers.at(m_imageIndex); return m_framebuffers.at(m_imageIndex);
} }
@ -66,10 +66,11 @@ namespace dxvk {
VkResult status = m_device->presentSwapImage(info); VkResult status = m_device->presentSwapImage(info);
if (status != VK_SUCCESS if (status == VK_SUBOPTIMAL_KHR
&& status != VK_SUBOPTIMAL_KHR || status == VK_ERROR_OUT_OF_DATE_KHR)
&& status != VK_ERROR_OUT_OF_DATE_KHR) this->recreateSwapchain();
throw DxvkError("DxvkSwapchain::present: Failed to present image"); else if (status != VK_SUCCESS)
throw DxvkError("DxvkSwapchain: Failed to present image");
} }
@ -123,8 +124,15 @@ namespace dxvk {
swapInfo.clipped = VK_TRUE; swapInfo.clipped = VK_TRUE;
swapInfo.oldSwapchain = oldSwapchain; swapInfo.oldSwapchain = oldSwapchain;
Logger::debug(str::format(
"DxvkSwapchain: Actual swap chain properties: ",
"\n Format: ", swapInfo.imageFormat,
"\n Present mode: ", swapInfo.presentMode,
"\n Buffer size: ", swapInfo.imageExtent.width, "x", swapInfo.imageExtent.height,
"\n Image count: ", swapInfo.minImageCount));
if (m_vkd->vkCreateSwapchainKHR(m_vkd->device(), &swapInfo, nullptr, &m_handle) != VK_SUCCESS) if (m_vkd->vkCreateSwapchainKHR(m_vkd->device(), &swapInfo, nullptr, &m_handle) != VK_SUCCESS)
throw DxvkError("DxvkSwapchain::recreateSwapchain: Failed to recreate swap chain"); throw DxvkError("DxvkSwapchain: Failed to recreate swap chain");
// Destroy previous swapchain object // Destroy previous swapchain object
m_vkd->vkDestroySwapchainKHR( m_vkd->vkDestroySwapchainKHR(
@ -194,11 +202,11 @@ namespace dxvk {
std::vector<VkImage> DxvkSwapchain::retrieveSwapImages() { std::vector<VkImage> DxvkSwapchain::retrieveSwapImages() {
uint32_t imageCount = 0; uint32_t imageCount = 0;
if (m_vkd->vkGetSwapchainImagesKHR(m_vkd->device(), m_handle, &imageCount, nullptr) != VK_SUCCESS) if (m_vkd->vkGetSwapchainImagesKHR(m_vkd->device(), m_handle, &imageCount, nullptr) != VK_SUCCESS)
throw DxvkError("DxvkSwapchain::recreateSwapchain: Failed to retrieve swap chain images"); throw DxvkError("DxvkSwapchain: Failed to retrieve swap chain images");
std::vector<VkImage> images(imageCount); std::vector<VkImage> images(imageCount);
if (m_vkd->vkGetSwapchainImagesKHR(m_vkd->device(), m_handle, &imageCount, images.data()) != VK_SUCCESS) if (m_vkd->vkGetSwapchainImagesKHR(m_vkd->device(), m_handle, &imageCount, images.data()) != VK_SUCCESS)
throw DxvkError("DxvkSwapchain::recreateSwapchain: Failed to retrieve swap chain images"); throw DxvkError("DxvkSwapchain: Failed to retrieve swap chain images");
return images; return images;
} }