Move Vulkan includes to a central godot_vulkan.h header

Also fixes Vulkan build problem with recent Clang.

(cherry picked from commit 146ba4106f)
This commit is contained in:
Gergely Kis
2024-09-26 21:46:48 +02:00
committed by Rémi Verschelde
parent d71ff49cc9
commit 01b7292495
14 changed files with 66 additions and 71 deletions

View File

@ -1,17 +1,16 @@
diff --git a/thirdparty/vulkan/vk_enum_string_helper.h b/thirdparty/vulkan/vk_enum_string_helper.h
index 65b3322c07..e8c61aaf15 100644
index 062c3d9915..10df8e8115 100644
--- a/thirdparty/vulkan/vk_enum_string_helper.h
+++ b/thirdparty/vulkan/vk_enum_string_helper.h
@@ -37,7 +37,11 @@
@@ -28,8 +28,10 @@
#pragma warning( disable : 4065 )
#endif
+#ifdef __cplusplus
#include <string>
-#include <vulkan/vulkan.h>
+#ifdef USE_VOLK
+ #include <volk.h>
+#else
+ #include <vulkan/vulkan.h>
+#endif
+#include "drivers/vulkan/godot_vulkan.h"
static inline const char* string_VkResult(VkResult input_value)

View File

@ -1,17 +1,15 @@
diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
index 44affc5ca4..d96f2dacc0 100644
index 1add7278b0..1e03339ecf 100644
--- a/thirdparty/vulkan/vk_mem_alloc.h
+++ b/thirdparty/vulkan/vk_mem_alloc.h
@@ -127,7 +127,11 @@ extern "C" {
@@ -126,9 +126,7 @@ See documentation chapter: \ref statistics.
extern "C" {
#endif
#ifndef VULKAN_H_
-#ifndef VULKAN_H_
- #include <vulkan/vulkan.h>
+ #ifdef USE_VOLK
+ #include <volk.h>
+ #else
+ #include <vulkan/vulkan.h>
+ #endif
#endif
-#endif
+#include "drivers/vulkan/godot_vulkan.h"
// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,
// where AAA = major, BBB = minor, CCC = patch.

View File

@ -28,12 +28,10 @@
#pragma warning( disable : 4065 )
#endif
#ifdef __cplusplus
#include <string>
#ifdef USE_VOLK
#include <volk.h>
#else
#include <vulkan/vulkan.h>
#endif
#include "drivers/vulkan/godot_vulkan.h"
static inline const char* string_VkResult(VkResult input_value)

View File

@ -126,13 +126,7 @@ See documentation chapter: \ref statistics.
extern "C" {
#endif
#ifndef VULKAN_H_
#ifdef USE_VOLK
#include <volk.h>
#else
#include <vulkan/vulkan.h>
#endif
#endif
#include "drivers/vulkan/godot_vulkan.h"
// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,
// where AAA = major, BBB = minor, CCC = patch.