summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3D12
diff options
context:
space:
mode:
authorazhirnov <zh1dron@gmail.com>2021-03-15 00:28:19 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-03-19 00:38:23 +0000
commitcfe063cfe23ded6733c0dae1ab853fbf7a83a8e7 (patch)
tree0c56d2ab2e2ef2e2d10efe7a05b17f797a7ea25a /Graphics/GraphicsEngineD3D12
parentVulkan: fixed tests on Mac. (diff)
downloadDiligentCore-cfe063cfe23ded6733c0dae1ab853fbf7a83a8e7.tar.gz
DiligentCore-cfe063cfe23ded6733c0dae1ab853fbf7a83a8e7.zip
code cleanup
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
-rw-r--r--Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp2
-rw-r--r--Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp3
-rw-r--r--Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp3
-rw-r--r--Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp1
-rw-r--r--Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp1
14 files changed, 1 insertions, 18 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
index 1c59a56a..af66ad3a 100644
--- a/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::BottomLevelASD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "BottomLevelASD3D12.h"
#include "BottomLevelASBase.hpp"
#include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
index 12f3d1b8..dddac7a8 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::BufferD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "BufferD3D12.h"
#include "BufferBase.hpp"
#include "BufferViewD3D12Impl.hpp" // Required by BufferBase
#include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
index 775d3f69..c3064466 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::BufferViewD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "BufferViewD3D12.h"
#include "BufferViewBase.hpp"
#include "DescriptorHeap.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
index a502b748..a862ff0d 100644
--- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
@@ -33,7 +33,7 @@
#include <unordered_map>
#include <vector>
-#include "DeviceContextD3D12.h"
+#include "EngineD3D12ImplTraits.hpp"
#include "DeviceContextNextGenBase.hpp"
// D3D12 object implementations are required by DeviceContextBase
diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
index eb47973d..ad357896 100644
--- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::FenceD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "FenceD3D12.h"
#include "FenceBase.hpp"
namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
index 76d6e73a..72d45a46 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
@@ -33,7 +33,6 @@
#include <vector>
#include "EngineD3D12ImplTraits.hpp"
-#include "PipelineStateD3D12.h"
#include "PipelineStateBase.hpp"
#include "PipelineResourceSignatureD3D12Impl.hpp" // Requiured by PipelineStateBase
#include "RootSignature.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
index 2be65eaf..b6dbfc4b 100644
--- a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
@@ -33,7 +33,6 @@
#include <array>
#include "EngineD3D12ImplTraits.hpp"
-#include "QueryD3D12.h"
#include "QueryBase.hpp"
#include "QueryManagerD3D12.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
index d8cc4def..5f27a129 100644
--- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::SamplerD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "SamplerD3D12.h"
#include "SamplerBase.hpp"
#include "DescriptorHeap.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp
index 960e69e7..4db038c2 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::ShaderBindingTableD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "ShaderBindingTableD3D12.h"
#include "ShaderBindingTableBase.hpp"
#include "TopLevelASD3D12Impl.hpp"
#include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
index 80f05b21..8527acc4 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::ShaderD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "ShaderD3D12.h"
#include "ShaderBase.hpp"
#include "ShaderD3DBase.hpp"
#include "ShaderResourcesD3D12.hpp"
@@ -39,8 +38,6 @@
namespace Diligent
{
-class ResourceMapping;
-
/// Implementation of a shader object in Direct3D12 backend.
class ShaderD3D12Impl final : public ShaderBase<EngineD3D12ImplTraits>, public ShaderD3DBase
{
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
index 3749145f..9d4ed290 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
@@ -32,7 +32,6 @@
#include "EngineD3D12ImplTraits.hpp"
#include "ShaderResourceBindingBase.hpp"
-#include "ShaderResourceBindingD3D12.h"
// ShaderVariableManagerD3D12 and ShaderResourceCacheD3D12 are required by ShaderResourceBindingBase
#include "ShaderVariableManagerD3D12.hpp"
@@ -41,8 +40,6 @@
namespace Diligent
{
-class PipelineResourceSignatureD3D12Impl;
-
/// Implementation of the Diligent::IShaderResourceBindingD3D12 interface
// sizeof(ShaderResourceBindingD3D12Impl) == 96 (x64, msvc, Release)
class ShaderResourceBindingD3D12Impl final : public ShaderResourceBindingBase<EngineD3D12ImplTraits>
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
index 526a7610..141473d3 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::TextureD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "TextureD3D12.h"
#include "TextureBase.hpp"
#include "TextureViewD3D12Impl.hpp"
#include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
index 08a48045..460c2177 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::TextureViewD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "TextureViewD3D12.h"
#include "TextureViewBase.hpp"
#include "DescriptorHeap.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
index 4b21090b..1c9df86e 100644
--- a/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
@@ -31,7 +31,6 @@
/// Declaration of Diligent::TopLevelASD3D12Impl class
#include "EngineD3D12ImplTraits.hpp"
-#include "TopLevelASD3D12.h"
#include "TopLevelASBase.hpp"
#include "D3D12ResourceBase.hpp"
#include "BottomLevelASD3D12Impl.hpp" // Required by TopLevelASBase