Reworked CommandListBase to use EngineImplTraits like the rest of the base classes

2 files changed, 7 insertions, 5 deletions

diff --git a/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp
index 57f3d0e5..cfeef26a 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp
@@ -30,19 +30,17 @@
 /// \file
 /// Declaration of Diligent::CommandListD3D12Impl class
 
+#include "EngineD3D12ImplTraits.hpp"
 #include "CommandListBase.hpp"
-#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
 
-class DeviceContextD3D12Impl;
-
 /// Command list implementation in Direct3D12 backend.
-class CommandListD3D12Impl final : public CommandListBase<ICommandList, RenderDeviceD3D12Impl>
+class CommandListD3D12Impl final : public CommandListBase<EngineD3D12ImplTraits>
 {
 public:
-    using TCommandListBase = CommandListBase<ICommandList, RenderDeviceD3D12Impl>;
+    using TCommandListBase = CommandListBase<EngineD3D12ImplTraits>;
 
     CommandListD3D12Impl(IReferenceCounters*                           pRefCounters,
                          RenderDeviceD3D12Impl*                        pDevice,
diff --git a/Graphics/GraphicsEngineD3D12/include/EngineD3D12ImplTraits.hpp b/Graphics/GraphicsEngineD3D12/include/EngineD3D12ImplTraits.hpp
index a2ec044c..839afff9 100644
--- a/Graphics/GraphicsEngineD3D12/include/EngineD3D12ImplTraits.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/EngineD3D12ImplTraits.hpp
@@ -43,6 +43,7 @@
 #include "QueryD3D12.h"
 #include "RenderPass.h"
 #include "Framebuffer.h"
+#include "CommandList.h"
 #include "BottomLevelASD3D12.h"
 #include "TopLevelASD3D12.h"
 #include "ShaderBindingTableD3D12.h"
@@ -67,6 +68,7 @@ class FenceD3D12Impl;
 class QueryD3D12Impl;
 class RenderPassD3D12Impl;
 class FramebufferD3D12Impl;
+class CommandListD3D12Impl;
 class BottomLevelASD3D12Impl;
 class TopLevelASD3D12Impl;
 class ShaderBindingTableD3D12Impl;
@@ -93,6 +95,7 @@ struct EngineD3D12ImplTraits
     using QueryInterface                     = IQueryD3D12;
     using RenderPassInterface                = IRenderPass;
     using FramebufferInterface               = IFramebuffer;
+    using CommandListInterface               = ICommandList;
     using BottomLevelASInterface             = IBottomLevelASD3D12;
     using TopLevelASInterface                = ITopLevelASD3D12;
     using ShaderBindingTableInterface        = IShaderBindingTableD3D12;
@@ -113,6 +116,7 @@ struct EngineD3D12ImplTraits
     using QueryImplType                     = QueryD3D12Impl;
     using RenderPassImplType                = RenderPassD3D12Impl;
     using FramebufferImplType               = FramebufferD3D12Impl;
+    using CommandListImplType               = CommandListD3D12Impl;
     using BottomLevelASImplType             = BottomLevelASD3D12Impl;
     using TopLevelASImplType                = TopLevelASD3D12Impl;
     using ShaderBindingTableImplType        = ShaderBindingTableD3D12Impl;