From 4dbb1c8679d6b6dd7bfbd2a2c0cd60194911f0e7 Mon Sep 17 00:00:00 2001 From: assiduous Date: Wed, 25 Dec 2019 21:42:30 -0800 Subject: moved public public headers of GraphicsTools project to interface folder to make them available in installation --- .../GraphicsTools/CommonlyUsedStatesH_test.cpp | 2 +- .../GraphicsTools/GraphicsUtilitiesH_test.cpp | 2 +- .../GraphicsTools/ScreenCaptureH_test.cpp | 24 ++++++++++++++++++++++ .../GraphicsTools/ShaderMacroHelperH_test.cpp | 2 +- .../GraphicsTools/TextureUploaderBaseH_test.cpp | 2 +- .../GraphicsTools/TextureUploaderD3D11H_test.cpp | 2 +- .../TextureUploaderD3D12_VkH_test.cpp | 2 +- .../GraphicsTools/TextureUploaderGLH_test.cpp | 2 +- .../GraphicsTools/TextureUploaderH_test.cpp | 2 +- 9 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 Tests/IncludeTest/GraphicsTools/ScreenCaptureH_test.cpp (limited to 'Tests/IncludeTest') 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" -- cgit v1.2.3