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

2 files changed, 6 insertions, 3 deletions

diff --git a/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.hpp
index 2fff7842..50521913 100644
--- a/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.hpp
@@ -33,16 +33,15 @@
 #include "EngineVkImplTraits.hpp"
 #include "VulkanUtilities/VulkanHeaders.h"
 #include "CommandListBase.hpp"
-#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
 
 /// Command list implementation in Vulkan backend.
-class CommandListVkImpl final : public CommandListBase<ICommandList, RenderDeviceVkImpl>
+class CommandListVkImpl final : public CommandListBase<EngineVkImplTraits>
 {
 public:
-    using TCommandListBase = CommandListBase<ICommandList, RenderDeviceVkImpl>;
+    using TCommandListBase = CommandListBase<EngineVkImplTraits>;
 
     CommandListVkImpl(IReferenceCounters* pRefCounters,
                       RenderDeviceVkImpl* pDevice,
diff --git a/Graphics/GraphicsEngineVulkan/include/EngineVkImplTraits.hpp b/Graphics/GraphicsEngineVulkan/include/EngineVkImplTraits.hpp
index ff51c262..9f186265 100644
--- a/Graphics/GraphicsEngineVulkan/include/EngineVkImplTraits.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/EngineVkImplTraits.hpp
@@ -43,6 +43,7 @@
 #include "QueryVk.h"
 #include "RenderPassVk.h"
 #include "FramebufferVk.h"
+#include "CommandList.h"
 #include "BottomLevelASVk.h"
 #include "TopLevelASVk.h"
 #include "ShaderBindingTableVk.h"
@@ -67,6 +68,7 @@ class FenceVkImpl;
 class QueryVkImpl;
 class RenderPassVkImpl;
 class FramebufferVkImpl;
+class CommandListVkImpl;
 class BottomLevelASVkImpl;
 class TopLevelASVkImpl;
 class ShaderBindingTableVkImpl;
@@ -93,6 +95,7 @@ struct EngineVkImplTraits
     using QueryInterface                     = IQueryVk;
     using RenderPassInterface                = IRenderPassVk;
     using FramebufferInterface               = IFramebufferVk;
+    using CommandListInterface               = ICommandList;
     using BottomLevelASInterface             = IBottomLevelASVk;
     using TopLevelASInterface                = ITopLevelASVk;
     using ShaderBindingTableInterface        = IShaderBindingTableVk;
@@ -113,6 +116,7 @@ struct EngineVkImplTraits
     using QueryImplType                     = QueryVkImpl;
     using RenderPassImplType                = RenderPassVkImpl;
     using FramebufferImplType               = FramebufferVkImpl;
+    using CommandListImplType               = CommandListVkImpl;
     using BottomLevelASImplType             = BottomLevelASVkImpl;
     using TopLevelASImplType                = TopLevelASVkImpl;
     using ShaderBindingTableImplType        = ShaderBindingTableVkImpl;