From 0d7bd115da0445864cdb20c66a3e173c047e2151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 11 Mar 2026 17:42:35 +0100 Subject: [PATCH] Remove unused includes in `drivers` with clangd-tidy --- drivers/alsa/audio_driver_alsa.cpp | 7 ++++++- drivers/alsa/audio_driver_alsa.h | 7 ++----- drivers/alsamidi/midi_driver_alsamidi.cpp | 6 ++++++ drivers/alsamidi/midi_driver_alsamidi.h | 6 +----- drivers/apple/os_log_logger.cpp | 2 +- .../apple_embedded/bridging_header_apple_embedded.h | 2 ++ .../apple_embedded/display_server_apple_embedded.h | 2 +- drivers/apple_embedded/os_apple_embedded.mm | 2 +- drivers/d3d12/d3d12_godot_nir_bridge.h | 6 +++++- drivers/gles3/storage/config.h | 2 +- drivers/pulseaudio/audio_driver_pulseaudio.h | 2 +- drivers/sdl/joypad_sdl.cpp | 1 - drivers/sdl/joypad_sdl.h | 1 - drivers/unix/dir_access_unix.cpp | 1 - drivers/unix/file_access_unix.cpp | 1 - drivers/unix/file_access_unix.h | 5 ++--- drivers/unix/file_access_unix_pipe.h | 7 ++----- drivers/unix/os_unix.cpp | 8 +++++--- drivers/unix/os_unix.h | 1 - drivers/unix/syslog_logger.cpp | 2 -- drivers/vulkan/godot_vulkan.h | 2 ++ drivers/vulkan/rendering_context_driver_vulkan.cpp | 12 +++++++----- drivers/vulkan/rendering_context_driver_vulkan.h | 4 ++-- drivers/vulkan/rendering_device_driver_vulkan.cpp | 3 +-- drivers/vulkan/rendering_device_driver_vulkan.h | 2 +- drivers/vulkan/vulkan_hooks.h | 3 ++- drivers/wasapi/audio_driver_wasapi.cpp | 1 - drivers/windows/dir_access_windows.cpp | 1 - drivers/windows/file_access_windows.cpp | 1 - drivers/windows/file_access_windows.h | 1 - drivers/windows/file_access_windows_pipe.cpp | 2 ++ drivers/windows/file_access_windows_pipe.h | 1 - drivers/windows/ip_windows.cpp | 3 --- drivers/winmidi/midi_driver_winmidi.h | 1 - .../rendering_context_driver_vulkan_android.cpp | 2 +- .../rendering_context_driver_vulkan_wayland.cpp | 2 +- .../x11/rendering_context_driver_vulkan_x11.cpp | 2 +- .../rendering_context_driver_vulkan_windows.cpp | 2 +- .../0001-VKEnumStringHelper-godot-vulkan.patch | 2 +- .../vulkan/patches/0002-VMA-godot-vulkan.patch | 2 +- thirdparty/vulkan/vk_enum_string_helper.h | 2 +- thirdparty/vulkan/vk_mem_alloc.h | 2 +- 42 files changed, 61 insertions(+), 63 deletions(-) diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp index 14b87d33f2..14313200d1 100644 --- a/drivers/alsa/audio_driver_alsa.cpp +++ b/drivers/alsa/audio_driver_alsa.cpp @@ -33,10 +33,15 @@ #ifdef ALSA_ENABLED #include "core/config/engine.h" -#include "core/config/project_settings.h" #include "core/math/math_funcs_binary.h" #include "core/os/os.h" +#ifdef SOWRAP_ENABLED +#include "asound-so_wrap.h" +#else +#include +#endif + #include #if defined(PULSEAUDIO_ENABLED) && defined(SOWRAP_ENABLED) diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h index 7f59f7454f..d9c8ad211b 100644 --- a/drivers/alsa/audio_driver_alsa.h +++ b/drivers/alsa/audio_driver_alsa.h @@ -37,11 +37,8 @@ #include "core/templates/safe_refcount.h" #include "servers/audio/audio_server.h" -#ifdef SOWRAP_ENABLED -#include "asound-so_wrap.h" -#else -#include -#endif +typedef struct _snd_pcm snd_pcm_t; +typedef unsigned long snd_pcm_uframes_t; class AudioDriverALSA : public AudioDriver { Thread thread; diff --git a/drivers/alsamidi/midi_driver_alsamidi.cpp b/drivers/alsamidi/midi_driver_alsamidi.cpp index 8c61a1338e..66b663d860 100644 --- a/drivers/alsamidi/midi_driver_alsamidi.cpp +++ b/drivers/alsamidi/midi_driver_alsamidi.cpp @@ -34,6 +34,12 @@ #include "core/os/os.h" +#ifdef SOWRAP_ENABLED +#include "drivers/alsa/asound-so_wrap.h" +#else +#include +#endif + #include MIDIDriverALSAMidi::InputConnection::InputConnection(int p_device_index, diff --git a/drivers/alsamidi/midi_driver_alsamidi.h b/drivers/alsamidi/midi_driver_alsamidi.h index 7904c558f0..7ae8513bb2 100644 --- a/drivers/alsamidi/midi_driver_alsamidi.h +++ b/drivers/alsamidi/midi_driver_alsamidi.h @@ -38,11 +38,7 @@ #include "core/templates/safe_refcount.h" #include "core/templates/vector.h" -#ifdef SOWRAP_ENABLED -#include "../alsa/asound-so_wrap.h" -#else -#include -#endif +typedef struct _snd_rawmidi snd_rawmidi_t; class MIDIDriverALSAMidi : public MIDIDriver { Thread thread; diff --git a/drivers/apple/os_log_logger.cpp b/drivers/apple/os_log_logger.cpp index f03e97107c..9417f77847 100644 --- a/drivers/apple/os_log_logger.cpp +++ b/drivers/apple/os_log_logger.cpp @@ -31,10 +31,10 @@ #include "os_log_logger.h" #include "core/object/script_backtrace.h" +#include "core/os/memory.h" #include "core/string/print_string.h" #include // For vsnprintf. -#include // For malloc/free. OsLogLogger::OsLogLogger(const char *p_subsystem) { const char *subsystem = p_subsystem; diff --git a/drivers/apple_embedded/bridging_header_apple_embedded.h b/drivers/apple_embedded/bridging_header_apple_embedded.h index ea608ecae2..fa29f5bbb1 100644 --- a/drivers/apple_embedded/bridging_header_apple_embedded.h +++ b/drivers/apple_embedded/bridging_header_apple_embedded.h @@ -30,7 +30,9 @@ #pragma once +// IWYU pragma: begin_exports. #import "app_delegate_service.h" #import "godot_app_delegate.h" #import "godot_view_apple_embedded.h" #import "godot_view_controller.h" +// IWYU pragma: end_exports. diff --git a/drivers/apple_embedded/display_server_apple_embedded.h b/drivers/apple_embedded/display_server_apple_embedded.h index 463755acd4..b54056ac52 100644 --- a/drivers/apple_embedded/display_server_apple_embedded.h +++ b/drivers/apple_embedded/display_server_apple_embedded.h @@ -39,7 +39,7 @@ #if defined(VULKAN_ENABLED) #import "rendering_context_driver_vulkan_apple_embedded.h" -#include "drivers/vulkan/godot_vulkan.h" +#include #endif // VULKAN_ENABLED #if defined(METAL_ENABLED) diff --git a/drivers/apple_embedded/os_apple_embedded.mm b/drivers/apple_embedded/os_apple_embedded.mm index d7178ecd78..900d095274 100644 --- a/drivers/apple_embedded/os_apple_embedded.mm +++ b/drivers/apple_embedded/os_apple_embedded.mm @@ -63,7 +63,7 @@ #import #if defined(VULKAN_ENABLED) -#include "drivers/vulkan/godot_vulkan.h" +#include #endif // VULKAN_ENABLED #endif diff --git a/drivers/d3d12/d3d12_godot_nir_bridge.h b/drivers/d3d12/d3d12_godot_nir_bridge.h index 59992bee03..a236c8ba9c 100644 --- a/drivers/d3d12/d3d12_godot_nir_bridge.h +++ b/drivers/d3d12/d3d12_godot_nir_bridge.h @@ -30,9 +30,13 @@ #pragma once +#ifndef __cplusplus +#include +#include +#else +#include #include -#ifdef __cplusplus extern "C" { #endif diff --git a/drivers/gles3/storage/config.h b/drivers/gles3/storage/config.h index e6bc906a74..d2bcc59276 100644 --- a/drivers/gles3/storage/config.h +++ b/drivers/gles3/storage/config.h @@ -36,7 +36,7 @@ // FIXME: platform_gl.h includes windows.h via egl.h, which defines ConnectFlags. // This breaks include project_settings.h in config.cpp, so we include object.h first. -#include "core/object/object.h" +#include "core/object/object.h" // IWYU pragma: keep. #include "platform_gl.h" diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h index 3186ebf12b..05246af04e 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.h +++ b/drivers/pulseaudio/audio_driver_pulseaudio.h @@ -38,7 +38,7 @@ #include "servers/audio/audio_server.h" #ifdef SOWRAP_ENABLED -#include "pulse-so_wrap.h" +#include "pulse-so_wrap.h" // IWYU pragma: keep. Relies on pulseaudio.h transitive includes. #else #include #endif diff --git a/drivers/sdl/joypad_sdl.cpp b/drivers/sdl/joypad_sdl.cpp index 4e4ba7475f..09e6755b8f 100644 --- a/drivers/sdl/joypad_sdl.cpp +++ b/drivers/sdl/joypad_sdl.cpp @@ -33,7 +33,6 @@ #ifdef SDL_ENABLED #include "core/input/default_controller_mappings.h" -#include "core/os/time.h" #include "core/variant/dictionary.h" #include diff --git a/drivers/sdl/joypad_sdl.h b/drivers/sdl/joypad_sdl.h index 718cd957f7..e3c7c03e92 100644 --- a/drivers/sdl/joypad_sdl.h +++ b/drivers/sdl/joypad_sdl.h @@ -31,7 +31,6 @@ #pragma once #include "core/input/input.h" -#include "core/os/thread.h" typedef uint32_t SDL_JoystickID; typedef struct SDL_Joystick SDL_Joystick; diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index 399157c1a0..a20293fe07 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -32,7 +32,6 @@ #if defined(UNIX_ENABLED) -#include "core/os/memory.h" #include "core/os/os.h" #include "core/string/print_string.h" #include "core/templates/list.h" diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 1e5081af9b..cc0facecec 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -44,7 +44,6 @@ #include #if defined(TOOLS_ENABLED) -#include #include #endif diff --git a/drivers/unix/file_access_unix.h b/drivers/unix/file_access_unix.h index 3e200a71cd..691d36a6d7 100644 --- a/drivers/unix/file_access_unix.h +++ b/drivers/unix/file_access_unix.h @@ -30,13 +30,12 @@ #pragma once +#if defined(UNIX_ENABLED) + #include "core/io/file_access.h" -#include "core/os/memory.h" #include -#if defined(UNIX_ENABLED) - class FileAccessUnix : public FileAccess { GDSOFTCLASS(FileAccessUnix, FileAccess); FILE *f = nullptr; diff --git a/drivers/unix/file_access_unix_pipe.h b/drivers/unix/file_access_unix_pipe.h index 7196025307..c55cb7ee09 100644 --- a/drivers/unix/file_access_unix_pipe.h +++ b/drivers/unix/file_access_unix_pipe.h @@ -30,13 +30,10 @@ #pragma once -#include "core/io/file_access.h" -#include "core/os/memory.h" - -#include - #if defined(UNIX_ENABLED) +#include "core/io/file_access.h" + class FileAccessUnixPipe : public FileAccess { GDSOFTCLASS(FileAccessUnixPipe, FileAccess); bool unlink_on_close = false; diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 8079490f6f..65ad827d6a 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -32,15 +32,18 @@ #ifdef UNIX_ENABLED -#include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "drivers/unix/file_access_unix_pipe.h" -#include "drivers/unix/net_socket_unix.h" #include "drivers/unix/thread_posix.h" +#ifndef UNIX_SOCKET_UNAVAILABLE +#include "drivers/unix/ip_unix.h" +#include "drivers/unix/net_socket_unix.h" +#endif + #if defined(__APPLE__) #include #include @@ -77,7 +80,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 456689584a..d8b7be88a8 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -33,7 +33,6 @@ #ifdef UNIX_ENABLED #include "core/os/os.h" -#include "drivers/unix/ip_unix.h" #if defined(__GLIBC__) || defined(WEB_ENABLED) #include diff --git a/drivers/unix/syslog_logger.cpp b/drivers/unix/syslog_logger.cpp index 2efe4d8f20..f6e6139e80 100644 --- a/drivers/unix/syslog_logger.cpp +++ b/drivers/unix/syslog_logger.cpp @@ -32,8 +32,6 @@ #include "syslog_logger.h" -#include "core/string/print_string.h" - #include void SyslogLogger::logv(const char *p_format, va_list p_list, bool p_err) { diff --git a/drivers/vulkan/godot_vulkan.h b/drivers/vulkan/godot_vulkan.h index b665cddd6f..b3f057a21e 100644 --- a/drivers/vulkan/godot_vulkan.h +++ b/drivers/vulkan/godot_vulkan.h @@ -30,6 +30,7 @@ #pragma once +// IWYU pragma: begin_exports. #ifdef USE_VOLK #include #else @@ -37,3 +38,4 @@ #define VK_NO_STDINT_H #include #endif +// IWYU pragma: end_exports. diff --git a/drivers/vulkan/rendering_context_driver_vulkan.cpp b/drivers/vulkan/rendering_context_driver_vulkan.cpp index f12796486d..28b45ee0d7 100644 --- a/drivers/vulkan/rendering_context_driver_vulkan.cpp +++ b/drivers/vulkan/rendering_context_driver_vulkan.cpp @@ -32,15 +32,17 @@ #include "rendering_context_driver_vulkan.h" -#include "vk_enum_string_helper.h" - #include "core/config/engine.h" #include "core/config/project_settings.h" -#include "core/os/os.h" #include "core/version.h" +#include "drivers/vulkan/rendering_device_driver_vulkan.h" +#include "drivers/vulkan/vulkan_hooks.h" -#include "rendering_device_driver_vulkan.h" -#include "vulkan_hooks.h" +#ifndef DEV_ENABLED +#include "core/os/os.h" +#endif + +#include #if defined(VK_TRACK_DRIVER_MEMORY) /*************************************************/ diff --git a/drivers/vulkan/rendering_context_driver_vulkan.h b/drivers/vulkan/rendering_context_driver_vulkan.h index a3c74b3bec..0a3c8779a4 100644 --- a/drivers/vulkan/rendering_context_driver_vulkan.h +++ b/drivers/vulkan/rendering_context_driver_vulkan.h @@ -36,12 +36,12 @@ #include "core/templates/local_vector.h" #include "servers/rendering/rendering_context_driver.h" -#if defined(DEBUG_ENABLED) || defined(DEV_ENABLED) +#if defined(DEBUG_ENABLED) #define VK_TRACK_DRIVER_MEMORY #define VK_TRACK_DEVICE_MEMORY #endif -#include "drivers/vulkan/godot_vulkan.h" +#include class RenderingContextDriverVulkan : public RenderingContextDriver { public: diff --git a/drivers/vulkan/rendering_device_driver_vulkan.cpp b/drivers/vulkan/rendering_device_driver_vulkan.cpp index 6d92216bc6..3210e22161 100644 --- a/drivers/vulkan/rendering_device_driver_vulkan.cpp +++ b/drivers/vulkan/rendering_device_driver_vulkan.cpp @@ -32,10 +32,9 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" -#include "core/io/marshalls.h" #include "core/os/os.h" #include "core/templates/fixed_vector.h" -#include "vulkan_hooks.h" +#include "drivers/vulkan/vulkan_hooks.h" #include "thirdparty/misc/smolv.h" diff --git a/drivers/vulkan/rendering_device_driver_vulkan.h b/drivers/vulkan/rendering_device_driver_vulkan.h index 3b07d68180..1728a4cb40 100644 --- a/drivers/vulkan/rendering_device_driver_vulkan.h +++ b/drivers/vulkan/rendering_device_driver_vulkan.h @@ -45,7 +45,7 @@ #include "thirdparty/re-spirv/re-spirv.h" #include "thirdparty/vulkan/vk_mem_alloc.h" -#include "drivers/vulkan/godot_vulkan.h" +#include class FileAccess; diff --git a/drivers/vulkan/vulkan_hooks.h b/drivers/vulkan/vulkan_hooks.h index c4f6b953ed..dfd6690a0b 100644 --- a/drivers/vulkan/vulkan_hooks.h +++ b/drivers/vulkan/vulkan_hooks.h @@ -32,7 +32,8 @@ #include "core/math/vector2i.h" #include "core/templates/local_vector.h" -#include "drivers/vulkan/godot_vulkan.h" + +#include class VulkanHooks { private: diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index a93b753eb5..ab3b74eaad 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -33,7 +33,6 @@ #include "audio_driver_wasapi.h" #include "core/config/engine.h" -#include "core/config/project_settings.h" #include "core/os/os.h" #include diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index a74bbd8d71..7412547884 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -33,7 +33,6 @@ #include "dir_access_windows.h" #include "file_access_windows.h" -#include "core/config/project_settings.h" #include "core/os/memory.h" #include "core/os/os.h" #include "core/string/print_string.h" diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index eed5ac7a54..06b3aea944 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -38,7 +38,6 @@ #include // _SH_DENYNO #include -#include #include #include diff --git a/drivers/windows/file_access_windows.h b/drivers/windows/file_access_windows.h index 7142c7652a..437728b527 100644 --- a/drivers/windows/file_access_windows.h +++ b/drivers/windows/file_access_windows.h @@ -33,7 +33,6 @@ #ifdef WINDOWS_ENABLED #include "core/io/file_access.h" -#include "core/os/memory.h" #include diff --git a/drivers/windows/file_access_windows_pipe.cpp b/drivers/windows/file_access_windows_pipe.cpp index d956596804..049b8e7a23 100644 --- a/drivers/windows/file_access_windows_pipe.cpp +++ b/drivers/windows/file_access_windows_pipe.cpp @@ -34,6 +34,8 @@ #include "core/string/ustring.h" +#include + Error FileAccessWindowsPipe::open_existing(HANDLE p_rfd, HANDLE p_wfd, bool p_blocking) { // Open pipe using handles created by CreatePipe(rfd, wfd, NULL, 4096) call in the OS.execute_with_pipe. _close(); diff --git a/drivers/windows/file_access_windows_pipe.h b/drivers/windows/file_access_windows_pipe.h index 42b740c555..bd8187f721 100644 --- a/drivers/windows/file_access_windows_pipe.h +++ b/drivers/windows/file_access_windows_pipe.h @@ -33,7 +33,6 @@ #ifdef WINDOWS_ENABLED #include "core/io/file_access.h" -#include "core/os/memory.h" #include diff --git a/drivers/windows/ip_windows.cpp b/drivers/windows/ip_windows.cpp index 4626adb9fc..5ab9d3f89d 100644 --- a/drivers/windows/ip_windows.cpp +++ b/drivers/windows/ip_windows.cpp @@ -32,14 +32,11 @@ #include "ip_windows.h" -#include #include #include #include -#include - static IPAddress _sockaddr2ip(struct sockaddr *p_addr) { IPAddress ip; diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h index 94724480b9..3e82d42919 100644 --- a/drivers/winmidi/midi_driver_winmidi.h +++ b/drivers/winmidi/midi_driver_winmidi.h @@ -36,7 +36,6 @@ #include "core/templates/vector.h" #include -#include #include diff --git a/platform/android/rendering_context_driver_vulkan_android.cpp b/platform/android/rendering_context_driver_vulkan_android.cpp index 51fb1ca18f..9b6000d8d5 100644 --- a/platform/android/rendering_context_driver_vulkan_android.cpp +++ b/platform/android/rendering_context_driver_vulkan_android.cpp @@ -32,7 +32,7 @@ #ifdef VULKAN_ENABLED -#include "drivers/vulkan/godot_vulkan.h" +#include const char *RenderingContextDriverVulkanAndroid::_get_platform_surface_extension() const { return VK_KHR_ANDROID_SURFACE_EXTENSION_NAME; diff --git a/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp b/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp index 8abcc464ba..002ee69963 100644 --- a/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp +++ b/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp @@ -32,7 +32,7 @@ #include "rendering_context_driver_vulkan_wayland.h" -#include "drivers/vulkan/godot_vulkan.h" +#include const char *RenderingContextDriverVulkanWayland::_get_platform_surface_extension() const { return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME; diff --git a/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp b/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp index cbcf07852b..4be4f0e5c7 100644 --- a/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp +++ b/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp @@ -32,7 +32,7 @@ #include "rendering_context_driver_vulkan_x11.h" -#include "drivers/vulkan/godot_vulkan.h" +#include const char *RenderingContextDriverVulkanX11::_get_platform_surface_extension() const { return VK_KHR_XLIB_SURFACE_EXTENSION_NAME; diff --git a/platform/windows/rendering_context_driver_vulkan_windows.cpp b/platform/windows/rendering_context_driver_vulkan_windows.cpp index 8ca677fe64..a70d0ddf29 100644 --- a/platform/windows/rendering_context_driver_vulkan_windows.cpp +++ b/platform/windows/rendering_context_driver_vulkan_windows.cpp @@ -34,7 +34,7 @@ #include "rendering_context_driver_vulkan_windows.h" -#include "drivers/vulkan/godot_vulkan.h" +#include const char *RenderingContextDriverVulkanWindows::_get_platform_surface_extension() const { return VK_KHR_WIN32_SURFACE_EXTENSION_NAME; diff --git a/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch b/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch index 6b56d60181..cc9110c705 100644 --- a/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch +++ b/thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch @@ -7,7 +7,7 @@ index 8026787ad4..7a54b12a38 100644 #include #endif -#include -+#include "drivers/vulkan/godot_vulkan.h" ++#include static inline const char* string_VkResult(VkResult input_value) { switch (input_value) { case VK_SUCCESS: diff --git a/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch b/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch index 393bd0c8b3..5aa8e7e3d9 100644 --- a/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch +++ b/thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch @@ -6,7 +6,7 @@ index 8df03649b5..42ba704beb 100644 See documentation chapter: \ref statistics. */ -+#include "drivers/vulkan/godot_vulkan.h" ++#include #ifdef __cplusplus extern "C" { diff --git a/thirdparty/vulkan/vk_enum_string_helper.h b/thirdparty/vulkan/vk_enum_string_helper.h index 293cbbb588..224647e70c 100644 --- a/thirdparty/vulkan/vk_enum_string_helper.h +++ b/thirdparty/vulkan/vk_enum_string_helper.h @@ -13,7 +13,7 @@ #ifdef __cplusplus #include #endif -#include "drivers/vulkan/godot_vulkan.h" +#include static inline const char* string_VkResult(VkResult input_value) { switch (input_value) { case VK_SUCCESS: diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h index ef158a8e57..c5b78fa384 100644 --- a/thirdparty/vulkan/vk_mem_alloc.h +++ b/thirdparty/vulkan/vk_mem_alloc.h @@ -123,7 +123,7 @@ for user-defined purpose without allocating any real GPU memory. See documentation chapter: \ref statistics. */ -#include "drivers/vulkan/godot_vulkan.h" +#include #ifdef __cplusplus extern "C" {