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/GraphicsEngineD3DBase | |
| 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/GraphicsEngineD3DBase')
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt index 5c61d0f9..2a4daae2 100644 --- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt @@ -69,9 +69,7 @@ PUBLIC Diligent-GraphicsEngine Diligent-GraphicsEngineD3DBaseInterface ) -if(D3D12_SUPPORTED) - target_link_libraries(Diligent-GraphicsEngineD3DBase PRIVATE D3D12.lib) -endif() + set_common_target_properties(Diligent-GraphicsEngineD3DBase) source_group("src" FILES ${SOURCE}) diff --git a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h index 4d70d8fa..87b4724b 100644 --- a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h +++ b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.h @@ -49,7 +49,7 @@ public: virtual void EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel, Uint32& NumAdapters, - AdapterAttribs* Adapters) override final + AdapterAttribs* Adapters) override { auto DXGIAdapters = FindCompatibleAdapters(MinFeatureLevel); @@ -91,7 +91,7 @@ public: Uint32 OutputId, TEXTURE_FORMAT Format, Uint32& NumDisplayModes, - DisplayModeAttribs* DisplayModes) override final + DisplayModeAttribs* DisplayModes) override { auto DXGIAdapters = FindCompatibleAdapters(MinFeatureLevel); if (AdapterId >= DXGIAdapters.size()) |