Browse Source

Merge pull request #106398 from akien-mga/d3d12ma-silence-warnings

D3D12: Silence `-Wmaybe-uninitialized` warning in D3D12MemAlloc
Rémi Verschelde 4 months ago
parent
commit
3b7547fdd0
1 changed files with 9 additions and 1 deletions
  1. 9 1
      drivers/d3d12/d3d12ma.cpp

+ 9 - 1
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 <D3D12MemAlloc.cpp>
+
+GODOT_GCC_WARNING_POP