code cleanup

16 files changed, 3 insertions, 54 deletions

diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
index 197aa86b..ed36f4f4 100644
--- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INCLUDE
     include/D3D11TypeDefinitions.h
     include/DeviceContextD3D11Impl.hpp
     include/DisjointQueryPool.hpp
-    include/EngineD3D11Defines.h
     include/EngineD3D11ImplTraits.hpp
     include/pch.h
 	include/FenceD3D11Impl.hpp
diff --git a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp
index bd2985c6..172d4f9c 100644
--- a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "BufferD3D11.h"
 #include "BufferBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
index c02e509a..be721684 100644
--- a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "BufferViewD3D11.h"
 #include "BufferViewBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp
index 6af1390d..9345eacb 100644
--- a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-#include "DeviceContextD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "DeviceContextBase.hpp"
 #include "BufferD3D11Impl.hpp"
 #include "TextureBaseD3D11.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/include/EngineD3D11Defines.h b/Graphics/GraphicsEngineD3D11/include/EngineD3D11Defines.h
deleted file mode 100644
index 4766aff2..00000000
--- a/Graphics/GraphicsEngineD3D11/include/EngineD3D11Defines.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright 2019-2021 Diligent Graphics LLC
- *  Copyright 2015-2019 Egor Yusov
- *  
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  
- *      http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  In no event and under no legal theory, whether in tort (including negligence), 
- *  contract, or otherwise, unless required by applicable law (such as deliberate 
- *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
- *  liable for any damages, including any direct, indirect, special, incidental, 
- *  or consequential damages of any character arising as a result of this License or 
- *  out of the use or inability to use the software (including but not limited to damages 
- *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
- *  all other commercial damages or losses), even if such Contributor has been advised 
- *  of the possibility of such damages.
- */
-
-#pragma once
-
-#ifdef DILIGENT_DEBUG
-#    define VERIFY_SHADER_BINDINGS
-#endif
diff --git a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp
index 4e1ef18a..3578d878 100644
--- a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp
@@ -34,7 +34,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "FenceD3D11.h"
 #include "FenceBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp
index d2617cad..7aaa4f2b 100644
--- a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp
@@ -30,8 +30,7 @@
 /// \file
 /// Declaration of Diligent::PipelineStateD3D11Impl class
 
-#include "PipelineStateD3D11.h"
-#include "RenderDeviceD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "PipelineStateBase.hpp"
 
 #include "PipelineResourceSignatureD3D11Impl.hpp" // Required by PipelineStateBase
diff --git a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp
index 6af07f43..c2135fb3 100644
--- a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp
@@ -34,7 +34,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "QueryD3D11.h"
 #include "QueryBase.hpp"
 #include "DisjointQueryPool.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp
index 66294bb4..007f92de 100644
--- a/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp
@@ -31,14 +31,11 @@
 /// Declaration of Diligent::RenderPassD3D11Impl class
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "RenderDeviceD3D11.h"
 #include "RenderPassBase.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Render pass implementation in Direct3D11 backend.
 class RenderPassD3D11Impl final : public RenderPassBase<EngineD3D11ImplTraits>
 {
diff --git a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp
index 07c6f682..2d8852e5 100644
--- a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "SamplerD3D11.h"
 #include "SamplerBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp
index 6b87ce6c..2541bf4d 100644
--- a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp
@@ -33,10 +33,8 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "ShaderD3D11.h"
 #include "ShaderBase.hpp"
 #include "ShaderD3DBase.hpp"
-#include "EngineD3D11Defines.h"
 #include "ShaderResourcesD3D11.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp
index 13226d95..c6d4026f 100644
--- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp
@@ -31,9 +31,6 @@
 /// Declaration of Diligent::ShaderResourceBindingD3D11Impl class
 
 #include "EngineD3D11ImplTraits.hpp"
-
-#include "ShaderResourceBindingD3D11.h"
-#include "RenderDeviceD3D11.h"
 #include "ShaderResourceBindingBase.hpp"
 
 // ShaderResourceCacheD3D11 and ShaderVariableManagerD3D11 are required by ShaderResourceBindingBase
diff --git a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp
index 54cc7031..85de56bc 100644
--- a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp
@@ -30,8 +30,7 @@
 /// \file
 /// Declaration of Diligent::TextureBaseD3D11 class
 
-#include "TextureD3D11.h"
-#include "RenderDeviceD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "TextureBase.hpp"
 #include "TextureViewD3D11Impl.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
index 639feeb7..6fe9a6f7 100644
--- a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "TextureViewD3D11.h"
 #include "TextureViewBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h
index 9d2f3c68..49275af3 100644
--- a/Graphics/GraphicsEngineD3D11/include/pch.h
+++ b/Graphics/GraphicsEngineD3D11/include/pch.h
@@ -70,7 +70,6 @@
 #    include <d3d11_4.h>
 #endif
 
-#include "EngineD3D11Defines.h"
 #include "Errors.hpp"
 #include "RefCntAutoPtr.hpp"
 #include "DebugUtilities.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
index 4ad09035..a601da70 100755
--- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
@@ -37,7 +37,6 @@
 #include "TextureViewD3D11Impl.hpp"
 #include "PipelineStateD3D11Impl.hpp"
 #include "ShaderResourceBindingD3D11Impl.hpp"
-#include "EngineD3D11Defines.h"
 #include "CommandListD3D11Impl.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
 #include "FenceD3D11Impl.hpp"