eden-emu/VulkanMemoryAllocator
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed missing #include <Windows.h> for cases when it's needed but macro VK_USE_PLATFORM_WIN32_KHR is not defined. Issue #38 thanks @farnoy !

Browse source
This commit is contained in:
Adam Sawicki 2018-09-06 11:38:37 +02:00
parent abf747a79f
commit 447e36fe9a
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/VmaReplay/VmaUsage.h
View file

@ -3,8 +3,8 @@
#define NOMINMAX #define NOMINMAX
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
#define VK_USE_PLATFORM_WIN32_KHR
#define VK_USE_PLATFORM_WIN32_KHR
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
//#define VMA_USE_STL_CONTAINERS 1 //#define VMA_USE_STL_CONTAINERS 1

4
src/vk_mem_alloc.h
View file

@ -1359,6 +1359,10 @@ Features deliberately excluded from the scope of this library:
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#if VMA_RECORDING_ENABLED
#include <Windows.h>
#endif
#if !defined(VMA_DEDICATED_ALLOCATION) #if !defined(VMA_DEDICATED_ALLOCATION)
#if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation
#define VMA_DEDICATED_ALLOCATION 1 #define VMA_DEDICATED_ALLOCATION 1