AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-05 04:10:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #233 from laurelkeys/patch-1

Browse Source 
Include vulkan.h before #define VMA_VULKAN_VERSION
This commit is contained in:
Adam Sawicki 2022-02-07 19:15:53 +01:00 committed by GitHub
commit ed2a72153e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/vk_mem_alloc.h
View File

@ -126,6 +126,10 @@ for user-defined purpose without allocating any real GPU memory.
extern "C" {
#endif
#ifndef VULKAN_H_
#include <vulkan/vulkan.h>
#endif
// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,
// where AAA = major, BBB = minor, CCC = patch.
// If you want to use version > 1.0, it still needs to be enabled via VmaAllocatorCreateInfo::vulkanApiVersion.
@ -170,10 +174,6 @@ extern "C" {
#endif // #if VMA_VULKAN_VERSION >= 1001000
#endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES
#ifndef VULKAN_H_
#include <vulkan/vulkan.h>
#endif
#if !defined(VK_VERSION_1_2)
// This one is tricky. Vulkan specification defines this code as available since
// Vulkan 1.0, but doesn't actually define it in Vulkan SDK earlier than 1.2.131.