Skip to content

Fix Vulkan example hang #9497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nemirtingas wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −9
Open

Fix Vulkan example hang #9497

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions examples/example_win32_vulkan/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ static VkDescriptorPool g_DescriptorPool = VK_NULL_HANDLE;
static ImGui_ImplVulkanH_Window g_MainWindowData;
static uint32_t g_MinImageCount = 2;
static bool g_SwapChainRebuild = false;
static int g_FrameBufferWidth = 0;
static int g_FrameBufferHeight = 0;

static void check_vk_result(VkResult err)
{
Expand Down Expand Up @@ -200,6 +202,20 @@ static void SetupVulkan(ImVector<const char*> instance_extensions)

// All the ImGui_ImplVulkanH_XXX structures/functions are optional helpers used by the demo.
// Your real engine/app may not use them.
static void RebuildVulkanSwapchain(int fb_width, int fb_height)
{
if (fb_width > 0 && fb_height > 0 && (g_SwapChainRebuild || g_MainWindowData.Width != fb_width || g_MainWindowData.Height != fb_height))
{
ImGui_ImplVulkan_SetMinImageCount(g_MinImageCount);
ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, &g_MainWindowData, g_QueueFamily, g_Allocator, fb_width, fb_height, g_MinImageCount, 0);
g_MainWindowData.FrameIndex = 0;
g_SwapChainRebuild = false;

g_FrameBufferWidth = fb_width;
g_FrameBufferHeight = fb_height;
}
}

static void SetupVulkanWindow(ImGui_ImplVulkanH_Window* wd, VkSurfaceKHR surface, int width, int height)
{
// Check for WSI support
Expand Down Expand Up @@ -453,6 +469,8 @@ int main(int, char**)
if (done)
break;

RebuildVulkanSwapchain(g_FrameBufferWidth, g_FrameBufferHeight);

// Start the Dear ImGui frame
ImGui_ImplVulkan_NewFrame();
ImGui_ImplWin32_NewFrame();
Expand Down Expand Up @@ -547,15 +565,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (g_Device != VK_NULL_HANDLE && wParam != SIZE_MINIMIZED)
{
// Resize swap chain
int fb_width = (UINT)LOWORD(lParam);
int fb_height = (UINT)HIWORD(lParam);
if (fb_width > 0 && fb_height > 0 && (g_SwapChainRebuild || g_MainWindowData.Width != fb_width || g_MainWindowData.Height != fb_height))
{
ImGui_ImplVulkan_SetMinImageCount(g_MinImageCount);
ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, &g_MainWindowData, g_QueueFamily, g_Allocator, fb_width, fb_height, g_MinImageCount, 0);
g_MainWindowData.FrameIndex = 0;
g_SwapChainRebuild = false;
}
RebuildVulkanSwapchain((UINT)LOWORD(lParam), (UINT)HIWORD(lParam));
}
return 0;
case WM_SYSCOMMAND:
Expand Down