Skip to content
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

Add option to provide custom header file with vulkan function prototypes #6582

Closed
wants to merge 8 commits into from
Closed

Add option to provide custom header file with vulkan function prototypes #6582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5534f55
changed #defines to avoid double definitions
adalsteinnh Jul 6, 2023
5819cf7
add option to provide custom vulkan prototypes
adalsteinnh Jul 7, 2023
9a086ce
Merge remote-tracking branch 'upstream/docking' into volk-loader-fix
adalsteinnh Jul 12, 2023
65dc18b
Merge branch 'docking' into volk-loader-fix
adalsteinnh Jul 19, 2023
816b0d7
changed #defines to avoid double definitions
adalsteinnh Jul 6, 2023
40aad68
add option to provide custom vulkan prototypes
adalsteinnh Jul 7, 2023
c6239c8
Merge branch 'volk-loader-fix' of https://github.com/adalsteinnh/imgu…
adalsteinnh Aug 10, 2023
2d16d18
Merge remote-tracking branch 'origin/docking' into volk-loader-fix
adalsteinnh Aug 21, 2023
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
8 changes: 4 additions & 4 deletions backends/imgui_impl_vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ void ImGui_ImplVulkanH_CreateWindowCommandBuffers(VkPhysicalDevice physical_devi

// Vulkan prototypes for use with custom loaders
// (see description of IMGUI_IMPL_VULKAN_NO_PROTOTYPES in imgui_impl_vulkan.h
#ifdef VK_NO_PROTOTYPES
#if defined(VK_NO_PROTOTYPES) && !defined(IMGUI_IMPL_VULKAN_CUSTOM_HEADER)
static bool g_FunctionsLoaded = false;
#else
static bool g_FunctionsLoaded = true;
#endif
#ifdef VK_NO_PROTOTYPES
#if defined(VK_NO_PROTOTYPES) && !defined(IMGUI_IMPL_VULKAN_CUSTOM_HEADER)
#define IMGUI_VULKAN_FUNC_MAP(IMGUI_VULKAN_FUNC_MAP_MACRO) \
IMGUI_VULKAN_FUNC_MAP_MACRO(vkAllocateCommandBuffers) \
IMGUI_VULKAN_FUNC_MAP_MACRO(vkAllocateDescriptorSets) \
Expand Down Expand Up @@ -999,7 +999,7 @@ bool ImGui_ImplVulkan_LoadFunctions(PFN_vkVoidFunction(*loader_func)(const ch
// You can use the default Vulkan loader using:
// ImGui_ImplVulkan_LoadFunctions([](const char* function_name, void*) { return vkGetInstanceProcAddr(your_vk_isntance, function_name); });
// But this would be equivalent to not setting VK_NO_PROTOTYPES.
#ifdef VK_NO_PROTOTYPES
#if defined(VK_NO_PROTOTYPES) && !defined(IMGUI_IMPL_VULKAN_CUSTOM_HEADER)
#define IMGUI_VULKAN_FUNC_LOAD(func) \
func = reinterpret_cast<decltype(func)>(loader_func(#func, user_data)); \
if (func == nullptr) \
Expand Down Expand Up @@ -1028,7 +1028,7 @@ bool ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info, VkRenderPass rend
if (info->UseDynamicRendering)
{
#ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
#ifndef VK_NO_PROTOTYPES
#if defined(VK_NO_PROTOTYPES) && !defined(IMGUI_IMPL_VULKAN_CUSTOM_HEADER)
ImGuiImplVulkanFuncs_vkCmdBeginRenderingKHR = reinterpret_cast<PFN_vkCmdBeginRenderingKHR>(vkGetInstanceProcAddr(info->Instance, "vkCmdBeginRenderingKHR"));
ImGuiImplVulkanFuncs_vkCmdEndRenderingKHR = reinterpret_cast<PFN_vkCmdEndRenderingKHR>(vkGetInstanceProcAddr(info->Instance, "vkCmdEndRenderingKHR"));
#endif
Expand Down
8 changes: 8 additions & 0 deletions backends/imgui_impl_vulkan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@
// (2) Call ImGui_ImplVulkan_LoadFunctions() before ImGui_ImplVulkan_Init() with your custom function.
// If you have no idea what this is, leave it alone!
//#define IMGUI_IMPL_VULKAN_NO_PROTOTYPES
// Alternatively provide a custom header file with prototype definitions. This is useful to avoid symbol collisions if
// your loader defines vulkan function prototypes in the global scope with default names.
// This definition must be visible in imgui_impl_vulkan.cpp as described above.
//#define IMGUI_IMPL_VULKAN_CUSTOM_HEADER <my_prototype_definitions.h>

// Vulkan includes
#if defined(IMGUI_IMPL_VULKAN_CUSTOM_HEADER)
#include IMGUI_IMPL_VULKAN_CUSTOM_HEADER
#else
#if defined(IMGUI_IMPL_VULKAN_NO_PROTOTYPES) && !defined(VK_NO_PROTOTYPES)
#define VK_NO_PROTOTYPES
#endif
#include <vulkan/vulkan.h>
#endif

// Initialization data, for ImGui_ImplVulkan_Init()
// [Please zero-clear before use!]
Expand Down