godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move Vulkan includes to a central godot_vulkan.h header

Browse Source 
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 369b981a75
commit be302e7957
12 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/ios/display_server_ios.h
View File

@@ -40,11 +40,7 @@
#include "drivers/vulkan/rendering_device_vulkan.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
#ifdef USE_VOLK
#include <volk.h>
#else
#include <vulkan/vulkan.h>
#endif
#include "drivers/vulkan/godot_vulkan.h"
#endif // VULKAN_ENABLED
#if defined(GLES3_ENABLED)

6
platform/ios/os_ios.mm
View File

@@ -54,11 +54,7 @@
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
#import <QuartzCore/CAMetalLayer.h>
#ifdef USE_VOLK
#include <volk.h>
#else
#include <vulkan/vulkan.h>
#endif
#include "drivers/vulkan/godot_vulkan.h"
#endif
// Initialization order between compilation units is not guaranteed,