Forráskód Böngészése

Backends: Vulkan: Fixes for building with pre Vulkan 1.3. Amend 8901931. (#7166)

ocornut 1 éve
szülő
commit
e0ba0d0433
2 módosított fájl, 6 hozzáadás és 2 törlés
  1. 1 2
      backends/imgui_impl_vulkan.cpp
  2. 5 0
      backends/imgui_impl_vulkan.h

+ 1 - 2
backends/imgui_impl_vulkan.cpp

@@ -185,8 +185,7 @@ IMGUI_VULKAN_FUNC_MAP(IMGUI_VULKAN_FUNC_DEF)
 #undef IMGUI_VULKAN_FUNC_DEF
 #endif // VK_NO_PROTOTYPES
 
-#if defined(VK_VERSION_1_3) || defined(VK_KHR_dynamic_rendering)
-#define IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
+#ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
 static PFN_vkCmdBeginRenderingKHR   ImGuiImplVulkanFuncs_vkCmdBeginRenderingKHR;
 static PFN_vkCmdEndRenderingKHR     ImGuiImplVulkanFuncs_vkCmdEndRenderingKHR;
 #endif

+ 5 - 0
backends/imgui_impl_vulkan.h

@@ -52,6 +52,9 @@
 #else
 #include <vulkan/vulkan.h>
 #endif
+#if defined(VK_VERSION_1_3) || defined(VK_KHR_dynamic_rendering)
+#define IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
+#endif
 
 // Initialization data, for ImGui_ImplVulkan_Init()
 // - VkDescriptorPool should be created with VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
@@ -77,7 +80,9 @@ struct ImGui_ImplVulkan_InitInfo
     // (Optional) Dynamic Rendering
     // Need to explicitly enable VK_KHR_dynamic_rendering extension to use this, even for Vulkan 1.3.
     bool                            UseDynamicRendering;
+#ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
     VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;
+#endif
 
     // (Optional) Allocation, Debugging
     const VkAllocationCallbacks*    Allocator;