Merge pull request #117480 from akien-mga/clangd-misc-fixes

Misc includes or modernize fixes found via clangd-tidy

Author: akien-mga

.clangd

@@ -1,12 +1,21 @@
 # https://clangd.llvm.org/config
+
 ---
+
 # Default conditions, apply everywhere.
 
+CompileFlags:
+  Add:
+    # Some thirdparty includes seem to require a high -ferror-limit to pass checks.
+    - -ferror-limit=100
+
 Diagnostics:
   Includes:
     IgnoreHeader:
       - \.compat\.inc
+
 ---
+
 # Header-specific conditions.
 
 If:
@@ -20,11 +29,19 @@ CompileFlags:
     - -Wno-unused-const-variable
     - -Wno-unused-function
     - -Wno-unused-variable
+
 ---
-# Suppress all third-party warnings.
+
+# Suppress warnings for third-party or partial code.
 
 If:
-  PathMatch: thirdparty/.*
+  PathMatch:
+    - bin/build_deps/.*
+    - misc/dist/apple_embedded_xcode/.*
+    - tests/compatibility_test/.*
+    - thirdparty/.*
+    - .*/thirdparty/.*
+    - .*-so_wrap.[ch]
 
 Diagnostics:
   Suppress: "*"

core/extension/gdextension_interface.cpp

@@ -77,7 +77,7 @@ class CallableCustomExtension : public CallableCustom {
 		const CallableCustomExtension *b = static_cast<const CallableCustomExtension *>(p_b);
 
 		if (a->call_func != b->call_func) {
-			return a->call_func < b->call_func;
+			return (uintptr_t)a->call_func < (uintptr_t)b->call_func;
 		}
 		return a->userdata < b->userdata;
 	}

core/variant/callable.cpp

@@ -306,7 +306,7 @@ bool Callable::operator<(const Callable &p_callable) const {
 			if (less_a == less_b) {
 				return less_a(custom, p_callable.custom);
 			} else {
-				return less_a < less_b; //it's something..
+				return (uintptr_t)less_a < (uintptr_t)less_b; //it's something..
 			}
 
 		} else {

drivers/alsa/audio_driver_alsa.cpp

@@ -96,7 +96,7 @@ Error AudioDriverALSA::init_output_device() {
 
 	ERR_FAIL_COND_V(status < 0, ERR_CANT_OPEN);
 
-	snd_pcm_hw_params_alloca(&hwparams);
+	snd_pcm_hw_params_alloca(&hwparams); // NOLINT(modernize-use-bool-literals)
 
 	status = snd_pcm_hw_params_any(pcm_handle, hwparams);
 	CHECK_FAIL(status < 0);
@@ -140,7 +140,7 @@ Error AudioDriverALSA::init_output_device() {
 
 	//snd_pcm_hw_params_free(&hwparams);
 
-	snd_pcm_sw_params_alloca(&swparams);
+	snd_pcm_sw_params_alloca(&swparams); // NOLINT(modernize-use-bool-literals)
 
 	status = snd_pcm_sw_params_current(pcm_handle, swparams);
 	CHECK_FAIL(status < 0);

drivers/d3d12/godot_d3d12ma.h

@@ -35,6 +35,9 @@
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
 
+#include <drivers/d3d12/godot_d3dx12.h>
+#include <dxgi1_6.h>
+
 #define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
 #include <thirdparty/d3d12ma/D3D12MemAlloc.h> // IWYU pragma: export.
 

drivers/d3d12/rendering_context_driver_d3d12.cpp

@@ -34,7 +34,6 @@
 #include "core/config/project_settings.h"
 #include "core/string/ustring.h"
 #include "core/templates/local_vector.h"
-#include "drivers/d3d12/d3d12_hooks.h"
 
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor")

drivers/d3d12/rendering_device_driver_d3d12.cpp

@@ -37,7 +37,7 @@
 #include "drivers/d3d12/rendering_context_driver_d3d12.h"
 
 #include <dxgi1_6.h>
-// Ensure d3dx12 and dxgi are included first.
+
 #include <drivers/d3d12/godot_d3d12ma.h>
 #include <drivers/d3d12/godot_nir.h>
 

drivers/d3d12/rendering_shader_container_d3d12.cpp

@@ -33,10 +33,8 @@
 #include "core/templates/sort_array.h"
 #include "drivers/d3d12/dxil_hash.h"
 
-#include <drivers/d3d12/godot_d3dx12.h>
-#include <dxgi1_6.h>
-// Include d3dx12 and dxgi before d3d12ma.
 #include <drivers/d3d12/godot_d3d12ma.h>
+#include <drivers/d3d12/godot_d3dx12.h>
 #include <drivers/d3d12/godot_nir.h>
 
 #include <wrl/client.h>
@@ -430,8 +428,8 @@ bool RenderingShaderContainerD3D12::_convert_spirv_to_nir(Span<ReflectShaderStag
 				shader->info.inputs_read |= VARYING_BIT_POS;
 
 				if (prev_shader) {
-					dxil_reassign_driver_locations(shader, nir_var_shader_in, prev_shader->info.outputs_written, NULL);
-					dxil_reassign_driver_locations(prev_shader, nir_var_shader_out, shader->info.inputs_read, NULL);
+					dxil_reassign_driver_locations(shader, nir_var_shader_in, prev_shader->info.outputs_written, nullptr);
+					dxil_reassign_driver_locations(prev_shader, nir_var_shader_out, shader->info.inputs_read, nullptr);
 				}
 			}
 		}

drivers/egl/egl_manager.cpp

@@ -30,6 +30,8 @@
 
 #include "egl_manager.h"
 
+#ifdef EGL_ENABLED
+
 #include "core/config/engine.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
@@ -40,8 +42,6 @@
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
 
-#ifdef EGL_ENABLED
-
 #if defined(EGL_STATIC)
 
 #define GLAD_EGL_VERSION_1_5 true

drivers/gles3/shader_gles3.cpp

@@ -33,11 +33,14 @@
 #ifdef GLES3_ENABLED
 
 #include "core/io/dir_access.h"
-#include "core/io/file_access.h"
 #include "core/string/string_builder.h"
 #include "drivers/gles3/rasterizer_util_gles3.h"
 #include "drivers/gles3/storage/config.h"
 
+#ifndef WEB_ENABLED
+#include "core/io/file_access.h"
+#endif
+
 static String _mkid(const String &p_id) {
 	String id = "m_" + p_id.replace("__", "_dus_");
 	return id.replace("__", "_dus_"); //doubleunderscore is reserved in glsl