update imgui (docking 2024-03-05)

pthom · Mar 10, 2024 · bcd4e59 · bcd4e59
1 parent 0576001
commit bcd4e59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/external/imgui b/external/imgui
diff --git 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
@@ -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);
         }
     }
+7 −7		.github/workflows/build.yml
+1 −1		.github/workflows/static-analysis.yml
+1 −1		backends/imgui_impl_allegro5.cpp
+1 −1		backends/imgui_impl_dx10.cpp
+1 −1		backends/imgui_impl_dx11.cpp
+1 −1		backends/imgui_impl_dx12.cpp
+26 −4		backends/imgui_impl_dx9.cpp
+9 −10		backends/imgui_impl_glfw.cpp
+2 −3		backends/imgui_impl_glfw.h
+1 −1		backends/imgui_impl_metal.mm
+2 −2		backends/imgui_impl_opengl2.cpp
+27 −19		backends/imgui_impl_opengl3.cpp
+2 −0		backends/imgui_impl_opengl3_loader.h
+3 −1		backends/imgui_impl_osx.h
+5 −4		backends/imgui_impl_osx.mm
+138 −58		backends/imgui_impl_sdl2.cpp
+8 −5		backends/imgui_impl_sdl2.h
+138 −58		backends/imgui_impl_sdl3.cpp
+9 −2		backends/imgui_impl_sdl3.h
+4 −5		backends/imgui_impl_sdlrenderer3.cpp
+88 −80		backends/imgui_impl_vulkan.cpp
+27 −9		backends/imgui_impl_vulkan.h
+37 −20		backends/imgui_impl_wgpu.cpp
+18 −1		backends/imgui_impl_wgpu.h
+11 −1		backends/imgui_impl_win32.cpp
+172 −4		docs/CHANGELOG.txt
+1 −1		docs/CONTRIBUTING.md
+1 −1		docs/FONTS.md
+6 −2		docs/README.md
+0 −0		examples/example_emscripten_wgpu/Makefile.emscripten
+1 −1		examples/example_emscripten_wgpu/README.md
+162 −136		examples/example_emscripten_wgpu/main.cpp
+2 −2		examples/example_glfw_metal/Makefile
+12 −11		examples/example_glfw_vulkan/main.cpp
+12 −11		examples/example_sdl2_vulkan/main.cpp
+570 −281		imgui.cpp
+45 −30		imgui.h
+61 −17		imgui_demo.cpp
+317 −6		imgui_draw.cpp
+181 −117		imgui_internal.h
+54 −28		imgui_tables.cpp
+71 −28		imgui_widgets.cpp