Merge pull request #111800 from Repiteo/scons/d3d12-cleanup

SCons: Clean up hardcoded D3D12 driver workarounds

Author: Repiteo

drivers/d3d12/SCsub

@@ -7,49 +7,25 @@ from pathlib import Path
 import methods
 
 Import("env")
-
 env_d3d12_rdd = env.Clone()
 
-thirdparty_obj = []
-
-
-# DirectX Headers (must take precedence over Windows SDK's).
-
-env.Prepend(CPPPATH=["#thirdparty/directx_headers/include/directx"])
-env_d3d12_rdd.Prepend(CPPPATH=["#thirdparty/directx_headers/include/directx"])
-env_d3d12_rdd.Prepend(CPPPATH=["#thirdparty/directx_headers/include/dxguids"])
-
-
-# Direct3D 12 Memory Allocator.
-
-env.Append(CPPPATH=["#thirdparty/d3d12ma"])
-env_d3d12_rdd.Append(CPPPATH=["#thirdparty/d3d12ma"])
-
-
 # Agility SDK.
-
 if env["agility_sdk_path"] != "" and os.path.exists(env["agility_sdk_path"]):
     env_d3d12_rdd.Append(CPPDEFINES=["AGILITY_SDK_ENABLED"])
     if env["agility_sdk_multiarch"]:
         env_d3d12_rdd.Append(CPPDEFINES=["AGILITY_SDK_MULTIARCH_ENABLED"])
 
-
 # PIX.
-
 if env["use_pix"]:
     env_d3d12_rdd.Append(CPPDEFINES=["PIX_ENABLED"])
     env_d3d12_rdd.Append(CPPPATH=[env["pix_path"] + "/Include"])
 
-
 # Direct composition.
-
 if "dcomp" in env.get("supported", []):
     env_d3d12_rdd.Append(CPPDEFINES=["DCOMP_ENABLED"])
     env.Append(CPPDEFINES=["DCOMP_ENABLED"])  # Used in header included in platform.
 
-
 # Mesa (SPIR-V to DXIL functionality).
-
 mesa_libs = env["mesa_libs"]
 if env.msvc and os.path.exists(env["mesa_libs"] + "-" + env["arch"] + "-msvc"):
     mesa_libs = env["mesa_libs"] + "-" + env["arch"] + "-msvc"
@@ -137,6 +113,7 @@ extra_defines += [
     ("PACKAGE_BUGREPORT", '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'),
     "PIPE_SUBSYSTEM_WINDOWS_USER",
     ("_Static_assert", "static_assert"),
+    "HAVE_STRUCT_TIMESPEC",
 ]
 
 if env.msvc:
@@ -148,29 +125,38 @@ if env.msvc:
         "_SCL_SECURE_NO_WARNINGS",
         "_SCL_SECURE_NO_DEPRECATE",
         "_ALLOW_KEYWORD_MACROS",
-        ("_HAS_EXCEPTIONS", 0),
         "NOMINMAX",
-        "HAVE_STRUCT_TIMESPEC",
     ]
 else:
     extra_defines += [
-        "HAVE_STRUCT_TIMESPEC",
+        # Match current version used by MinGW. MSVC and Direct3D 12 headers use 500.
+        ("__REQUIRED_RPCNDR_H_VERSION__", 475),
     ]
     if methods.using_gcc(env) and methods.get_compiler_version(env)["major"] < 13:
         # `region` & `endregion` not recognized as valid pragmas.
         env_d3d12_rdd.Append(CCFLAGS=["-Wno-unknown-pragmas"])
-        env.Append(CCFLAGS=["-Wno-unknown-pragmas"])
 
 # This is needed since rendering_device_d3d12.cpp needs to include some Mesa internals.
 env_d3d12_rdd.Prepend(CPPPATH=mesa_private_inc_paths)
 # For the same reason as above, the defines must be the same as in the 3rd-party code itself.
 env_d3d12_rdd.Append(CPPDEFINES=extra_defines)
 
+# Thirdparty.
+thirdparty_obj = []
 
-# Add all.
+env_thirdparty = env_d3d12_rdd.Clone()
+env_thirdparty.disable_warnings()
 
-env.drivers_sources += thirdparty_obj
+env_thirdparty.Prepend(
+    CPPPATH=[
+        "#thirdparty/directx_headers/include/directx",
+        "#thirdparty/directx_headers/include/dxguids",
+        "#thirdparty/d3d12ma",
+    ]
+)
 
+env_thirdparty.add_source_files(thirdparty_obj, "#thirdparty/d3d12ma/D3D12MemAlloc.cpp")
+env.drivers_sources += thirdparty_obj
 
 # Godot source files.
 

drivers/d3d12/d3d12ma.cpp

@@ -51,16 +51,19 @@ GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
 GODOT_CLANG_WARNING_IGNORE("-Wswitch")
 
 #include <dxcapi.h>
+#include <dxgi1_6.h>
 
 GODOT_GCC_WARNING_POP
 GODOT_CLANG_WARNING_POP
 
 #if !defined(_MSC_VER)
 #include <guiddef.h>
 
-#include <dxguids.h>
+#include <thirdparty/directx_headers/include/dxguids/dxguids.h>
 #endif
 
+using Microsoft::WRL::ComPtr;
+
 // Note: symbols are not available in MinGW and old MSVC import libraries.
 // GUID values from https://github.com/microsoft/DirectX-Headers/blob/7a9f4d06911d30eecb56a4956dab29dcca2709ed/include/directx/d3d12.idl#L5877-L5881
 const GUID CLSID_D3D12DeviceFactoryGodot = { 0x114863bf, 0xc386, 0x4aee, { 0xb3, 0x9d, 0x8f, 0x0b, 0xbb, 0x06, 0x29, 0x55 } };
@@ -72,7 +75,7 @@ const GUID CLSID_D3D12SDKConfigurationGodot = { 0x7cda6aca, 0xa03e, 0x49c8, { 0x
 #define _MSC_VER 1800
 #endif
 #define USE_PIX
-#include "WinPixEventRuntime/pix3.h"
+#include <WinPixEventRuntime/pix3.h>
 #if defined(__GNUC__)
 #undef _MSC_VER
 #endif

drivers/d3d12/rendering_context_driver_d3d12.cpp

@@ -37,6 +37,11 @@
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 
+#if !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+// Match current version used by MinGW, MSVC and Direct3D 12 headers use 500.
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif // !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)
+
 GODOT_GCC_WARNING_PUSH
 GODOT_GCC_WARNING_IGNORE("-Wimplicit-fallthrough")
 GODOT_GCC_WARNING_IGNORE("-Wmissing-field-initializers")
@@ -50,6 +55,11 @@ GODOT_CLANG_WARNING_IGNORE("-Wnon-virtual-dtor")
 GODOT_CLANG_WARNING_IGNORE("-Wstring-plus-int")
 GODOT_CLANG_WARNING_IGNORE("-Wswitch")
 
+#include <thirdparty/directx_headers/include/directx/d3dx12.h>
+
+GODOT_GCC_WARNING_POP
+GODOT_CLANG_WARNING_POP
+
 #if defined(AS)
 #undef AS
 #endif
@@ -58,21 +68,13 @@ GODOT_CLANG_WARNING_IGNORE("-Wswitch")
 #include <dcomp.h>
 #endif
 
-#include <d3dx12.h>
-#include <dxgi1_6.h>
-
 #include <wrl/client.h>
 
-GODOT_GCC_WARNING_POP
-GODOT_CLANG_WARNING_POP
-
-using Microsoft::WRL::ComPtr;
-
 #define ARRAY_SIZE(a) std_size(a)
 
 class RenderingContextDriverD3D12 : public RenderingContextDriver {
-	ComPtr<ID3D12DeviceFactory> device_factory;
-	ComPtr<IDXGIFactory2> dxgi_factory;
+	Microsoft::WRL::ComPtr<ID3D12DeviceFactory> device_factory;
+	Microsoft::WRL::ComPtr<IDXGIFactory2> dxgi_factory;
 	TightLocalVector<Device> driver_devices;
 	bool tearing_supported = false;
 
@@ -111,9 +113,9 @@ class RenderingContextDriverD3D12 : public RenderingContextDriver {
 		DisplayServer::VSyncMode vsync_mode = DisplayServer::VSYNC_ENABLED;
 		bool needs_resize = false;
 #ifdef DCOMP_ENABLED
-		ComPtr<IDCompositionDevice> composition_device;
-		ComPtr<IDCompositionTarget> composition_target;
-		ComPtr<IDCompositionVisual> composition_visual;
+		Microsoft::WRL::ComPtr<IDCompositionDevice> composition_device;
+		Microsoft::WRL::ComPtr<IDCompositionTarget> composition_target;
+		Microsoft::WRL::ComPtr<IDCompositionVisual> composition_visual;
 #endif
 	};
 

drivers/d3d12/rendering_context_driver_d3d12.h

@@ -58,6 +58,10 @@ GODOT_MSVC_WARNING_PUSH
 GODOT_MSVC_WARNING_IGNORE(4200) // "nonstandard extension used: zero-sized array in struct/union".
 GODOT_MSVC_WARNING_IGNORE(4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant".
 
+#include <dxgi1_6.h>
+#define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
+#include <thirdparty/d3d12ma/D3D12MemAlloc.h>
+
 #include <nir_spirv.h>
 #include <nir_to_dxil.h>
 #include <spirv_to_dxil.h>
@@ -72,9 +76,11 @@ GODOT_MSVC_WARNING_POP
 #if !defined(_MSC_VER)
 #include <guiddef.h>
 
-#include <dxguids.h>
+#include <thirdparty/directx_headers/include/dxguids/dxguids.h>
 #endif
 
+using Microsoft::WRL::ComPtr;
+
 // Mesa may define this.
 #ifdef UNUSED
 #undef UNUSED
@@ -85,7 +91,7 @@ GODOT_MSVC_WARNING_POP
 #define _MSC_VER 1800
 #endif
 #define USE_PIX
-#include "WinPixEventRuntime/pix3.h"
+#include <WinPixEventRuntime/pix3.h>
 #if defined(__GNUC__)
 #undef _MSC_VER
 #endif
@@ -6611,6 +6617,7 @@ Error RenderingDeviceDriverD3D12::initialize(uint32_t p_device_index, uint32_t p
 	adapter.Attach(context_driver->create_adapter(p_device_index));
 	ERR_FAIL_NULL_V(adapter, ERR_CANT_CREATE);
 
+	DXGI_ADAPTER_DESC adapter_desc;
 	HRESULT res = adapter->GetDesc(&adapter_desc);
 	ERR_FAIL_COND_V(!SUCCEEDED(res), ERR_CANT_CREATE);