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

Small change not to #include <vulkan/vulkan.h> if it was already included (possible from a different path) before including VMA. Issue #50 Thanks @baldurk !

Browse Source
This commit is contained in:
Adam Sawicki 2018-12-06 14:47:59 +01:00
parent 3b392258e2
commit e8b01485ce
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/VmaUsage.h
View File

@ -8,7 +8,8 @@
#include <Windows.h> #include <Windows.h>
#define VK_USE_PLATFORM_WIN32_KHR #define VK_USE_PLATFORM_WIN32_KHR
#include <vulkan/vulkan.h> // Uncomment to test including `vulkan.h` on your own before including VMA.
//#include <vulkan/vulkan.h>
/* /*
In every place where you want to use Vulkan Memory Allocator, define appropriate In every place where you want to use Vulkan Memory Allocator, define appropriate

4
src/vk_mem_alloc.h
View File

@ -1492,7 +1492,9 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
#define NOMINMAX // For windows.h #define NOMINMAX // For windows.h
#endif #endif
#include <vulkan/vulkan.h> #ifndef VULKAN_H_
#include <vulkan/vulkan.h>
#endif
#if VMA_RECORDING_ENABLED #if VMA_RECORDING_ENABLED
#include <windows.h> #include <windows.h>