Fixed interface headers to use relative paths in #include

16 files changed, 27 insertions, 16 deletions

diff --git a/Graphics/GraphicsEngine/interface/BlendState.h b/Graphics/GraphicsEngine/interface/BlendState.h
index b1cf1a97..b2c79a0c 100644
--- 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
index c137d264..767c8e4a 100644
--- 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
index e8d3c4c0..a04140d5 100644
--- 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
index cf49d4e9..ec4b75ba 100644
--- 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
index deb856fb..d0656418 100644
--- 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
index ba1e472c..9b82a683 100644
--- 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
index 35c2a27a..e742f927 100644
--- 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
index 483e1c52..598cedd4 100644
--- 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
index 527421de..4032952f 100644
--- 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
index 0fa55d1e..7e31b49a 100644
--- 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
index 9d46ba41..0e8d5299 100644
--- 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
index 07582031..f99a885a 100644
--- 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
index 956e14a6..15df194d 100644
--- 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
index 1b35bbb1..6e024311 100644
--- 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 @@ public:
 
     /// 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
index 5e14c63b..0cdde1ef 100644
--- 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
index dc383b1e..d85b4750 100644
--- 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 } };