Updated Core & tests

19 files changed, 362 insertions, 7 deletions

diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D11/EngineFactoryD3D11H_test.cpp
index 3221ee4..8e0070d 100644
--- a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D11/EngineFactoryD3D11H_test.cpp
@@ -30,4 +30,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D12/EngineFactoryD3D12H_test.cpp
index 10f4fe8..e7ad225 100644
--- a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D12/EngineFactoryD3D12H_test.cpp
@@ -30,4 +30,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3DBase/ShaderD3DH_test.cpp
index 2bf77c5..08a6f63 100644
--- a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3DBase/ShaderD3DH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3DBase/ShaderResourceVariableD3DH_test.cpp
index 74b62aa..125ebf1 100644
--- a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineD3DBase/ShaderResourceVariableD3DH_test.cpp
@@ -20,6 +20,4 @@
  *  all other commercial damages or losses), even if such Contributor has been advised 
  *  of the possibility of such damages.
  */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3DBase/interface/ShaderResourceVariableD3D.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.cpp
index 5ce531c..5cea102 100644
--- a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.cpp
@@ -32,4 +32,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/BufferViewVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/BufferViewVkH_test.cpp
new file mode 100644
index 0000000..d5afde4
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/BufferViewVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/BufferViewVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/BufferVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/BufferVkH_test.cpp
new file mode 100644
index 0000000..aaed8bd
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/BufferVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/BufferVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/CommandQueueVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/CommandQueueVkH_test.cpp
new file mode 100644
index 0000000..d5afde4
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/CommandQueueVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/BufferViewVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/DeviceContextVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/DeviceContextVkH_test.cpp
new file mode 100644
index 0000000..98b6531
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/DeviceContextVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/EngineFactoryVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/EngineFactoryVkH_test.cpp
new file mode 100644
index 0000000..37ac3e1
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/EngineFactoryVkH_test.cpp
@@ -0,0 +1,35 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#if PLATFORM_WIN32
+#   ifndef NOMINMAX
+#       define NOMINMAX
+#   endif
+#   include <Windows.h>
+#endif
+
+#ifndef ENGINE_DLL 
+#   define ENGINE_DLL 1
+#endif
+
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/FenceVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/FenceVkH_test.cpp
new file mode 100644
index 0000000..339e95a
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/FenceVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/FenceVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/PipelineStateVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/PipelineStateVkH_test.cpp
new file mode 100644
index 0000000..3f83ebf
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/PipelineStateVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/PipelineStateVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/RenderDeviceVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/RenderDeviceVkH_test.cpp
new file mode 100644
index 0000000..3920e53
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/RenderDeviceVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/RenderDeviceVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/SamplerVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/SamplerVkH_test.cpp
new file mode 100644
index 0000000..080211e
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/SamplerVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/SamplerVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp
new file mode 100644
index 0000000..c244ba3
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp
@@ -0,0 +1,24 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/ShaderVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/ShaderVkH_test.cpp
new file mode 100644
index 0000000..ac6eee5
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/ShaderVkH_test.cpp
@@ -0,0 +1,24 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/ShaderVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/SwapChainVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/SwapChainVkH_test.cpp
new file mode 100644
index 0000000..af3f27f
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/SwapChainVkH_test.cpp
@@ -0,0 +1,24 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/SwapChainVk.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/TextureViewVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/TextureViewVkH_test.cpp
new file mode 100644
index 0000000..3c49fa0
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/TextureViewVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/TextureViewVk.h"
diff --git a/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/TextureVkH_test.cpp b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/TextureVkH_test.cpp
new file mode 100644
index 0000000..5dbc886
--- /dev/null
+++ b/Tests/IncludeTest/src/DiligentCore/GraphicsEngineVk/TextureVkH_test.cpp
@@ -0,0 +1,25 @@
+/*     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
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  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.
+ */
+
+#include "DiligentCore/External/vulkan/vulkan.h"
+#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/TextureVk.h"