Vulkan: add switch IMGUI_VULKAN_RENDER_PASS_IN_STRUCTURE

#if IMGUI_VERSION_NUM >= 19030 // The API changed with this commit // ocornut/imgui@f80e65a #define IMGUI_VULKAN_RENDER_PASS_IN_STRUCTURE #endif
pthom · Mar 11, 2024 · 9674785 · 9674785
1 parent bcd4e59
commit 9674785
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/hello_imgui/internal/backend_impls/rendering_vulkan_glfw.cpp b/src/hello_imgui/internal/backend_impls/rendering_vulkan_glfw.cpp
@@ -13,6 +13,12 @@
 #include "hello_imgui/hello_imgui_logger.h"
 #include "hello_imgui/hello_imgui.h"
 
+#if IMGUI_VERSION_NUM  >= 19030
+// The API changed with this commit
+// https://github.com/ocornut/imgui/commit/f80e65a406885beedf68856057b278343d5c1407
+#define IMGUI_VULKAN_RENDER_PASS_IN_STRUCTURE
+#endif
+
 
 namespace HelloImGui
 {
@@ -60,14 +66,19 @@ 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;
+
+#ifdef IMGUI_VULKAN_RENDER_PASS_IN_STRUCTURE
+            init_info.RenderPass = wd->RenderPass;
             ImGui_ImplVulkan_Init(&init_info);
+#else
+            ImGui_ImplVulkan_Init(&init_info, wd->RenderPass);
+#endif
         }
     }
 

diff --git a/src/hello_imgui/internal/backend_impls/rendering_vulkan_sdl.cpp b/src/hello_imgui/internal/backend_impls/rendering_vulkan_sdl.cpp
@@ -12,6 +12,11 @@
 #include "hello_imgui/hello_imgui_logger.h"
 #include "hello_imgui/hello_imgui.h"
 
+#if IMGUI_VERSION_NUM  >= 19030
+// The API changed with this commit
+// https://github.com/ocornut/imgui/commit/f80e65a406885beedf68856057b278343d5c1407
+#define IMGUI_VULKAN_RENDER_PASS_IN_STRUCTURE
+#endif
 
 namespace HelloImGui
 {
@@ -55,14 +60,19 @@ 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;
+
+#ifdef IMGUI_VULKAN_RENDER_PASS_IN_STRUCTURE
+            init_info.RenderPass = wd->RenderPass;
             ImGui_ImplVulkan_Init(&init_info);
+#else
+            ImGui_ImplVulkan_Init(&init_info, wd->RenderPass);
+#endif
         }
     }