D3D12 backend: some code cleanup

16 files changed, 22 insertions, 23 deletions

diff --git a/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp b/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
index eaaf6f83..29bbaeb0 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
@@ -30,6 +30,7 @@
 
 #include <vector>
 
+#include "DeviceContext.h"
 #include "D3D12ResourceBase.hpp"
 #include "DescriptorHeap.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.hpp b/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.hpp
index baa659b7..71373386 100644
--- a/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.hpp
@@ -32,6 +32,16 @@
 
 #include "GraphicsTypes.h"
 #include "RenderPass.h"
+#include "DepthStencilState.h"
+#include "RasterizerState.h"
+#include "BlendState.h"
+#include "InputLayout.h"
+#include "Texture.h"
+#include "TextureView.h"
+#include "Buffer.h"
+#include "BufferView.h"
+#include "Shader.h"
+#include "DeviceContext.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
index 2ba782d8..e4ce0b8f 100644
--- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
@@ -38,8 +38,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Fence implementation in Direct3D12 backend.
 class FenceD3D12Impl final : public FenceBase<IFenceD3D12, RenderDeviceD3D12Impl>
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp
index b08a0d83..38ac63cc 100644
--- a/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp
@@ -37,8 +37,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Render pass implementation in Direct3D12 backend.
 class FramebufferD3D12Impl final : public FramebufferBase<IFramebuffer, RenderDeviceD3D12Impl>
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
index 23a660ee..f9317aec 100644
--- a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
@@ -31,6 +31,7 @@
 /// Declaration of Diligent::QueryD3D12Impl class
 
 #include <array>
+
 #include "QueryD3D12.h"
 #include "QueryBase.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
@@ -38,8 +39,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 // https://microsoft.github.io/DirectX-Specs/d3d/CountersAndQueries.html#queries
 
 /// Query implementation in Direct3D12 backend.
diff --git a/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp
index 71c6846d..43d505d0 100644
--- a/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp
@@ -37,8 +37,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Render pass implementation in Direct3D12 backend.
 class RenderPassD3D12Impl final : public RenderPassBase<IRenderPass, RenderDeviceD3D12Impl>
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/RootParamsManager.hpp b/Graphics/GraphicsEngineD3D12/include/RootParamsManager.hpp
index 113a628a..67881ed9 100644
--- a/Graphics/GraphicsEngineD3D12/include/RootParamsManager.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/RootParamsManager.hpp
@@ -34,7 +34,8 @@
 #include <vector>
 #include <array>
 
-#include "BasicTypes.h"
+#include "Shader.h"
+#include "ShaderResourceVariable.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
index cefbe27c..d427916a 100644
--- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
@@ -39,8 +39,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Sampler object implementation in Direct3D12 backend.
 class SamplerD3D12Impl final : public SamplerBase<ISamplerD3D12, RenderDeviceD3D12Impl>
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp
index 9f564008..ecee02b6 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp
@@ -83,6 +83,7 @@
 //
 
 #include "DescriptorHeap.hpp"
+#include "Shader.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
index 58c277eb..9d6627ed 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
@@ -39,8 +39,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Texture view object implementation in Direct3D12 backend.
 class TextureViewD3D12Impl final : public TextureViewBase<ITextureViewD3D12, RenderDeviceD3D12Impl>
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/pch.h b/Graphics/GraphicsEngineD3D12/include/pch.h
index 2cc3407e..5bcc4f04 100644
--- a/Graphics/GraphicsEngineD3D12/include/pch.h
+++ b/Graphics/GraphicsEngineD3D12/include/pch.h
@@ -25,11 +25,6 @@
  *  of the possibility of such damages.
  */
 
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
 #pragma once
 
 #ifndef WIN32_LEAN_AND_MEAN
@@ -51,12 +46,13 @@
 #include "RefCntAutoPtr.hpp"
 #include "DebugUtilities.hpp"
 #include "D3DErrors.hpp"
-#include "RenderDeviceBase.hpp"
 #include "ValidatedCast.hpp"
+#include "STDAllocator.hpp"
+
 #include <atlcomcli.h>
 
 #if USE_D3D12_LOADER
 // On Win32 we manually load d3d12.dll and get entry points,
-// but UWP does not support that, so we link with d3d12.lib
+// but UWP does not support this, so we link with d3d12.lib
 #    include "D3D12Loader.hpp"
 #endif
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
index 66edc30d..ee6669ea 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -37,6 +37,7 @@
 #include "D3DViewDescConversionImpl.hpp"
 #include "PlatformMisc.hpp"
 #include "Align.hpp"
+#include "GraphicsAccessories.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
index 9c2ea71c..7c23a734 100644
--- a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
@@ -30,8 +30,8 @@
 #include <atlbase.h>
 
 #include "FenceD3D12Impl.hpp"
-#include "EngineMemory.h"
 #include "RenderDeviceD3D12Impl.hpp"
+
 namespace Diligent
 {
 
diff --git a/Graphics/GraphicsEngineD3D12/src/FramebufferD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/FramebufferD3D12Impl.cpp
index 39cadf4f..486e1913 100644
--- a/Graphics/GraphicsEngineD3D12/src/FramebufferD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/FramebufferD3D12Impl.cpp
@@ -28,7 +28,6 @@
 #include "pch.h"
 
 #include "FramebufferD3D12Impl.hpp"
-#include "EngineMemory.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/RenderPassD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderPassD3D12Impl.cpp
index 397127ca..3991ab97 100644
--- a/Graphics/GraphicsEngineD3D12/src/RenderPassD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RenderPassD3D12Impl.cpp
@@ -28,7 +28,6 @@
 #include "pch.h"
 
 #include "RenderPassD3D12Impl.hpp"
-#include "EngineMemory.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/RootParamsManager.cpp b/Graphics/GraphicsEngineD3D12/src/RootParamsManager.cpp
index 540bea67..7fbcf516 100644
--- a/Graphics/GraphicsEngineD3D12/src/RootParamsManager.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RootParamsManager.cpp
@@ -30,6 +30,8 @@
 #include "RootParamsManager.hpp"
 #include "D3D12Utils.h"
 #include "D3D12TypeConversions.hpp"
+#include "HashUtils.hpp"
+#include "EngineMemory.h"
 
 namespace Diligent
 {