diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-08 18:09:08 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-08 18:09:08 +0000 |
| commit | 61cb28a4c3a538f6d43098f045bdc07611652604 (patch) | |
| tree | 0f7c4e61112a55de4f3deb817696b91d2a000c1f /Graphics/GraphicsEngine | |
| parent | Updated factory functions to not throw exceptions, but return; fixed API vers... (diff) | |
| download | DiligentCore-61cb28a4c3a538f6d43098f045bdc07611652604.tar.gz DiligentCore-61cb28a4c3a538f6d43098f045bdc07611652604.zip | |
Implemented manual loading of d3d12.dll (closed https://github.com/DiligentGraphics/DiligentCore/issues/113)
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/interface/APIInfo.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/GraphicsTypes.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h index 00fb32f7..919894e4 100644 --- a/Graphics/GraphicsEngine/interface/APIInfo.h +++ b/Graphics/GraphicsEngine/interface/APIInfo.h @@ -30,7 +30,7 @@ /// \file /// Diligent API information -#define DILIGENT_API_VERSION 240050 +#define DILIGENT_API_VERSION 240051 #include "../../../Primitives/interface/BasicTypes.h" diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index 5cd1c6b2..988824b0 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -1389,6 +1389,9 @@ namespace Diligent /// Attributes specific to D3D12 engine struct EngineD3D12CreateInfo : public EngineCreateInfo { + /// Name of the D3D12 DLL to load. Ignored on UWP. + const char* D3D12DllName = "d3d12.dll"; + static constexpr Uint32 DefaultAdapterId = 0xFFFFFFFF; /// Id of the hardware adapter the engine should be initialized on. |