commit d619fb14a8b42b989410f7bf5d362491fbdb622f
author Adam Sawicki <adam.sawicki@amd.com> Mon Sep 20 20:33:49 2021 +0200
committer Adam Sawicki <adam.sawicki@amd.com> Mon Sep 20 20:33:49 2021 +0200
tree 1a41c8b9ded9128db6ab49cc1f3bc8f95a113c50
parent a9922340be1beccc9331398bb004d305d51e5c41
parent 565f18b2982bd852213d0c225083b101e80ddfed

Merge branch 'master' of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator

src/VmaReplay/VmaUsage.h

diff --git a/src/VmaReplay/VmaUsage.h b/src/VmaReplay/VmaUsage.h
index 22ba27e..a2d2e97 100644
--- a/src/VmaReplay/VmaUsage.h
+++ b/src/VmaReplay/VmaUsage.h
@@ -26,7 +26,9 @@
 #define WIN32_LEAN_AND_MEAN

 #include <Windows.h>

 

-#define VK_USE_PLATFORM_WIN32_KHR

+#if !defined(VK_USE_PLATFORM_WIN32_KHR)

+    #define VK_USE_PLATFORM_WIN32_KHR

+#endif // #if !defined(VK_USE_PLATFORM_WIN32_KHR)

 #include <vulkan/vulkan.h>

 

 //#define VMA_USE_STL_CONTAINERS 1

src/VmaUsage.h

diff --git a/src/VmaUsage.h b/src/VmaUsage.h
index 52c0513..10714e7 100644
--- a/src/VmaUsage.h
+++ b/src/VmaUsage.h
@@ -28,7 +28,9 @@
 #define NOMINMAX

 #define WIN32_LEAN_AND_MEAN

 #include <Windows.h>

-#define VK_USE_PLATFORM_WIN32_KHR

+#if !defined(VK_USE_PLATFORM_WIN32_KHR)

+    #define VK_USE_PLATFORM_WIN32_KHR

+#endif // #if !defined(VK_USE_PLATFORM_WIN32_KHR)

 

 #else  // #ifdef _WIN32