summaryrefslogtreecommitdiffstats
path: root/platform/ios
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-10-01 17:31:03 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-10-01 17:31:03 +0200
commitd66d0567279f1d48cc2489dacbd77a0302514f8d (patch)
tree923b75876753d849e91f8c85e85ca31ce95cd4a9 /platform/ios
parent06a7cf727090482f087575594736323da9ecd2f4 (diff)
parent146ba4106f459fd37d130a34da02ef737ac166e4 (diff)
downloadredot-engine-d66d0567279f1d48cc2489dacbd77a0302514f8d.tar.gz
Merge pull request #97510 from kisg/vulkan_build_fix
Move Vulkan includes to a central `godot_vulkan.h` header
Diffstat (limited to 'platform/ios')
-rw-r--r--platform/ios/display_server_ios.h6
-rw-r--r--platform/ios/os_ios.mm6
2 files changed, 2 insertions, 10 deletions
diff --git a/platform/ios/display_server_ios.h b/platform/ios/display_server_ios.h
index bbb758074d..0631b50f0a 100644
--- a/platform/ios/display_server_ios.h
+++ b/platform/ios/display_server_ios.h
@@ -41,11 +41,7 @@
#if defined(VULKAN_ENABLED)
#import "rendering_context_driver_vulkan_ios.h"
-#ifdef USE_VOLK
-#include <volk.h>
-#else
-#include <vulkan/vulkan.h>
-#endif
+#include "drivers/vulkan/godot_vulkan.h"
#endif // VULKAN_ENABLED
#if defined(METAL_ENABLED)
diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm
index 35b87ea647..590238be77 100644
--- a/platform/ios/os_ios.mm
+++ b/platform/ios/os_ios.mm
@@ -56,11 +56,7 @@
#import <QuartzCore/CAMetalLayer.h>
#if defined(VULKAN_ENABLED)
-#ifdef USE_VOLK
-#include <volk.h>
-#else
-#include <vulkan/vulkan.h>
-#endif
+#include "drivers/vulkan/godot_vulkan.h"
#endif // VULKAN_ENABLED
#endif