From c8a2291bcf12adde60c42292903005b996b7a499 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Sat, 13 Mar 2021 18:42:10 -0800
Subject: Reworked CommandListBase to use EngineImplTraits like the rest of the
 base classes

---
 Graphics/GraphicsEngineD3D11/CMakeLists.txt                    | 1 +
 Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp  | 9 +++------
 Graphics/GraphicsEngineD3D11/include/EngineD3D11ImplTraits.hpp | 4 ++++
 Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp      | 5 ++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'Graphics/GraphicsEngineD3D11')

diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
index cd903d79..197aa86b 100644
--- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
@@ -12,6 +12,7 @@ set(INCLUDE
     include/DeviceContextD3D11Impl.hpp
     include/DisjointQueryPool.hpp
     include/EngineD3D11Defines.h
+    include/EngineD3D11ImplTraits.hpp
     include/pch.h
 	include/FenceD3D11Impl.hpp
     include/FramebufferD3D11Impl.hpp
diff --git a/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp
index cb1c3ec0..14a9b394 100644
--- a/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/CommandListD3D11Impl.hpp
@@ -30,20 +30,17 @@
 /// \file
 /// Declaration of Diligent::CommandListD3D11Impl class
 
-#include "RenderDeviceD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "CommandListBase.hpp"
-#include "RenderDeviceD3D11Impl.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Command list implementation in Direct3D11 backend.
-class CommandListD3D11Impl final : public CommandListBase<ICommandList, RenderDeviceD3D11Impl>
+class CommandListD3D11Impl final : public CommandListBase<EngineD3D11ImplTraits>
 {
 public:
-    using TCommandListBase = CommandListBase<ICommandList, RenderDeviceD3D11Impl>;
+    using TCommandListBase = CommandListBase<EngineD3D11ImplTraits>;
 
     CommandListD3D11Impl(IReferenceCounters*    pRefCounters,
                          RenderDeviceD3D11Impl* pDevice,
diff --git a/Graphics/GraphicsEngineD3D11/include/EngineD3D11ImplTraits.hpp b/Graphics/GraphicsEngineD3D11/include/EngineD3D11ImplTraits.hpp
index 87e3e0cb..907755fc 100644
--- a/Graphics/GraphicsEngineD3D11/include/EngineD3D11ImplTraits.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/EngineD3D11ImplTraits.hpp
@@ -43,6 +43,7 @@
 #include "QueryD3D11.h"
 #include "RenderPass.h"
 #include "Framebuffer.h"
+#include "CommandList.h"
 #include "PipelineResourceSignature.h"
 #include "DeviceContextD3D11.h"
 
@@ -63,6 +64,7 @@ class FenceD3D11Impl;
 class QueryD3D11Impl;
 class RenderPassD3D11Impl;
 class FramebufferD3D11Impl;
+class CommandListD3D11Impl;
 class BottomLevelASD3D11Impl;
 class TopLevelASD3D11Impl;
 class ShaderBindingTableD3D11Impl;
@@ -89,6 +91,7 @@ struct EngineD3D11ImplTraits
     using QueryInterface                     = IQueryD3D11;
     using RenderPassInterface                = IRenderPass;
     using FramebufferInterface               = IFramebuffer;
+    using CommandListInterface               = ICommandList;
     using PipelineResourceSignatureInterface = IPipelineResourceSignature;
 
     using RenderDeviceImplType              = RenderDeviceD3D11Impl;
@@ -105,6 +108,7 @@ struct EngineD3D11ImplTraits
     using QueryImplType                     = QueryD3D11Impl;
     using RenderPassImplType                = RenderPassD3D11Impl;
     using FramebufferImplType               = FramebufferD3D11Impl;
+    using CommandListImplType               = CommandListD3D11Impl;
     using BottomLevelASImplType             = BottomLevelASD3D11Impl;
     using TopLevelASImplType                = TopLevelASD3D11Impl;
     using ShaderBindingTableImplType        = ShaderBindingTableD3D11Impl;
diff --git a/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp
index 30c7f425..bae5d4fb 100644
--- a/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp
@@ -26,9 +26,12 @@
  */
 
 #include "pch.h"
-#include <atlbase.h>
 
 #include "CommandListD3D11Impl.hpp"
+
+#include <atlbase.h>
+
+#include "RenderDeviceD3D11Impl.hpp"
 #include "EngineMemory.h"
 
 namespace Diligent
-- 
cgit v1.2.3