diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-31 15:28:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 15:28:35 -0400 |
| commit | 2a9eab5e1b2079f30879c84ef974fb9d627ed844 (patch) | |
| tree | afdc6b7addc6013e68f3ef5867b075233e67f7dd /src/video_core/vulkan_common/vulkan_wrapper.h | |
| parent | 083fb8a15fa7949d696072f286f8322fe7e80639 (diff) | |
| parent | ed3f9bab11b7160f17c08af1c57cfb4598514941 (diff) | |
Merge pull request #11188 from abouvier/vma-fix
vma: enable options everywhere
Diffstat (limited to 'src/video_core/vulkan_common/vulkan_wrapper.h')
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index 32bd75ad8..3089c3d41 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h @@ -12,13 +12,8 @@ #include <utility> #include <vector> -#define VK_NO_PROTOTYPES -#ifdef _WIN32 -#define VK_USE_PLATFORM_WIN32_KHR -#elif defined(__APPLE__) -#define VK_USE_PLATFORM_METAL_EXT -#endif -#include <vulkan/vulkan.h> +#include "common/common_types.h" +#include "video_core/vulkan_common/vulkan.h" // Sanitize macros #ifdef CreateEvent @@ -28,8 +23,6 @@ #undef CreateSemaphore #endif -#include "common/common_types.h" - #ifdef _MSC_VER #pragma warning(disable : 26812) // Disable prefer enum class over enum #endif |