Skip to content

Commit 3b7547f

Browse files
committed
Merge pull request godotengine#106398 from akien-mga/d3d12ma-silence-warnings
D3D12: Silence `-Wmaybe-uninitialized` warning in D3D12MemAlloc
2 parents 225c8c6 + fe1322c commit 3b7547f

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

drivers/d3d12/d3d12ma.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
2929
/**************************************************************************/
3030

31-
#include "rendering_context_driver_d3d12.h"
31+
// Wrapper needed to set the required rpcndr version for MinGW compatibility.
32+
// Since we're compiling thirdparty code in a Godot SCons environment with
33+
// warnings enabled, we also need to silence them manually.
34+
35+
#include "rendering_device_driver_d3d12.h" // For __REQUIRED_RPCNDR_H_VERSION__.
36+
37+
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wmaybe-uninitialized")
3238

3339
#include <D3D12MemAlloc.cpp>
40+
41+
GODOT_GCC_WARNING_POP

0 commit comments

Comments
 (0)