moved public public headers of GraphicsTools project to interface folder to make them available in installation

22 files changed, 49 insertions, 26 deletions

diff --git a/BuildTools/Scripts/appveyor/run_tests.bat b/BuildTools/Scripts/appveyor/run_tests.bat
index 74b20da6..53a8d2a4 100644
--- a/BuildTools/Scripts/appveyor/run_tests.bat
+++ b/BuildTools/Scripts/appveyor/run_tests.bat
@@ -2,7 +2,7 @@ rem @echo off
 
 set RUN_API_CORE_TEST=false
 set RUN_CORE_API_D3D11_TEST=false
-set RUN_D3D12_TEST=false
+set RUN_CORE_API_D3D12_TEST=false
 set ERROR=0
 
 if "%PLATFORM_NAME%"=="Windows" (
diff --git a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
index cfa8ff75..5e4fa334 100644
--- a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
@@ -31,8 +31,8 @@
 #include "MapHelper.h"
 #include "PlatformMisc.h"
 #include "VulkanTypeConversions.h"
-#include "../../GraphicsTools/include/ShaderMacroHelper.h"
-#include "../../GraphicsTools/include/CommonlyUsedStates.h"
+#include "../../GraphicsTools/interface/ShaderMacroHelper.h"
+#include "../../GraphicsTools/interface/CommonlyUsedStates.h"
 
 
 // clang-format off
diff --git a/Graphics/GraphicsTools/CMakeLists.txt b/Graphics/GraphicsTools/CMakeLists.txt
index eebc2aa5..eb120586 100644
--- a/Graphics/GraphicsTools/CMakeLists.txt
+++ b/Graphics/GraphicsTools/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required (VERSION 3.6)
 
 project(Diligent-GraphicsTools CXX)
 
-set(INCLUDE 
-    include/CommonlyUsedStates.h
-    include/GraphicsUtilities.h
-    include/pch.h
-    include/ScreenCapture.h
-    include/ShaderMacroHelper.h
-    include/TextureUploader.h
-    include/TextureUploaderBase.h
+set(INTERFACE
+    interface/CommonlyUsedStates.h
+    interface/GraphicsUtilities.h
+    interface/pch.h
+    interface/ScreenCapture.h
+    interface/ShaderMacroHelper.h
+    interface/TextureUploader.h
+    interface/TextureUploaderBase.h
 )
 
 set(SOURCE 
@@ -23,26 +23,26 @@ set(DEPENDENCIES)
 
 if(D3D11_SUPPORTED)
     list(APPEND SOURCE src/TextureUploaderD3D11.cpp)
-    list(APPEND INCLUDE include/TextureUploaderD3D11.h)
+    list(APPEND INTERFACE interface/TextureUploaderD3D11.h)
     list(APPEND DEPENDENCIES Diligent-GraphicsEngineD3D11Interface)
 endif()
 
 if(D3D12_SUPPORTED OR VULKAN_SUPPORTED)
     list(APPEND SOURCE src/TextureUploaderD3D12_Vk.cpp)
-    list(APPEND INCLUDE include/TextureUploaderD3D12_Vk.h)
+    list(APPEND INTERFACE interface/TextureUploaderD3D12_Vk.h)
 endif()
 
 if(GL_SUPPORTED OR GLES_SUPPORTED)
     list(APPEND SOURCE src/TextureUploaderGL.cpp)
-    list(APPEND INCLUDE include/TextureUploaderGL.h)
+    list(APPEND INTERFACE interface/TextureUploaderGL.h)
     list(APPEND DEPENDENCIES Diligent-GraphicsEngineOpenGLInterface)
 endif()
 
-add_library(Diligent-GraphicsTools STATIC ${SOURCE} ${INCLUDE})
+add_library(Diligent-GraphicsTools STATIC ${SOURCE} ${INTERFACE})
 
 target_include_directories(Diligent-GraphicsTools 
 PUBLIC
-    include
+    interface
 PRIVATE
     ../GraphicsEngineD3DBase/include
 )
@@ -68,7 +68,6 @@ endif()
 set_common_target_properties(Diligent-GraphicsTools)
 
 source_group("src" FILES ${SOURCE})
-source_group("include" FILES ${INCLUDE})
 source_group("interface" FILES ${INTERFACE})
 
 set_target_properties(Diligent-GraphicsTools PROPERTIES
@@ -77,4 +76,4 @@ set_target_properties(Diligent-GraphicsTools PROPERTIES
 
 if(DILIGENT_INSTALL_CORE)
     install_core_lib(Diligent-GraphicsTools)
-endif()
\ No newline at end of file
+endif()
diff --git a/Graphics/GraphicsTools/include/CommonlyUsedStates.h b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
index f52bd34d..f52bd34d 100644
--- a/Graphics/GraphicsTools/include/CommonlyUsedStates.h
+++ b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
diff --git a/Graphics/GraphicsTools/include/GraphicsUtilities.h b/Graphics/GraphicsTools/interface/GraphicsUtilities.h
index 8638d211..8638d211 100644
--- a/Graphics/GraphicsTools/include/GraphicsUtilities.h
+++ b/Graphics/GraphicsTools/interface/GraphicsUtilities.h
diff --git a/Graphics/GraphicsTools/include/ScreenCapture.h b/Graphics/GraphicsTools/interface/ScreenCapture.h
index 019bfa2a..019bfa2a 100644
--- a/Graphics/GraphicsTools/include/ScreenCapture.h
+++ b/Graphics/GraphicsTools/interface/ScreenCapture.h
diff --git a/Graphics/GraphicsTools/include/ShaderMacroHelper.h b/Graphics/GraphicsTools/interface/ShaderMacroHelper.h
index 44ea1290..44ea1290 100644
--- a/Graphics/GraphicsTools/include/ShaderMacroHelper.h
+++ b/Graphics/GraphicsTools/interface/ShaderMacroHelper.h
diff --git a/Graphics/GraphicsTools/include/TextureUploader.h b/Graphics/GraphicsTools/interface/TextureUploader.h
index a67c7b9b..a67c7b9b 100644
--- a/Graphics/GraphicsTools/include/TextureUploader.h
+++ b/Graphics/GraphicsTools/interface/TextureUploader.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderBase.h b/Graphics/GraphicsTools/interface/TextureUploaderBase.h
index 6026d60b..6026d60b 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderBase.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderBase.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderD3D11.h b/Graphics/GraphicsTools/interface/TextureUploaderD3D11.h
index 9de6d84e..9de6d84e 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderD3D11.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderD3D11.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h b/Graphics/GraphicsTools/interface/TextureUploaderD3D12_Vk.h
index b3ca4bef..b3ca4bef 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderD3D12_Vk.h
diff --git a/Graphics/GraphicsTools/include/TextureUploaderGL.h b/Graphics/GraphicsTools/interface/TextureUploaderGL.h
index 8d4fb3b2..8d4fb3b2 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderGL.h
+++ b/Graphics/GraphicsTools/interface/TextureUploaderGL.h
diff --git a/Graphics/GraphicsTools/include/pch.h b/Graphics/GraphicsTools/interface/pch.h
index e8997cc7..e8997cc7 100644
--- a/Graphics/GraphicsTools/include/pch.h
+++ b/Graphics/GraphicsTools/interface/pch.h
diff --git a/Tests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp b/Tests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp
index da1ecbd5..1324a238 100644
--- a/Tests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "DiligentCore/Graphics/GraphicsTools/include/CommonlyUsedStates.h"
+#include "DiligentCore/Graphics/GraphicsTools/interface/CommonlyUsedStates.h"
diff --git a/Tests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp b/Tests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp
index de3396e2..ae9a6681 100644
--- a/Tests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "DiligentCore/Graphics/GraphicsTools/include/GraphicsUtilities.h"
+#include "DiligentCore/Graphics/GraphicsTools/interface/GraphicsUtilities.h"
diff --git a/Tests/IncludeTest/GraphicsTools/ScreenCaptureH_test.cpp b/Tests/IncludeTest/GraphicsTools/ScreenCaptureH_test.cpp
new file mode 100644
index 00000000..cffd6aaa
--- /dev/null
+++ b/Tests/IncludeTest/GraphicsTools/ScreenCaptureH_test.cpp
@@ -0,0 +1,24 @@
+/*     Copyright 2019 Diligent Graphics LLC
+ *  
+ *  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/Graphics/GraphicsTools/interface/ScreenCapture.h"
diff --git a/Tests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp b/Tests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp
index acfeed8d..18fcb470 100644
--- a/Tests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "DiligentCore/Graphics/GraphicsTools/include/ShaderMacroHelper.h"
+#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.h"
diff --git a/Tests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp b/Tests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp
index 82e1df06..91441d5a 100644
--- a/Tests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderBase.h"
+#include "DiligentCore/Graphics/GraphicsTools/interface/TextureUploaderBase.h"
diff --git a/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp b/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp
index b2b8e97b..cd73c657 100644
--- a/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp
@@ -22,5 +22,5 @@
  */
 
 #if D3D11_SUPPORTED
-#    include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D11.h"
+#    include "DiligentCore/Graphics/GraphicsTools/interface/TextureUploaderD3D11.h"
 #endif
diff --git a/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp b/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp
index b218d340..36d87452 100644
--- a/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp
@@ -22,5 +22,5 @@
  */
 
 #if D3D12_SUPPORTED
-#    include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h"
+#    include "DiligentCore/Graphics/GraphicsTools/interface/TextureUploaderD3D12_Vk.h"
 #endif
\ No newline at end of file
diff --git a/Tests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp b/Tests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp
index 943609ca..15a2e357 100644
--- a/Tests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp
@@ -22,5 +22,5 @@
  */
 
 #if GL_SUPPORTED || GLES_SUPPORTED
-#    include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderGL.h"
+#    include "DiligentCore/Graphics/GraphicsTools/interface/TextureUploaderGL.h"
 #endif
\ No newline at end of file
diff --git a/Tests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp b/Tests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp
index dfc192be..3ec5c5f1 100644
--- a/Tests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp
+++ b/Tests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploader.h"
+#include "DiligentCore/Graphics/GraphicsTools/interface/TextureUploader.h"