Fixed interface headers to use relative paths in #include

DiligentGraphics · Feb 23, 2018 · 038fa79 · 038fa79
1 parent b75988c
commit 038fa79
Show file tree

Hide file tree

Showing 86 changed files with 155 additions and 137 deletions.
diff --git a/Common/interface/LockHelper.h b/Common/interface/LockHelper.h
@@ -28,7 +28,7 @@
 #include <condition_variable>
 #include <atomic>
 
-#include "Atomics.h"
+#include "../../../Platforms/interface/Atomics.h"
 
 namespace ThreadingTools
 {

diff --git a/Common/interface/RefCntAutoPtr.h b/Common/interface/RefCntAutoPtr.h
@@ -23,12 +23,13 @@
 
 #pragma once
 
-#include "DebugUtilities.h"
+#include "../../../Primitives/interface/Object.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/interface/Atomics.h"
 #include "LockHelper.h"
-#include "Atomics.h"
 #include "ValidatedCast.h"
 #include "RefCountedObjectImpl.h"
-#include "Object.h"
+
 
 namespace Diligent
 {

diff --git a/Common/interface/RefCountedObjectImpl.h b/Common/interface/RefCountedObjectImpl.h
@@ -26,12 +26,12 @@
 /// \file
 /// Implementation of the template base class for reference counting objects
 
-#include "Object.h"
-#include "Atomics.h"
-#include "DebugUtilities.h"
+#include "../../../Primitives/interface/Object.h"
+#include "../../../Primitives/interface/MemoryAllocator.h"
+#include "../../../Platforms/interface/Atomics.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 #include "LockHelper.h"
 #include "ValidatedCast.h"
-#include "MemoryAllocator.h"
 
 namespace Diligent
 {

diff --git a/Common/interface/StringTools.h b/Common/interface/StringTools.h
@@ -29,7 +29,8 @@
 #include <algorithm>
 #include <cctype>
 #include <string.h>
-#include "DebugUtilities.h"
+
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 namespace Diligent
 {

diff --git a/Common/interface/ValidatedCast.h b/Common/interface/ValidatedCast.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 template<typename DstType, typename SrcType>
 DstType* ValidatedCast( SrcType *Ptr )

diff --git a/Graphics/GraphicsEngine/interface/BlendState.h b/Graphics/GraphicsEngine/interface/BlendState.h
@@ -26,7 +26,7 @@
 /// \file
 /// Blend state description
 
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/BufferView.h b/Graphics/GraphicsEngine/interface/BufferView.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferView interface and related data structures
 
-#include "DeviceObject.h"
+#include "Buffer.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/Constants.h b/Graphics/GraphicsEngine/interface/Constants.h
@@ -26,6 +26,8 @@
 /// \file
 /// Definition of the engine constants
 
+#include "../../../Primitives/interface/BasicTypes.h"
+
 namespace Diligent
 {
     /// Maximum number of input buffer slots.

diff --git a/Graphics/GraphicsEngine/interface/DepthStencilState.h b/Graphics/GraphicsEngine/interface/DepthStencilState.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of data types that describe depth-stencil state
 
-#include "BasicTypes.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContext interface and related data structures
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
 #include "DeviceCaps.h"
 #include "Constants.h"
 #include "Buffer.h"

diff --git a/Graphics/GraphicsEngine/interface/DeviceObject.h b/Graphics/GraphicsEngine/interface/DeviceObject.h
@@ -26,7 +26,7 @@
 /// \file
 /// Defines Diligent::IDeviceObject interface
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
 #include "GraphicsTypes.h"
 
 namespace Diligent

diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
@@ -26,7 +26,7 @@
 /// \file
 /// Contains basic graphics engine type defintions
 
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 /// Graphics engine namespace
 namespace Diligent

diff --git a/Graphics/GraphicsEngine/interface/InputLayout.h b/Graphics/GraphicsEngine/interface/InputLayout.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition input layout
 
-#include "BasicTypes.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/MapHelper.h b/Graphics/GraphicsEngine/interface/MapHelper.h
@@ -26,7 +26,10 @@
 /// \file
 /// Definition of the Diligent::MapHelper helper template class
 
-#include "DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Common/interface/RefCntAutoPtr.h"
+#include "DeviceContext.h"
+#include "Buffer.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h
@@ -26,14 +26,14 @@
 /// \file
 /// Definition of the Diligent::IRenderDevice interface and related data structures
 
+#include "../../../Primitives/interface/Object.h"
+#include "../../../Platforms/interface/PlatformDefinitions.h"
 #include "GraphicsTypes.h"
-#include "Object.h"
 #include "BlendState.h"
 #include "RasterizerState.h"
 #include "DepthStencilState.h"
 #include "InputLayout.h"
 #include "ShaderResourceBinding.h"
-#include "PlatformDefinitions.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/RasterizerState.h b/Graphics/GraphicsEngine/interface/RasterizerState.h
@@ -26,7 +26,7 @@
 /// \file
 /// Rasterizer state description
 
-#include "BasicTypes.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/RenderDevice.h b/Graphics/GraphicsEngine/interface/RenderDevice.h
@@ -26,8 +26,8 @@
 /// \file
 /// Definition of the Diligent::IRenderDevice interface and related data structures
 
+#include "../../../Primitives/interface/Object.h"
 #include "GraphicsTypes.h"
-#include "Object.h"
 #include "DeviceCaps.h"
 #include "Constants.h"
 #include "Buffer.h"

diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h
@@ -26,9 +26,9 @@
 /// \file
 /// Definition of the Diligent::IShader interface and related data structures
 
+#include "../../../Primitives/interface/FileStream.h"
 #include "DeviceObject.h"
 #include "ResourceMapping.h"
-#include "FileStream.h"
 #include "Sampler.h"
 
 namespace Diligent

diff --git a/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h b/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h
@@ -26,11 +26,14 @@
 /// \file
 /// Definition of the Diligent::IShaderResourceBinding interface and related data structures
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
+#include "Shader.h"
 
 namespace Diligent
 {
 
+class IPipelineState;
+
 // {061F8774-9A09-48E8-8411-B5BD20560104}
 static constexpr INTERFACE_ID IID_ShaderResourceBinding =
 { 0x61f8774, 0x9a09, 0x48e8, { 0x84, 0x11, 0xb5, 0xbd, 0x20, 0x56, 0x1, 0x4 } };
@@ -47,7 +50,7 @@ class IShaderResourceBinding : public IObject
 
     /// The method calls AddRef() on the returned interface, 
     /// so Release() must be called to avoid memory leaks.
-    virtual class IPipelineState* GetPipelineState() = 0;
+    virtual IPipelineState* GetPipelineState() = 0;
 
     /// Binds all resource using the resource mapping
 

diff --git a/Graphics/GraphicsEngine/interface/SwapChain.h b/Graphics/GraphicsEngine/interface/SwapChain.h
@@ -26,7 +26,8 @@
 /// \file
 /// Definition of the Diligent::ISwapChain interface and related data structures
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngine/interface/TextureView.h b/Graphics/GraphicsEngine/interface/TextureView.h
@@ -31,6 +31,8 @@
 namespace Diligent
 {
 
+class IDeviceContext;
+
 // {5B2EA04E-8128-45E4-AA4D-6DC7E70DC424}
 static constexpr INTERFACE_ID IID_TextureView =
 { 0x5b2ea04e, 0x8128, 0x45e4, { 0xaa, 0x4d, 0x6d, 0xc7, 0xe7, 0xd, 0xc4, 0x24 } };

diff --git a/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h b/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferD3D11 interface
 
-#include "Buffer.h"
+#include "../../GraphicsEngine/interface/Buffer.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h b/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferViewD3D11 interface
 
-#include "BufferView.h"
+#include "../../GraphicsEngine/interface/BufferView.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h b/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContextD3D11 interface
 
-#include "DeviceContext.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h b/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h
@@ -26,8 +26,7 @@
 /// \file
 /// Definition of the Engine D3D11 attribs
 
-#include "BasicTypes.h"
-#include "GraphicsTypes.h"
+#include "../../GraphicsEngine/interface/GraphicsTypes.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h b/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IPipeplineStateD3D11 interface
 
-#include "PipelineState.h"
+#include "../../GraphicsEngine/interface/PipelineState.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IRenderDeviceD3D11 interface
 
-#include "RenderDevice.h"
+#include "../../GraphicsEngine/interface/RenderDevice.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
@@ -26,16 +26,18 @@
 /// \file
 /// Declaration of functions that initialize Direct3D11-based engine implementation
 
-#include "Errors.h"
-#include "EngineD3D11Attribs.h"
-#include "RenderDevice.h"
-#include "DeviceContext.h"
-#include "SwapChain.h"
+#include "../../../Platforms/Basic/interface/Errors.h"
+
+#include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 #if PLATFORM_UNIVERSAL_WINDOWS && defined(ENGINE_DLL)
-#   include "StringTools.h"
+#   include "../../../Common/interface/StringTools.h"
 #endif
 
+#include "EngineD3D11Attribs.h"
+
 namespace Diligent
 {
 

diff --git a/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h b/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISamplerD3D11 interface
 
-#include "Sampler.h"
+#include "../../GraphicsEngine/interface/Sampler.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderD3D11 interface
 
-#include "Shader.h"
+#include "../../GraphicsEngine/interface/Shader.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderResourceBindingD3D11 interface and related data structures
 
-#include "ShaderResourceBinding.h"
+#include "../../GraphicsEngine/interface/ShaderResourceBinding.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h b/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISwapChainD3D11 interface
 
-#include "SwapChain.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h b/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureD3D11 interface
 
-#include "Texture.h"
+#include "../../GraphicsEngine/interface/Texture.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h b/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureViewD3D11 interface
 
-#include "TextureView.h"
+#include "../../GraphicsEngine/interface/TextureView.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferD3D12 interface
 
-#include "Buffer.h"
+#include "../../GraphicsEngine/interface/Buffer.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferViewD3D12 interface
 
-#include "BufferView.h"
+#include "../../GraphicsEngine/interface/BufferView.h"
 
 namespace Diligent
 {

diff --git a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContextD3D11 interface
 
-#include "DeviceContext.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
 
 namespace Diligent
 {