summaryrefslogtreecommitdiff
path: root/thirdparty/vulkan
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-10 11:40:19 +0200
committerGitHub <noreply@github.com>2020-04-10 11:40:19 +0200
commitea2dfb8cc7244ae8dad7df0e6e9b203d3349f386 (patch)
tree6b089ef633982a7ec32f48872569a2e035f72dd1 /thirdparty/vulkan
parent4c36feb18045461bd53bfd2f67f74af7631d6339 (diff)
parent802bbe87adc52daa92ddd963e498c6c5ab845bfc (diff)
Merge pull request #37745 from nekomatata/vulkan-warnings-android
Fix extra warnings in Android build
Diffstat (limited to 'thirdparty/vulkan')
-rw-r--r--thirdparty/vulkan/android/vk_mem_alloc.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/thirdparty/vulkan/android/vk_mem_alloc.cpp b/thirdparty/vulkan/android/vk_mem_alloc.cpp
new file mode 100644
index 0000000000..a28454cf6e
--- /dev/null
+++ b/thirdparty/vulkan/android/vk_mem_alloc.cpp
@@ -0,0 +1,8 @@
+#define VMA_IMPLEMENTATION
+#ifdef DEBUG_ENABLED
+#ifndef _DEBUG
+#define _DEBUG
+#endif
+#endif
+// Include memory allocator from Android NDK
+#include <vk_mem_alloc.h>