diff --git a/external/imgui b/external/imgui index 2dc85e6e..fd75685f 160000 --- a/external/imgui +++ b/external/imgui @@ -1 +1 @@ -Subproject commit 2dc85e6e438e6d7f485317c9b76dc153535fed16 +Subproject commit fd75685fb009cff45cc6ed2be6954054950c3b94 diff --git a/src/hello_imgui/internal/backend_impls/rendering_vulkan_glfw.cpp b/src/hello_imgui/internal/backend_impls/rendering_vulkan_glfw.cpp index e174be4b..0b2f42b5 100644 --- a/src/hello_imgui/internal/backend_impls/rendering_vulkan_glfw.cpp +++ b/src/hello_imgui/internal/backend_impls/rendering_vulkan_glfw.cpp @@ -60,13 +60,14 @@ namespace HelloImGui init_info.Queue = gVkGlobals.Queue; init_info.PipelineCache = gVkGlobals.PipelineCache; init_info.DescriptorPool = gVkGlobals.DescriptorPool; + init_info.RenderPass = wd->RenderPass; init_info.Subpass = 0; init_info.MinImageCount = gVkGlobals.MinImageCount; init_info.ImageCount = wd->ImageCount; init_info.MSAASamples = VK_SAMPLE_COUNT_1_BIT; init_info.Allocator = gVkGlobals.Allocator; init_info.CheckVkResultFn = HelloImGui::VulkanSetup::check_vk_result; - ImGui_ImplVulkan_Init(&init_info, wd->RenderPass); + ImGui_ImplVulkan_Init(&init_info); } } diff --git a/src/hello_imgui/internal/backend_impls/rendering_vulkan_sdl.cpp b/src/hello_imgui/internal/backend_impls/rendering_vulkan_sdl.cpp index f984bb32..03ef09cb 100644 --- a/src/hello_imgui/internal/backend_impls/rendering_vulkan_sdl.cpp +++ b/src/hello_imgui/internal/backend_impls/rendering_vulkan_sdl.cpp @@ -55,13 +55,14 @@ namespace HelloImGui init_info.Queue = gVkGlobals.Queue; init_info.PipelineCache = gVkGlobals.PipelineCache; init_info.DescriptorPool = gVkGlobals.DescriptorPool; + init_info.RenderPass = wd->RenderPass; init_info.Subpass = 0; init_info.MinImageCount = gVkGlobals.MinImageCount; init_info.ImageCount = wd->ImageCount; init_info.MSAASamples = VK_SAMPLE_COUNT_1_BIT; init_info.Allocator = gVkGlobals.Allocator; init_info.CheckVkResultFn = HelloImGui::VulkanSetup::check_vk_result; - ImGui_ImplVulkan_Init(&init_info, wd->RenderPass); + ImGui_ImplVulkan_Init(&init_info); } }