commit b713c3435bca739c08d41bb825bb677ffeb6a3f5
author Adam Sawicki <Adam.Sawicki@amd.com> Tue Apr 07 20:51:18 2020 +0200
committer Adam Sawicki <Adam.Sawicki@amd.com> Tue Apr 07 20:51:18 2020 +0200
tree 206f45c7f818e47f75a50bce4fe223f71a615957
parent d8bdd78e267f3d77891165afb5e9604021013794

Add #if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1 around VmaAllocator_T::ImportVulkanFunctions_Dynamic

Refers to #56

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 8523b6f..291a943 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -7595,9 +7595,17 @@
 #endif

 

     void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions);

+

+#if VMA_STATIC_VULKAN_FUNCTIONS == 1

     void ImportVulkanFunctions_Static();

+#endif

+

     void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions);

+

+#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1

     void ImportVulkanFunctions_Dynamic();

+#endif

+

     void ValidateVulkanFunctions();

 

     VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);

@@ -15453,6 +15461,8 @@
 #undef VMA_COPY_IF_NOT_NULL

 }

 

+#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1

+

 void VmaAllocator_T::ImportVulkanFunctions_Dynamic()

 {

 #define VMA_FETCH_INSTANCE_FUNC(memberName, functionPointerType, functionNameString) \

@@ -15509,6 +15519,8 @@
 #undef VMA_FETCH_INSTANCE_FUNC

 }

 

+#endif // #if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1

+

 void VmaAllocator_T::ValidateVulkanFunctions()

 {

     VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);