fix for ocornut#7508

InsideBSITheSecond · Apr 20, 2024 · 4d53a61 · 4d53a61
1 parent b555984
commit 4d53a61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/backends/imgui_impl_vulkan.cpp b/backends/imgui_impl_vulkan.cpp
@@ -1731,12 +1731,17 @@ static void ImGui_ImplVulkan_RenderWindow(ImGuiViewport* viewport, void*)
  {
  {
  err = vkAcquireNextImageKHR(v->Device, wd->Swapchain, UINT64_MAX, fsd->ImageAcquiredSemaphore, VK_NULL_HANDLE, &wd->FrameIndex);
- check_vk_result(err);
+ if (err == VK_ERROR_OUT_OF_DATE_KHR) {
+ ImGui_ImplVulkanH_CreateOrResizeWindow(v->Instance, v->PhysicalDevice, v->Device, &vd->Window, v->QueueFamily, v->Allocator, (int)viewport->Size.x, (int)viewport->Size.y, v->MinImageCount);
+ wd->CanPresent = false;
+ return;
+ } else
+ check_vk_result(err);
  fd = &wd->Frames[wd->FrameIndex];
  }
  for (;;)
  {
- err = vkWaitForFences(v->Device, 1, &fd->Fence, VK_TRUE, 100);
+ err = vkWaitForFences(v->Device, 1, &fd->Fence, VK_TRUE, UINT64_MAX);
  if (err == VK_SUCCESS) break;
  if (err == VK_TIMEOUT) continue;
  check_vk_result(err);
@@ -1858,6 +1863,11 @@ static void ImGui_ImplVulkan_SwapBuffers(ImGuiViewport* viewport, void*)
  ImGui_ImplVulkanH_Window* wd = &vd->Window;
  ImGui_ImplVulkan_InitInfo* v = &bd->VulkanInitInfo;
 
+ if (!wd->CanPresent) {
+ wd->CanPresent = true;
+ return;
+ }
+
  VkResult err;
  uint32_t present_index = wd->FrameIndex;
 
@@ -1872,7 +1882,7 @@ static void ImGui_ImplVulkan_SwapBuffers(ImGuiViewport* viewport, void*)
  err = vkQueuePresentKHR(v->Queue, &info);
  if (err == VK_ERROR_OUT_OF_DATE_KHR || err == VK_SUBOPTIMAL_KHR)
  ImGui_ImplVulkanH_CreateOrResizeWindow(v->Instance, v->PhysicalDevice, v->Device, &vd->Window, v->QueueFamily, v->Allocator, (int)viewport->Size.x, (int)viewport->Size.y, v->MinImageCount);
- else
+ else
  check_vk_result(err);
 
  wd->FrameIndex = (wd->FrameIndex + 1) % wd->ImageCount; // This is for the next vkWaitForFences()

diff --git a/backends/imgui_impl_vulkan.h b/backends/imgui_impl_vulkan.h
@@ -170,6 +170,7 @@ struct ImGui_ImplVulkanH_Window
  VkPipeline Pipeline; // The window pipeline may uses a different VkRenderPass than the one passed in ImGui_ImplVulkan_InitInfo
  bool UseDynamicRendering;
  bool ClearEnable;
+ bool CanPresent;
  VkClearValue ClearValue;
  uint32_t FrameIndex; // Current frame being rendered to (0 <= FrameIndex < FrameInFlightCount)
  uint32_t ImageCount; // Number of simultaneous in-flight frames (returned by vkGetSwapchainImagesKHR, usually derived from min_image_count)
@@ -183,6 +184,7 @@ struct ImGui_ImplVulkanH_Window
  memset((void*)this, 0, sizeof(*this));
  PresentMode = (VkPresentModeKHR)~0; // Ensure we get an error if user doesn't set this.
  ClearEnable = true;
+ CanPresent = true;
  }
 };