From fe1322c014062ac3aa1603d8265abd82d63b32e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 14 May 2025 16:16:07 +0200 Subject: [PATCH] D3D12: Silence `-Wmaybe-uninitialized` warning in D3D12MemAlloc This was lost in #104893 when removing the warning ignores no longer relevant when including the D3D12MemAlloc _header_ as external. But we still compile the .cpp directly and it has this warning. Clarified why have a wrapper for this file. --- drivers/d3d12/d3d12ma.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/d3d12/d3d12ma.cpp b/drivers/d3d12/d3d12ma.cpp index 27f67d66e8d..0cc159f350e 100644 --- a/drivers/d3d12/d3d12ma.cpp +++ b/drivers/d3d12/d3d12ma.cpp @@ -28,6 +28,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "rendering_context_driver_d3d12.h" +// Wrapper needed to set the required rpcndr version for MinGW compatibility. +// Since we're compiling thirdparty code in a Godot SCons environment with +// warnings enabled, we also need to silence them manually. + +#include "rendering_device_driver_d3d12.h" // For __REQUIRED_RPCNDR_H_VERSION__. + +GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wmaybe-uninitialized") #include + +GODOT_GCC_WARNING_POP