Fixed interface headers to use relative paths in #include

14 files changed, 21 insertions, 19 deletions

diff --git a/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h b/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h
index ab47d940..4e179012 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferGL interface
 
-#include "Buffer.h"
+#include "../../GraphicsEngine/interface/Buffer.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h b/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h
index 1b3a246d..9c4ca28a 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferViewGL interface
 
-#include "BufferView.h"
+#include "../../GraphicsEngine/interface/BufferView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h b/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
index 4cedfd59..38089444 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContextGL interface
 
-#include "DeviceContext.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h b/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h
index bbb998bd..2c05adbf 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h
@@ -26,8 +26,7 @@
 /// \file
 /// Definition of the Engine OpenGL/GLES attribs
 
-#include "BasicTypes.h"
-#include "GraphicsTypes.h"
+#include "../../GraphicsEngine/interface/GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h b/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h
index 191fc6c9..0cff97df 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IPipelineStateGL interface
 
-#include "PipelineState.h"
+#include "../../GraphicsEngine/interface/PipelineState.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
index 77173bb3..32e5987e 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
@@ -26,10 +26,14 @@
 /// \file
 /// Declaration of functions that create OpenGL-based engine implementation
 
-#include "RenderDevice.h"
-#include "DeviceContext.h"
-#include "SwapChain.h"
-#include "HLSL2GLSLConverter.h"
+#include "../../../Platforms/Basic/interface/Errors.h"
+
+#include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
+
+#include "../../HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h"
+
 #include "EngineGLAttribs.h"
 
 #if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
diff --git a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h
index e3fd08ea..605d866f 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h
@@ -26,8 +26,7 @@
 /// \file
 /// Definition of the Diligent::IRenderDeviceGL interface
 
-#include "RenderDevice.h"
-#include "HLSL2GLSLConverter.h"
+#include "../../GraphicsEngine/interface/RenderDevice.h"
 
 /// Namespace for the OpenGL implementation of the graphics engine
 namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h b/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h
index 0ca9929f..485dc050 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISamplerGL interface
 
-#include "Sampler.h"
+#include "../../GraphicsEngine/interface/Sampler.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h b/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h
index c2f7a072..d01c1f09 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderGL interface
 
-#include "Shader.h"
+#include "../../GraphicsEngine/interface/Shader.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h b/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
index ef7c251d..7903d47c 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.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/GraphicsEngineOpenGL/interface/SwapChainGL.h b/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h
index e9405899..4646b6f9 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISwapChainGL interface
 
-#include "SwapChain.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h b/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h
index 2e62f577..d769b62f 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureGL interface
 
-#include "Texture.h"
+#include "../../GraphicsEngine/interface/Texture.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h b/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h
index ecd6a3f8..1805617c 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureViewGL interface
 
-#include "TextureView.h"
+#include "../../GraphicsEngine/interface/TextureView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
index f30b43b3..cd691f1f 100644
--- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
@@ -304,7 +304,7 @@ namespace Diligent
             NumRenderTargets = std::min(NumRenderTargets, MaxRenderTargets);
 
             const auto& CtxCaps = m_ContextState.GetContextCaps();
-            VERIFY(NumRenderTargets < CtxCaps.m_iMaxDrawBuffers, "This device only supports ", CtxCaps.m_iMaxDrawBuffers, " draw buffers, but ", NumRenderTargets, " are being set");
+            VERIFY(NumRenderTargets < static_cast<Uint32>(CtxCaps.m_iMaxDrawBuffers), "This device only supports ", CtxCaps.m_iMaxDrawBuffers, " draw buffers, but ", NumRenderTargets, " are being set");
             NumRenderTargets = std::min(NumRenderTargets, static_cast<Uint32>(CtxCaps.m_iMaxDrawBuffers));
 
             ITextureView *pBoundRTVs[MaxRenderTargets] = {};