diff options
author | Alexandre Bouvier <contact@amb.tf> | 2023-07-30 13:10:00 +0200 |
---|---|---|
committer | Alexandre Bouvier <contact@amb.tf> | 2023-07-31 13:01:21 +0200 |
commit | ed3f9bab11b7160f17c08af1c57cfb4598514941 (patch) | |
tree | 41ef27da0e8c21e3f059f2c2e5e843b6cf72f00c /src/video_core/vulkan_common/vulkan_wrapper.h | |
parent | Merge pull request #11155 from liamwhite/memory3 (diff) | |
download | yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.tar yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.tar.gz yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.tar.bz2 yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.tar.lz yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.tar.xz yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.tar.zst yuzu-ed3f9bab11b7160f17c08af1c57cfb4598514941.zip |
Diffstat (limited to '')
-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 |