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

Further fixes for compilation on Windows. Defined NOMINMAX for Windows.h. Issue #38

Browse Source
This commit is contained in:
Adam Sawicki 2018-09-07 12:40:31 +02:00
parent 447e36fe9a
commit 6689924517
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/vk_mem_alloc.h
View File

@ -1357,6 +1357,20 @@ Features deliberately excluded from the scope of this library:
*/ */
/*
Define this macro to 0/1 to disable/enable support for recording functionality,
available through VmaAllocatorCreateInfo::pRecordSettings.
*/
#ifndef VMA_RECORDING_ENABLED
#ifdef _WIN32
#define VMA_RECORDING_ENABLED 1
#else
#define VMA_RECORDING_ENABLED 0
#endif
#endif
#define NOMINMAX // For Windows.h
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#if VMA_RECORDING_ENABLED #if VMA_RECORDING_ENABLED
@ -1483,18 +1497,6 @@ typedef enum VmaRecordFlagBits {
} VmaRecordFlagBits; } VmaRecordFlagBits;
typedef VkFlags VmaRecordFlags; typedef VkFlags VmaRecordFlags;
/*
Define this macro to 0/1 to disable/enable support for recording functionality,
available through VmaAllocatorCreateInfo::pRecordSettings.
*/
#ifndef VMA_RECORDING_ENABLED
#ifdef _WIN32
#define VMA_RECORDING_ENABLED 1
#else
#define VMA_RECORDING_ENABLED 0
#endif
#endif
/// Parameters for recording calls to VMA functions. To be used in VmaAllocatorCreateInfo::pRecordSettings. /// Parameters for recording calls to VMA functions. To be used in VmaAllocatorCreateInfo::pRecordSettings.
typedef struct VmaRecordSettings typedef struct VmaRecordSettings
{ {