diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-09-17 03:19:06 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-09-17 03:19:06 +0000 |
| commit | c4e90c3f0025628c0951f368d0d4b54f13a87b3d (patch) | |
| tree | cae1b894626f4a60f82352f4e66b041342d79d09 /Graphics/GraphicsEngineD3D12 | |
| parent | D3D12 backend: implemented proper detection of DXIL bytecode (diff) | |
| download | DiligentCore-c4e90c3f0025628c0951f368d0d4b54f13a87b3d.tar.gz DiligentCore-c4e90c3f0025628c0951f368d0d4b54f13a87b3d.zip | |
Removed AdapterAttribs struct that was a duplicate of GraphicsAdapterInfo. Moved few members to GraphicsAdapterInfo
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h index d5fb356e..b90f3aa0 100644 --- a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h +++ b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h @@ -149,7 +149,7 @@ DILIGENT_BEGIN_INTERFACE(IEngineFactoryD3D12, IEngineFactory) VIRTUAL void METHOD(EnumerateAdapters)(THIS_ DIRECT3D_FEATURE_LEVEL MinFeatureLevel, Uint32 REF NumAdapters, - AdapterAttribs* Adapters) PURE; + GraphicsAdapterInfo* Adapters) PURE; /// Enumerates available display modes for the specified output of the specified adapter. diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp index 65991753..d00d72d5 100644 --- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp @@ -90,7 +90,7 @@ public: virtual void DILIGENT_CALL_TYPE EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel, Uint32& NumAdapters, - AdapterAttribs* Adapters) override final; + GraphicsAdapterInfo* Adapters) override final; virtual void DILIGENT_CALL_TYPE EnumerateDisplayModes(DIRECT3D_FEATURE_LEVEL MinFeatureLevel, Uint32 AdapterId, @@ -490,7 +490,7 @@ void EngineFactoryD3D12Impl::CreateSwapChainD3D12(IRenderDevice* pDev void EngineFactoryD3D12Impl::EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel, Uint32& NumAdapters, - AdapterAttribs* Adapters) + GraphicsAdapterInfo* Adapters) { #if USE_D3D12_LOADER if (m_hD3D12Dll == NULL) |