diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-27 21:15:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 21:15:49 +0000 |
| commit | 85d87116e184e7923b8d6804cab2681b61c62d83 (patch) | |
| tree | 55ec5bfa061a5c27272b831e697b78ed1b756a70 /drivers/d3d12/rendering_context_driver_d3d12.h | |
| parent | b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff) | |
| parent | 721f53fde47c2727d99e3ecccdb789a67df36de0 (diff) | |
| download | redot-engine-master.tar.gz | |
Merge commit godotengine/godot@f128f38
Diffstat (limited to 'drivers/d3d12/rendering_context_driver_d3d12.h')
| -rw-r--r-- | drivers/d3d12/rendering_context_driver_d3d12.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/d3d12/rendering_context_driver_d3d12.h b/drivers/d3d12/rendering_context_driver_d3d12.h index 2a3b3c5b1d..e49da526ff 100644 --- a/drivers/d3d12/rendering_context_driver_d3d12.h +++ b/drivers/d3d12/rendering_context_driver_d3d12.h @@ -61,6 +61,20 @@ #undef AS #endif +#if (WINVER < _WIN32_WINNT_WIN8) && defined(_MSC_VER) +#pragma push_macro("NTDDI_VERSION") +#pragma push_macro("WINVER") +#undef NTDDI_VERSION +#undef WINVER +#define NTDDI_VERSION NTDDI_WIN8 +#define WINVER _WIN32_WINNT_WIN8 +#include <dcomp.h> +#pragma pop_macro("WINVER") +#pragma pop_macro("NTDDI_VERSION") +#else +#include <dcomp.h> +#endif + #include "d3dx12.h" #include <dxgi1_6.h> @@ -116,10 +130,14 @@ public: uint32_t height = 0; DisplayServer::VSyncMode vsync_mode = DisplayServer::VSYNC_ENABLED; bool needs_resize = false; + ComPtr<IDCompositionDevice> composition_device; + ComPtr<IDCompositionTarget> composition_target; + ComPtr<IDCompositionVisual> composition_visual; }; HMODULE lib_d3d12 = nullptr; HMODULE lib_dxgi = nullptr; + HMODULE lib_dcomp = nullptr; IDXGIAdapter1 *create_adapter(uint32_t p_adapter_index) const; ID3D12DeviceFactory *device_factory_get() const; |