godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

SCons: Cleanup hardcoded D3D12 driver workarounds

Browse Source
This commit is contained in:
Thaddeus Crews
2025-10-18 13:38:19 -05:00
parent 5f12ada7a4
commit b93d82a2b3
8 changed files with 83 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/d3d12/rendering_context_driver_d3d12.cpp
View File

@@ -51,6 +51,7 @@ 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
@@ -58,9 +59,11 @@ 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