godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid freeze when interacting with menus on Wayland by re-aquiring next swapchain image after updating swapchain 

(cherry picked from commit df021b5063)
This commit is contained in:
clayjohn 2023-07-07 09:06:02 +02:00 committed by Yuri Sizov
parent 5576f5ab81
commit 7447946dd1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/vulkan/vulkan_context.cpp
View File

@ -1818,7 +1818,7 @@ Error VulkanContext::_update_swap_chain(Window *window) {
if (window->width == 0 || window->height == 0) { if (window->width == 0 || window->height == 0) {
free(presentModes); free(presentModes);
// Likely window minimized, no swapchain created. // Likely window minimized, no swapchain created.
return OK; return ERR_SKIP;
} }
// The FIFO present mode is guaranteed by the spec to be supported // The FIFO present mode is guaranteed by the spec to be supported
// and to have no tearing. It's a great default present mode to use. // and to have no tearing. It's a great default present mode to use.
@ -2275,8 +2275,10 @@ Error VulkanContext::prepare_buffers() {
// Swapchain is not as optimal as it could be, but the platform's // Swapchain is not as optimal as it could be, but the platform's
// presentation engine will still present the image correctly. // presentation engine will still present the image correctly.
print_verbose("Vulkan: Early suboptimal swapchain, recreating."); print_verbose("Vulkan: Early suboptimal swapchain, recreating.");
_update_swap_chain(w); Error swap_chain_err = _update_swap_chain(w);
if (swap_chain_err == ERR_SKIP) {
break; break;
}
} else if (err != VK_SUCCESS) { } else if (err != VK_SUCCESS) {
ERR_BREAK_MSG(err != VK_SUCCESS, "Vulkan: Did not create swapchain successfully. Error code: " + String(string_VkResult(err))); ERR_BREAK_MSG(err != VK_SUCCESS, "Vulkan: Did not create swapchain successfully. Error code: " + String(string_VkResult(err)));
} else { } else {