Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. (#3390, #2626)
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 76703d7..cc6bf00 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -80,6 +80,7 @@
- Demo: Improved "Layout & Scrolling" -> "Child Windows" section.
- Style Editor: Added preview of circle auto-tessellation when editing the corresponding value.
- Backends: OpenGL3: Added support for glad2 loader. (#3330) [@moritz-h]
+- Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. (#3390, #2626) [@RoryO]
- Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. (#3390) [@RoryO]
diff --git a/examples/example_glfw_vulkan/main.cpp b/examples/example_glfw_vulkan/main.cpp
index 58d0ab7..8e75abb 100644
--- a/examples/example_glfw_vulkan/main.cpp
+++ b/examples/example_glfw_vulkan/main.cpp
@@ -310,7 +310,7 @@
}
}
-static void FramePresent(ImGui_ImplVulkanH_Window* wd)
+static void FramePresent(ImGui_ImplVulkanH_Window* wd, GLFWwindow* window)
{
VkSemaphore render_complete_semaphore = wd->FrameSemaphores[wd->SemaphoreIndex].RenderCompleteSemaphore;
VkPresentInfoKHR info = {};
@@ -321,6 +321,12 @@
info.pSwapchains = &wd->Swapchain;
info.pImageIndices = &wd->FrameIndex;
VkResult err = vkQueuePresentKHR(g_Queue, &info);
+ if (err == VK_ERROR_OUT_OF_DATE_KHR)
+ {
+ glfwGetFramebufferSize(window, &g_SwapChainResizeWidth, &g_SwapChainResizeHeight);
+ g_SwapChainRebuild = true;
+ return;
+ }
check_vk_result(err);
wd->SemaphoreIndex = (wd->SemaphoreIndex + 1) % wd->ImageCount; // Now we can use the next set of semaphores
}
@@ -330,13 +336,6 @@
fprintf(stderr, "Glfw Error %d: %s\n", error, description);
}
-static void glfw_resize_callback(GLFWwindow*, int w, int h)
-{
- g_SwapChainRebuild = true;
- g_SwapChainResizeWidth = w;
- g_SwapChainResizeHeight = h;
-}
-
int main(int, char**)
{
// Setup GLFW window
@@ -365,7 +364,6 @@
// Create Framebuffers
int w, h;
glfwGetFramebufferSize(window, &w, &h);
- glfwSetFramebufferSizeCallback(window, glfw_resize_callback);
ImGui_ImplVulkanH_Window* wd = &g_MainWindowData;
SetupVulkanWindow(wd, surface, w, h);
@@ -515,7 +513,7 @@
{
memcpy(&wd->ClearValue.color.float32[0], &clear_color, 4 * sizeof(float));
FrameRender(wd, draw_data);
- FramePresent(wd);
+ FramePresent(wd, window);
}
}
diff --git a/examples/example_sdl_vulkan/main.cpp b/examples/example_sdl_vulkan/main.cpp
index 6de7afa..c0a9808 100644
--- a/examples/example_sdl_vulkan/main.cpp
+++ b/examples/example_sdl_vulkan/main.cpp
@@ -302,7 +302,7 @@
}
}
-static void FramePresent(ImGui_ImplVulkanH_Window* wd)
+static void FramePresent(ImGui_ImplVulkanH_Window* wd, SDL_Window* window)
{
VkSemaphore render_complete_semaphore = wd->FrameSemaphores[wd->SemaphoreIndex].RenderCompleteSemaphore;
VkPresentInfoKHR info = {};
@@ -313,6 +313,12 @@
info.pSwapchains = &wd->Swapchain;
info.pImageIndices = &wd->FrameIndex;
VkResult err = vkQueuePresentKHR(g_Queue, &info);
+ if (err == VK_ERROR_OUT_OF_DATE_KHR)
+ {
+ SDL_GetWindowSize(window, &g_SwapChainResizeWidth, &g_SwapChainResizeHeight);
+ g_SwapChainRebuild = true;
+ return;
+ }
check_vk_result(err);
wd->SemaphoreIndex = (wd->SemaphoreIndex + 1) % wd->ImageCount; // Now we can use the next set of semaphores
}
@@ -445,15 +451,6 @@
ImGui_ImplSDL2_ProcessEvent(&event);
if (event.type == SDL_QUIT)
done = true;
- if (event.type == SDL_WINDOWEVENT && event.window.event == SDL_WINDOWEVENT_RESIZED && event.window.windowID == SDL_GetWindowID(window))
- {
- // Note: your own application may rely on SDL_WINDOWEVENT_MINIMIZED/SDL_WINDOWEVENT_RESTORED to skip updating all-together.
- // Here ImGui_ImplSDL2_NewFrame() will set io.DisplaySize to zero which will disable rendering but let application run.
- // Please note that you can't Present into a minimized window.
- g_SwapChainResizeWidth = (int)event.window.data1;
- g_SwapChainResizeHeight = (int)event.window.data2;
- g_SwapChainRebuild = true;
- }
}
// Resize swap chain?
@@ -515,7 +512,7 @@
{
memcpy(&wd->ClearValue.color.float32[0], &clear_color, 4 * sizeof(float));
FrameRender(wd, draw_data);
- FramePresent(wd);
+ FramePresent(wd, window);
}
}
