diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-03-25 18:11:14 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-03-25 18:11:14 +0000 |
| commit | 33dd5ea4de1fceb63c95e32321b24620b2778ca5 (patch) | |
| tree | 94594b8346aa6419c81108499b7397c6d60c3f8f /Graphics/GraphicsTools | |
| parent | Fixed include paths in project Common (diff) | |
| download | DiligentCore-33dd5ea4de1fceb63c95e32321b24620b2778ca5.tar.gz DiligentCore-33dd5ea4de1fceb63c95e32321b24620b2778ca5.zip | |
Fixed include paths in GraphicsTools project; fixed build errors
Diffstat (limited to 'Graphics/GraphicsTools')
7 files changed, 19 insertions, 18 deletions
diff --git a/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h b/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h index 335a3525..f327f243 100644 --- a/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h +++ b/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h @@ -23,8 +23,8 @@ #pragma once -#include "BasicFileStream.h" -#include "Shader.h" +#include "../../../Common/interface/BasicFileStream.h" +#include "../../GraphicsEngine/interface/Shader.h" namespace Diligent { diff --git a/Graphics/GraphicsTools/include/CommonlyUsedStates.h b/Graphics/GraphicsTools/include/CommonlyUsedStates.h index b6aa2d05..34afdd45 100644 --- a/Graphics/GraphicsTools/include/CommonlyUsedStates.h +++ b/Graphics/GraphicsTools/include/CommonlyUsedStates.h @@ -26,11 +26,11 @@ /// \file /// Defines graphics engine utilities -#include "GraphicsTypes.h" -#include "DepthStencilState.h" -#include "BlendState.h" -#include "RasterizerState.h" -#include "Sampler.h" +#include "../../GraphicsEngine/interface/GraphicsTypes.h" +#include "../../GraphicsEngine/interface/DepthStencilState.h" +#include "../../GraphicsEngine/interface/BlendState.h" +#include "../../GraphicsEngine/interface/RasterizerState.h" +#include "../../GraphicsEngine/interface/Sampler.h" namespace Diligent { diff --git a/Graphics/GraphicsTools/include/GraphicsUtilities.h b/Graphics/GraphicsTools/include/GraphicsUtilities.h index f8031368..06a431d4 100644 --- a/Graphics/GraphicsTools/include/GraphicsUtilities.h +++ b/Graphics/GraphicsTools/include/GraphicsUtilities.h @@ -26,9 +26,9 @@ /// \file /// Defines graphics engine utilities -#include "Texture.h" -#include "Buffer.h" -#include "RenderDevice.h" +#include "../../GraphicsEngine/interface/Texture.h" +#include "../../GraphicsEngine/interface/Buffer.h" +#include "../../GraphicsEngine/interface/RenderDevice.h" namespace Diligent { diff --git a/Graphics/GraphicsTools/include/ShaderMacroHelper.h b/Graphics/GraphicsTools/include/ShaderMacroHelper.h index c7bfff13..97b8c520 100644 --- a/Graphics/GraphicsTools/include/ShaderMacroHelper.h +++ b/Graphics/GraphicsTools/include/ShaderMacroHelper.h @@ -42,9 +42,9 @@ #include <vector> #include <sstream> #include <iomanip> -#include "BasicTypes.h" -#include "DebugUtilities.h" -#include "Shader.h" +#include "../../GraphicsEngine/interface/Shader.h" +#include "../../../Platforms/Basic/interface/DebugUtilities.h" + namespace Diligent { diff --git a/Graphics/GraphicsTools/include/TextureUploader.h b/Graphics/GraphicsTools/include/TextureUploader.h index 1a9756d5..bbc32a91 100644 --- a/Graphics/GraphicsTools/include/TextureUploader.h +++ b/Graphics/GraphicsTools/include/TextureUploader.h @@ -23,8 +23,8 @@ #pragma once -#include "RenderDevice.h" -#include "DeviceContext.h" +#include "../../GraphicsEngine/interface/RenderDevice.h" +#include "../../GraphicsEngine/interface/DeviceContext.h" namespace Diligent { diff --git a/Graphics/GraphicsTools/include/TextureUploaderBase.h b/Graphics/GraphicsTools/include/TextureUploaderBase.h index b98007ed..919d304a 100644 --- a/Graphics/GraphicsTools/include/TextureUploaderBase.h +++ b/Graphics/GraphicsTools/include/TextureUploaderBase.h @@ -24,9 +24,9 @@ #pragma once #include "TextureUploader.h" -#include "ObjectBase.h" -#include "HashUtils.h" -#include "RefCntAutoPtr.h" +#include "../../../Common/interface/ObjectBase.h" +#include "../../../Common/interface/HashUtils.h" +#include "../../../Common/interface/RefCntAutoPtr.h" namespace std { diff --git a/Graphics/GraphicsTools/include/TextureUploaderD3D11.h b/Graphics/GraphicsTools/include/TextureUploaderD3D11.h index 7886a15b..293c5876 100644 --- a/Graphics/GraphicsTools/include/TextureUploaderD3D11.h +++ b/Graphics/GraphicsTools/include/TextureUploaderD3D11.h @@ -24,6 +24,7 @@ #pragma once #include "TextureUploaderBase.h" + namespace Diligent { class TextureUploaderD3D11 : public TextureUploaderBase |