diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-09-21 03:34:00 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-09-21 03:34:00 +0000 |
| commit | 7accb78ce40aa9aa50cd50e5adbf30f39d06116b (patch) | |
| tree | 91436125e571515125ad6df33afa9b121dbc2a3f /Graphics/GraphicsEngineD3D12 | |
| parent | Fixed 32-bit windows build (diff) | |
| download | DiligentCore-7accb78ce40aa9aa50cd50e5adbf30f39d06116b.tar.gz DiligentCore-7accb78ce40aa9aa50cd50e5adbf30f39d06116b.zip | |
Refactored device object release queues
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h | 5 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index 9cbba22f..d210243c 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -141,7 +141,8 @@ PRIVATE set(PRIVATE_DEPENDENCIES BuildSettings Common - GraphicsEngineD3DBase + GraphicsEngineD3DBase + GraphicsEngineNextGenBase TargetPlatform dxgi.lib D3D12.lib diff --git a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h index cd61ad3b..0baaea26 100644 --- a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h @@ -28,6 +28,7 @@ #include "RenderDeviceD3D12.h" #include "RenderDeviceD3DBase.h" +#include "RenderDeviceNextGenBase.h" #include "DescriptorHeap.h" #include "CommandListManager.h" #include "CommandContext.h" @@ -41,10 +42,10 @@ namespace Diligent { /// Implementation of the Diligent::IRenderDeviceD3D12 interface -class RenderDeviceD3D12Impl final : public RenderDeviceD3DBase<IRenderDeviceD3D12> +class RenderDeviceD3D12Impl final : public RenderDeviceNextGenBase< RenderDeviceD3DBase<IRenderDeviceD3D12>, ICommandQueueD3D12 > { public: - using TRenderDeviceBase = RenderDeviceD3DBase<IRenderDeviceD3D12>; + using TRenderDeviceBase = RenderDeviceNextGenBase< RenderDeviceD3DBase<IRenderDeviceD3D12>, ICommandQueueD3D12 >; RenderDeviceD3D12Impl( IReferenceCounters* pRefCounters, IMemoryAllocator& RawMemAllocator, diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp index dfcd5927..9c703876 100644 --- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp @@ -47,6 +47,7 @@ RenderDeviceD3D12Impl :: RenderDeviceD3D12Impl(IReferenceCounters* pRef { pRefCounters, RawMemAllocator, + 1, NumDeferredContexts, sizeof(TextureD3D12Impl), sizeof(TextureViewD3D12Impl), |