summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-01-17 00:24:23 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2021-02-13 06:16:21 +0100
commitdde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8 (patch)
treedf41b4e8f2d2974695a9eada0d52f48708c7340c
parentgpu: Report renderer errors with exceptions (diff)
downloadyuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.tar
yuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.tar.gz
yuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.tar.bz2
yuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.tar.lz
yuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.tar.xz
yuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.tar.zst
yuzu-dde19e7d7556ac1af0dd7d0ad89746c1d6c08aa8.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/vulkan_common/vulkan_wrapper.h11
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp3
2 files changed, 14 insertions, 0 deletions
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h
index 4d8f14357..0c0e7230d 100644
--- a/src/video_core/vulkan_common/vulkan_wrapper.h
+++ b/src/video_core/vulkan_common/vulkan_wrapper.h
@@ -15,8 +15,19 @@
#include <vector>
#define VK_NO_PROTOTYPES
+#ifdef _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#endif
#include <vulkan/vulkan.h>
+// Sanitize macros
+#ifdef CreateEvent
+#undef CreateEvent
+#endif
+#ifdef CreateSemaphore
+#undef CreateSemaphore
+#endif
+
#include "common/common_types.h"
#ifdef _MSC_VER
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index b36d6a7c8..9ff32aec4 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -2,6 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+// Include this early to include Vulkan headers how we want to
+#include "video_core/vulkan_common/vulkan_wrapper.h"
+
#include <QColorDialog>
#include <QComboBox>
#include <QVulkanInstance>