summaryrefslogtreecommitdiffstats
path: root/Graphics
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-01-27 01:44:22 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-01-27 01:44:22 +0000
commita77db60fed81e8e6492806d82d50ef570f70706b (patch)
treef3345c20a74af12d3aecd99cafaf36f376384cbf /Graphics
parentRenamed .h -> .hpp in DiligentCoreAPITest project (diff)
downloadDiligentCore-a77db60fed81e8e6492806d82d50ef570f70706b.tar.gz
DiligentCore-a77db60fed81e8e6492806d82d50ef570f70706b.zip
Renamed platform headers .h -> .hpp
Diffstat (limited to 'Graphics')
-rw-r--r--Graphics/GLSLTools/src/GLSLSourceBuilder.cpp2
-rw-r--r--Graphics/GLSLTools/src/SPIRVUtils.cpp2
-rw-r--r--Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp2
-rw-r--r--Graphics/GraphicsAccessories/interface/ResourceReleaseQueue.hpp4
-rw-r--r--Graphics/GraphicsAccessories/interface/RingBuffer.hpp2
-rw-r--r--Graphics/GraphicsAccessories/interface/VariableSizeAllocationsManager.hpp2
-rw-r--r--Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp2
-rw-r--r--Graphics/GraphicsEngine/include/DeviceContextBase.hpp2
-rw-r--r--Graphics/GraphicsEngine/include/ShaderBase.hpp2
-rw-r--r--Graphics/GraphicsEngine/include/pch.h2
-rw-r--r--Graphics/GraphicsEngineD3D11/include/pch.h2
-rw-r--r--Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp2
-rw-r--r--Graphics/GraphicsEngineD3D12/include/pch.h2
-rw-r--r--Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp2
-rw-r--r--Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp2
-rw-r--r--Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp2
-rw-r--r--Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp4
-rw-r--r--Graphics/GraphicsEngineOpenGL/include/pch.h2
-rw-r--r--Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp2
-rw-r--r--Graphics/GraphicsTools/interface/MapHelper.hpp2
-rw-r--r--Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp2
-rw-r--r--Graphics/GraphicsTools/src/GraphicsUtilities.cpp2
-rw-r--r--Graphics/HLSL2GLSLConverterLib/include/pch.h5
-rw-r--r--Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp2
32 files changed, 35 insertions, 36 deletions
diff --git a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp
index 539d998f..d415aee2 100644
--- a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp
+++ b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp
@@ -29,7 +29,7 @@
#include <sstream>
#include "GLSLSourceBuilder.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "HLSL2GLSLConverterImpl.hpp"
#include "RefCntAutoPtr.hpp"
#include "DataBlobImpl.hpp"
diff --git a/Graphics/GLSLTools/src/SPIRVUtils.cpp b/Graphics/GLSLTools/src/SPIRVUtils.cpp
index 17906e39..47c1c563 100644
--- a/Graphics/GLSLTools/src/SPIRVUtils.cpp
+++ b/Graphics/GLSLTools/src/SPIRVUtils.cpp
@@ -38,7 +38,7 @@
#endif
#include "SPIRVUtils.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "DataBlobImpl.hpp"
#include "RefCntAutoPtr.hpp"
diff --git a/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp b/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp
index 461bb3b4..9b0547cc 100644
--- a/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp
+++ b/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp
@@ -35,7 +35,7 @@
#include "../../GraphicsEngine/interface/Texture.h"
#include "../../GraphicsEngine/interface/Buffer.h"
#include "../../GraphicsEngine/interface/RenderDevice.h"
-#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsAccessories/interface/ResourceReleaseQueue.hpp b/Graphics/GraphicsAccessories/interface/ResourceReleaseQueue.hpp
index 21fbcefb..e9660101 100644
--- a/Graphics/GraphicsAccessories/interface/ResourceReleaseQueue.hpp
+++ b/Graphics/GraphicsAccessories/interface/ResourceReleaseQueue.hpp
@@ -38,8 +38,8 @@
#include "../../../Primitives/interface/MemoryAllocator.h"
#include "../../../Common/interface/STDAllocator.hpp"
-#include "../../../Platforms/interface/Atomics.h"
-#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/interface/Atomics.hpp"
+#include "../../../Platforms/Basic/interface/DebugUtilities.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsAccessories/interface/RingBuffer.hpp b/Graphics/GraphicsAccessories/interface/RingBuffer.hpp
index 0dccfb94..e258cd92 100644
--- a/Graphics/GraphicsAccessories/interface/RingBuffer.hpp
+++ b/Graphics/GraphicsAccessories/interface/RingBuffer.hpp
@@ -33,7 +33,7 @@
#include <deque>
#include "../../../Primitives/interface/MemoryAllocator.h"
-#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.hpp"
#include "../../../Common/interface/Align.hpp"
#include "../../../Common/interface/STDAllocator.hpp"
diff --git a/Graphics/GraphicsAccessories/interface/VariableSizeAllocationsManager.hpp b/Graphics/GraphicsAccessories/interface/VariableSizeAllocationsManager.hpp
index 33e56ccb..410e8568 100644
--- a/Graphics/GraphicsAccessories/interface/VariableSizeAllocationsManager.hpp
+++ b/Graphics/GraphicsAccessories/interface/VariableSizeAllocationsManager.hpp
@@ -34,7 +34,7 @@
#include <algorithm>
#include "../../../Primitives/interface/MemoryAllocator.h"
-#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.hpp"
#include "../../../Common/interface/Align.hpp"
#include "../../../Common/interface/STDAllocator.hpp"
diff --git a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
index 44393012..609970b1 100644
--- a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
+++ b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
@@ -28,7 +28,7 @@
#include <algorithm>
#include "GraphicsAccessories.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "Align.hpp"
namespace Diligent
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp
index 611c591c..827ba0ae 100644
--- a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp
+++ b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp
@@ -37,7 +37,7 @@
#include "ResourceMapping.h"
#include "Sampler.h"
#include "ObjectBase.h"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "ValidatedCast.hpp"
#include "GraphicsAccessories.hpp"
#include "TextureBase.hpp"
diff --git a/Graphics/GraphicsEngine/include/ShaderBase.hpp b/Graphics/GraphicsEngine/include/ShaderBase.hpp
index 5e7c2d33..3aac5a2d 100644
--- a/Graphics/GraphicsEngine/include/ShaderBase.hpp
+++ b/Graphics/GraphicsEngine/include/ShaderBase.hpp
@@ -35,7 +35,7 @@
#include "Shader.h"
#include "DeviceObjectBase.hpp"
#include "STDAllocator.hpp"
-#include "PlatformMisc.h"
+#include "PlatformMisc.hpp"
#include "EngineMemory.h"
#include "Align.hpp"
diff --git a/Graphics/GraphicsEngine/include/pch.h b/Graphics/GraphicsEngine/include/pch.h
index fe8bf9de..74889e44 100644
--- a/Graphics/GraphicsEngine/include/pch.h
+++ b/Graphics/GraphicsEngine/include/pch.h
@@ -40,6 +40,6 @@
#include "GraphicsTypes.h"
#include "RefCntAutoPtr.hpp"
#include "Errors.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "RenderDeviceBase.hpp"
#include "DeviceContextBase.hpp" \ No newline at end of file
diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h
index 6018b4b8..b0ecd5be 100644
--- a/Graphics/GraphicsEngineD3D11/include/pch.h
+++ b/Graphics/GraphicsEngineD3D11/include/pch.h
@@ -73,7 +73,7 @@
#include "EngineD3D11Defines.h"
#include "Errors.hpp"
#include "RefCntAutoPtr.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "D3DErrors.hpp"
#include "RenderDeviceBase.hpp"
#include "D3D11TypeConversions.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
index 162828e9..75def797 100644
--- a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
@@ -36,7 +36,7 @@
#include "CommandListManager.hpp"
#include "CommandContext.hpp"
#include "D3D12DynamicHeap.hpp"
-#include "Atomics.h"
+#include "Atomics.hpp"
#include "CommandQueueD3D12.h"
#include "GenerateMips.hpp"
#include "QueryManagerD3D12.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/pch.h b/Graphics/GraphicsEngineD3D12/include/pch.h
index 0a7bdfce..87c6f02a 100644
--- a/Graphics/GraphicsEngineD3D12/include/pch.h
+++ b/Graphics/GraphicsEngineD3D12/include/pch.h
@@ -49,7 +49,7 @@
#include "PlatformDefinitions.h"
#include "Errors.hpp"
#include "RefCntAutoPtr.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "D3DErrors.hpp"
#include "RenderDeviceBase.hpp"
#include "ValidatedCast.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
index e1da052f..124201ff 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -35,7 +35,7 @@
#include "D3D12TypeDefinitions.h"
#include "D3DTypeConversionImpl.hpp"
#include "D3DViewDescConversionImpl.hpp"
-#include "PlatformMisc.h"
+#include "PlatformMisc.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp b/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp
index a181d534..2c9ba74e 100644
--- a/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp
@@ -27,7 +27,7 @@
#include "DXGITypeConversions.hpp"
#include "BasicTypes.h"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp
index 9dccaf17..84f8d60a 100644
--- a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp
+++ b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp
@@ -27,7 +27,7 @@
#pragma once
-#include "Atomics.h"
+#include "Atomics.hpp"
#include "BasicTypes.h"
#include "ReferenceCounters.h"
#include "RefCntAutoPtr.hpp"
diff --git a/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp b/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp
index 13bc944b..2ee8a3d1 100644
--- a/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp
+++ b/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp
@@ -31,12 +31,12 @@
#include <mutex>
#include "EngineFactory.h"
-#include "Atomics.h"
+#include "Atomics.hpp"
#include "BasicTypes.h"
#include "ReferenceCounters.h"
#include "MemoryAllocator.h"
#include "RefCntAutoPtr.hpp"
-#include "PlatformMisc.h"
+#include "PlatformMisc.hpp"
#include "ResourceReleaseQueue.hpp"
#include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineOpenGL/include/pch.h b/Graphics/GraphicsEngineOpenGL/include/pch.h
index 1bec7dc5..384b1ae5 100644
--- a/Graphics/GraphicsEngineOpenGL/include/pch.h
+++ b/Graphics/GraphicsEngineOpenGL/include/pch.h
@@ -116,7 +116,7 @@
#include "PlatformDefinitions.h"
#include "RefCntAutoPtr.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "GLObjectWrapper.hpp"
#include "ValidatedCast.hpp"
#include "RenderDevice.h"
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp
index f7ef32cd..f0110128 100644
--- a/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/GLPipelineResourceLayout.cpp
@@ -29,7 +29,7 @@
#include <array>
#include "GLPipelineResourceLayout.hpp"
#include "Align.hpp"
-#include "PlatformMisc.h"
+#include "PlatformMisc.hpp"
#include "ShaderBase.hpp"
namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
index 3a1c6330..3b76ac99 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
@@ -36,7 +36,7 @@
#include "RenderDeviceNextGenBase.hpp"
#include "DescriptorPoolManager.hpp"
#include "VulkanDynamicHeap.hpp"
-#include "Atomics.h"
+#include "Atomics.hpp"
#include "CommandQueueVk.h"
#include "VulkanUtilities/VulkanInstance.hpp"
#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp
index 38f7a8d6..6180a258 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp
@@ -28,7 +28,7 @@
#pragma once
#include "Errors.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "VulkanUtilities/VulkanDebug.hpp"
#define CHECK_VK_ERROR(err, ...) \
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp
index 786a2059..dbbfe91a 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp
@@ -28,7 +28,7 @@
#pragma once
#include "vulkan.h"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
namespace VulkanUtilities
{
diff --git a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
index dcfccc7f..9686d237 100644
--- a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
@@ -32,7 +32,7 @@
#include "DeviceContextVkImpl.hpp"
#include "TextureViewVkImpl.hpp"
#include "TextureVkImpl.hpp"
-#include "PlatformMisc.h"
+#include "PlatformMisc.hpp"
#include "VulkanTypeConversions.hpp"
#include "../../GraphicsTools/interface/ShaderMacroHelper.hpp"
#include "../../GraphicsTools/interface/CommonlyUsedStates.h"
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
index bf8d8517..d58b430d 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
@@ -30,7 +30,7 @@
#include <array>
#include "VulkanTypeConversions.hpp"
-#include "PlatformMisc.h"
+#include "PlatformMisc.hpp"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp
index bc6594aa..c0f49db1 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp
@@ -29,7 +29,7 @@
#include "VulkanUtilities/VulkanCommandBufferPool.hpp"
#include "VulkanUtilities/VulkanDebug.hpp"
#include "Errors.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "VulkanErrors.hpp"
namespace VulkanUtilities
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
index 80064795..8046b63b 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
@@ -14,7 +14,7 @@
#include "VulkanUtilities/VulkanDebug.hpp"
#include "VulkanUtilities/VulkanLogicalDevice.hpp"
#include "Errors.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
namespace VulkanUtilities
{
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp
index df2c9e14..b4d57a7c 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp
@@ -28,7 +28,7 @@
#include "VulkanUtilities/VulkanFencePool.hpp"
#include "Errors.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
namespace VulkanUtilities
{
diff --git a/Graphics/GraphicsTools/interface/MapHelper.hpp b/Graphics/GraphicsTools/interface/MapHelper.hpp
index d1cd9279..5a307222 100644
--- a/Graphics/GraphicsTools/interface/MapHelper.hpp
+++ b/Graphics/GraphicsTools/interface/MapHelper.hpp
@@ -30,7 +30,7 @@
/// \file
/// Definition of the Diligent::MapHelper helper template class
-#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.hpp"
#include "../../../Common/interface/RefCntAutoPtr.hpp"
#include "../../GraphicsEngine/interface/DeviceContext.h"
#include "../../GraphicsEngine/interface/Buffer.h"
diff --git a/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp b/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
index f566b702..15b9b59e 100644
--- a/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
+++ b/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
@@ -47,7 +47,7 @@
#include <sstream>
#include <iomanip>
#include "../../GraphicsEngine/interface/Shader.h"
-#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.hpp"
namespace Diligent
diff --git a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
index b2bf2c39..375b67dc 100644
--- a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
+++ b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
@@ -30,7 +30,7 @@
#include <cmath>
#include "GraphicsUtilities.h"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "GraphicsAccessories.hpp"
#include "ColorConversion.h"
diff --git a/Graphics/HLSL2GLSLConverterLib/include/pch.h b/Graphics/HLSL2GLSLConverterLib/include/pch.h
index a04fc63a..5e50abf7 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/pch.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/pch.h
@@ -38,9 +38,6 @@
#include "Errors.hpp"
#include "PlatformDefinitions.h"
#include "RefCntAutoPtr.hpp"
-#include "DebugUtilities.h"
+#include "DebugUtilities.hpp"
#include "ValidatedCast.hpp"
#include "RenderDevice.h"
-
-using namespace Diligent;
-using namespace std;
diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
index 0d3755c1..d8c0d8c2 100644
--- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
+++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
@@ -363,6 +363,8 @@
#include "StringDataBlobImpl.hpp"
#include "StringTools.hpp"
+using namespace std;
+
namespace Diligent
{