Merged master

14 files changed, 28 insertions, 28 deletions

diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
index 0d7f54f..3249b87 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp
index d29b2e1..c731193 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@
  */
 
 typedef unsigned int GLuint;
-#include "Graphics/GraphicsEngineOpenGL/interface/BufferGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
index 65ed13f..93cd469 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
index 57839ac..f883fca 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
index 57839ac..f883fca 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
index cc84715..75e94de 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
index 09a64c8..bce6a7b 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -32,4 +32,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
index e5be6ae..119bb87 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp
index 9f6b8ad..071c03e 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp
index c93803b..b812f30 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
index 987c0e2..f2fec06 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,4 +20,4 @@
  *  all other commercial damages or losses), even if such Contributor has been advised 
  *  of the possibility of such damages.
  */
-#include "Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
index ff82a09..57da8f7 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 typedef unsigned int GLuint;
-#include "Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp
index 15a59e1..0c57f2c 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,4 +22,4 @@
  */
 typedef unsigned int GLuint;
 typedef unsigned int GLenum;
-#include "Graphics/GraphicsEngineOpenGL/interface/TextureGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
index 878d5f8..74398ef 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015-2017 Egor Yusov
+/*     Copyright 2015-2018 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h"