mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-30 02:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Refers to #56
This commit is contained in:
Adam Sawicki 2020-04-07 20:51:18 +02:00
parent d8bdd78e26
commit b713c3435b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vk_mem_alloc.h
View File

@ -7595,9 +7595,17 @@ private:
#endif #endif
void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions); void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions);
#if VMA_STATIC_VULKAN_FUNCTIONS == 1
void ImportVulkanFunctions_Static(); void ImportVulkanFunctions_Static();
#endif
void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions); void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions);
#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1
void ImportVulkanFunctions_Dynamic(); void ImportVulkanFunctions_Dynamic();
#endif
void ValidateVulkanFunctions(); void ValidateVulkanFunctions();
VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex); VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);
@ -15453,6 +15461,8 @@ void VmaAllocator_T::ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVul
#undef VMA_COPY_IF_NOT_NULL #undef VMA_COPY_IF_NOT_NULL
} }
#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1
void VmaAllocator_T::ImportVulkanFunctions_Dynamic() void VmaAllocator_T::ImportVulkanFunctions_Dynamic()
{ {
#define VMA_FETCH_INSTANCE_FUNC(memberName, functionPointerType, functionNameString) \ #define VMA_FETCH_INSTANCE_FUNC(memberName, functionPointerType, functionNameString) \
@ -15509,6 +15519,8 @@ void VmaAllocator_T::ImportVulkanFunctions_Dynamic()
#undef VMA_FETCH_INSTANCE_FUNC #undef VMA_FETCH_INSTANCE_FUNC
} }
#endif // #if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1
void VmaAllocator_T::ValidateVulkanFunctions() void VmaAllocator_T::ValidateVulkanFunctions()
{ {
VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL); VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);