diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-26 23:21:35 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-26 23:21:35 +0000 |
| commit | 00e8dcdb71c6ae3fefd83958ead19b1d72f544e4 (patch) | |
| tree | 582808f886ffda1a4d9c360a610f2298c06197a2 /Graphics/GraphicsTools | |
| parent | Renamed .h -> .hpp in Common and HLSL2GLSLConverterLib projects (diff) | |
| download | DiligentCore-00e8dcdb71c6ae3fefd83958ead19b1d72f544e4.tar.gz DiligentCore-00e8dcdb71c6ae3fefd83958ead19b1d72f544e4.zip | |
More .h -> .hpp renamings
Diffstat (limited to 'Graphics/GraphicsTools')
| -rw-r--r-- | Graphics/GraphicsTools/interface/CommonlyUsedStates.h | 5 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/interface/GraphicsUtilities.h | 5 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/Graphics/GraphicsTools/interface/CommonlyUsedStates.h b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h index 34c58b19..3b18d6ae 100644 --- a/Graphics/GraphicsTools/interface/CommonlyUsedStates.h +++ b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h @@ -36,8 +36,7 @@ #include "../../GraphicsEngine/interface/RasterizerState.h" #include "../../GraphicsEngine/interface/Sampler.h" -namespace Diligent -{ +DILIGENT_BEGIN_NAMESPACE(Diligent) // clang-format off @@ -224,4 +223,4 @@ static const SamplerDesc Sam_Aniso8xWrap 8 // MaxAnisotropy }; -} +DILIGENT_END_NAMESPACE // namespace Diligent diff --git a/Graphics/GraphicsTools/interface/GraphicsUtilities.h b/Graphics/GraphicsTools/interface/GraphicsUtilities.h index 03dcd829..0ca5ad54 100644 --- a/Graphics/GraphicsTools/interface/GraphicsUtilities.h +++ b/Graphics/GraphicsTools/interface/GraphicsUtilities.h @@ -34,8 +34,7 @@ #include "../../GraphicsEngine/interface/Buffer.h" #include "../../GraphicsEngine/interface/RenderDevice.h" -namespace Diligent -{ +DILIGENT_BEGIN_NAMESPACE(Diligent) void CreateUniformBuffer(IRenderDevice* pDevice, Uint32 Size, @@ -54,4 +53,4 @@ void GenerateCheckerBoardPattern(Uint32 Width, Uint8* pData, Uint32 StrideInBytes); -} // namespace Diligent +DILIGENT_END_NAMESPACE // namespace Diligent diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp index 14fe131a..624a615a 100644 --- a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp +++ b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp @@ -38,7 +38,7 @@ #include "RenderDeviceD3D11.h" #include "DeviceContextD3D11.h" #include "TextureD3D11.h" -#include "DXGITypeConversions.h" +#include "DXGITypeConversions.hpp" #include "ThreadSignal.hpp" #include "GraphicsAccessories.hpp" |