Renamed .h -> .hpp in GraphicsEngineVulkan project

77 files changed, 269 insertions, 269 deletions

diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
index bd670456..5e0a3558 100644
--- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt
+++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -3,49 +3,49 @@ cmake_minimum_required (VERSION 3.10)
 project(Diligent-GraphicsEngineVk CXX)
 
 set(INCLUDE 
-    include/BufferVkImpl.h
-    include/BufferViewVkImpl.h
-    include/CommandListVkImpl.h
-    include/CommandPoolManager.h
-    include/CommandQueueVkImpl.h
-    include/DescriptorPoolManager.h
-    include/DeviceContextVkImpl.h
-    include/FenceVkImpl.h
-    include/VulkanDynamicHeap.h
-    include/FramebufferCache.h
-    include/GenerateMipsVkHelper.h
+    include/BufferVkImpl.hpp
+    include/BufferViewVkImpl.hpp
+    include/CommandListVkImpl.hpp
+    include/CommandPoolManager.hpp
+    include/CommandQueueVkImpl.hpp
+    include/DescriptorPoolManager.hpp
+    include/DeviceContextVkImpl.hpp
+    include/FenceVkImpl.hpp
+    include/VulkanDynamicHeap.hpp
+    include/FramebufferCache.hpp
+    include/GenerateMipsVkHelper.hpp
     include/pch.h
-    include/PipelineLayout.h
-    include/PipelineStateVkImpl.h
-    include/QueryManagerVk.h
-    include/QueryVkImpl.h
-    include/RenderDeviceVkImpl.h
-    include/RenderPassCache.h
-    include/SamplerVkImpl.h
-    include/ShaderVkImpl.h
-    include/ManagedVulkanObject.h
-    include/ShaderResourceBindingVkImpl.h
-    include/ShaderResourceCacheVk.h
-    include/ShaderResourceLayoutVk.h
-    include/ShaderVariableVk.h
-    include/SwapChainVkImpl.h
-    include/TextureVkImpl.h
-    include/TextureViewVkImpl.h
-    include/VulkanErrors.h
-    include/VulkanTypeConversions.h
-    include/VulkanUploadHeap.h
+    include/PipelineLayout.hpp
+    include/PipelineStateVkImpl.hpp
+    include/QueryManagerVk.hpp
+    include/QueryVkImpl.hpp
+    include/RenderDeviceVkImpl.hpp
+    include/RenderPassCache.hpp
+    include/SamplerVkImpl.hpp
+    include/ShaderVkImpl.hpp
+    include/ManagedVulkanObject.hpp
+    include/ShaderResourceBindingVkImpl.hpp
+    include/ShaderResourceCacheVk.hpp
+    include/ShaderResourceLayoutVk.hpp
+    include/ShaderVariableVk.hpp
+    include/SwapChainVkImpl.hpp
+    include/TextureVkImpl.hpp
+    include/TextureViewVkImpl.hpp
+    include/VulkanErrors.hpp
+    include/VulkanTypeConversions.hpp
+    include/VulkanUploadHeap.hpp
 )
 
 set(VULKAN_UTILS_INCLUDE 
-    include/VulkanUtilities/VulkanCommandBuffer.h
-    include/VulkanUtilities/VulkanCommandBufferPool.h
-    include/VulkanUtilities/VulkanDebug.h
-    include/VulkanUtilities/VulkanFencePool.h
-    include/VulkanUtilities/VulkanInstance.h
-    include/VulkanUtilities/VulkanLogicalDevice.h
-    include/VulkanUtilities/VulkanMemoryManager.h
-    include/VulkanUtilities/VulkanObjectWrappers.h
-    include/VulkanUtilities/VulkanPhysicalDevice.h
+    include/VulkanUtilities/VulkanCommandBuffer.hpp
+    include/VulkanUtilities/VulkanCommandBufferPool.hpp
+    include/VulkanUtilities/VulkanDebug.hpp
+    include/VulkanUtilities/VulkanFencePool.hpp
+    include/VulkanUtilities/VulkanInstance.hpp
+    include/VulkanUtilities/VulkanLogicalDevice.hpp
+    include/VulkanUtilities/VulkanMemoryManager.hpp
+    include/VulkanUtilities/VulkanObjectWrappers.hpp
+    include/VulkanUtilities/VulkanPhysicalDevice.hpp
 )
 
 
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.h b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
index d2dc9285..e6a18966 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
@@ -33,8 +33,8 @@
 #include "BufferViewVk.h"
 #include "RenderDeviceVk.h"
 #include "BufferViewBase.hpp"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
index e20551e9..f7ddd538 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
@@ -33,12 +33,12 @@
 #include "BufferVk.h"
 #include "RenderDeviceVk.h"
 #include "BufferBase.hpp"
-#include "BufferViewVkImpl.h"
-#include "VulkanDynamicHeap.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "VulkanUtilities/VulkanMemoryManager.h"
+#include "BufferViewVkImpl.hpp"
+#include "VulkanDynamicHeap.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "VulkanUtilities/VulkanMemoryManager.hpp"
 #include "STDAllocator.h"
-#include "RenderDeviceVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.h b/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.hpp
index 4084e51c..d541ca7d 100644
--- a/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/CommandListVkImpl.hpp
@@ -32,7 +32,7 @@
 
 #include "vulkan.h"
 #include "CommandListBase.hpp"
-#include "RenderDeviceVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/CommandPoolManager.h b/Graphics/GraphicsEngineVulkan/include/CommandPoolManager.hpp
index f4109d64..aeda8ca4 100644
--- a/Graphics/GraphicsEngineVulkan/include/CommandPoolManager.h
+++ b/Graphics/GraphicsEngineVulkan/include/CommandPoolManager.hpp
@@ -31,7 +31,7 @@
 #include <mutex>
 #include <atomic>
 #include "STDAllocator.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.h b/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
index 1934b351..85bda3c4 100644
--- a/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
@@ -35,8 +35,8 @@
 #include "vulkan.h"
 #include "CommandQueueVk.h"
 #include "ObjectBase.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "FenceVkImpl.h"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "FenceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h b/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.hpp
index f408ba33..bba4c285 100644
--- a/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h
+++ b/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.hpp
@@ -34,7 +34,7 @@
 #include <deque>
 #include <mutex>
 #include <atomic>
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
index 120a4f29..b72fcc36 100644
--- a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
@@ -33,21 +33,21 @@
 
 #include "DeviceContextVk.h"
 #include "DeviceContextNextGenBase.hpp"
-#include "VulkanUtilities/VulkanCommandBufferPool.h"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
-#include "VulkanUploadHeap.h"
-#include "VulkanDynamicHeap.h"
+#include "VulkanUtilities/VulkanCommandBufferPool.hpp"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
+#include "VulkanUploadHeap.hpp"
+#include "VulkanDynamicHeap.hpp"
 #include "ResourceReleaseQueue.hpp"
-#include "DescriptorPoolManager.h"
-#include "PipelineLayout.h"
-#include "GenerateMipsVkHelper.h"
-#include "BufferVkImpl.h"
-#include "TextureVkImpl.h"
-#include "PipelineStateVkImpl.h"
-#include "QueryVkImpl.h"
+#include "DescriptorPoolManager.hpp"
+#include "PipelineLayout.hpp"
+#include "GenerateMipsVkHelper.hpp"
+#include "BufferVkImpl.hpp"
+#include "TextureVkImpl.hpp"
+#include "PipelineStateVkImpl.hpp"
+#include "QueryVkImpl.hpp"
 #include "HashUtils.h"
-#include "ManagedVulkanObject.h"
-#include "QueryManagerVk.h"
+#include "ManagedVulkanObject.hpp"
+#include "QueryManagerVk.hpp"
 
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.h b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
index 27aa8510..7005f658 100644
--- a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
@@ -33,8 +33,8 @@
 #include <deque>
 #include "FenceVk.h"
 #include "FenceBase.hpp"
-#include "VulkanUtilities/VulkanFencePool.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanUtilities/VulkanFencePool.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/FramebufferCache.h b/Graphics/GraphicsEngineVulkan/include/FramebufferCache.hpp
index f2efe0f7..406f7f6b 100644
--- a/Graphics/GraphicsEngineVulkan/include/FramebufferCache.h
+++ b/Graphics/GraphicsEngineVulkan/include/FramebufferCache.hpp
@@ -32,7 +32,7 @@
 
 #include <unordered_map>
 #include <mutex>
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/GenerateMipsVkHelper.h b/Graphics/GraphicsEngineVulkan/include/GenerateMipsVkHelper.hpp
index 55c7f4c2..845a70f3 100644
--- a/Graphics/GraphicsEngineVulkan/include/GenerateMipsVkHelper.h
+++ b/Graphics/GraphicsEngineVulkan/include/GenerateMipsVkHelper.hpp
@@ -32,8 +32,8 @@
 
 #include <array>
 #include <unordered_map>
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.h b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
index d2c11471..658e41b1 100644
--- a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.h
+++ b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
@@ -28,8 +28,8 @@
 #pragma once
 
 #include "DeviceObjectBase.hpp"
-#include "RenderDeviceVkImpl.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
+#include "RenderDeviceVkImpl.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.hpp
index acd60630..a0ac52c8 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.hpp
@@ -32,10 +32,10 @@
 #include <array>
 
 #include "ShaderBase.hpp"
-#include "ShaderResourceLayoutVk.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
+#include "ShaderResourceLayoutVk.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
index d41e7ce5..b3cd3d0a 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
@@ -35,15 +35,15 @@
 #include "RenderDeviceVk.h"
 #include "PipelineStateVk.h"
 #include "PipelineStateBase.hpp"
-#include "PipelineLayout.h"
-#include "ShaderResourceLayoutVk.h"
-#include "ShaderVariableVk.h"
+#include "PipelineLayout.hpp"
+#include "ShaderResourceLayoutVk.hpp"
+#include "ShaderVariableVk.hpp"
 #include "FixedBlockMemoryAllocator.h"
 #include "SRBMemoryAllocator.hpp"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
-#include "PipelineLayout.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
+#include "PipelineLayout.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/QueryManagerVk.h b/Graphics/GraphicsEngineVulkan/include/QueryManagerVk.hpp
index a435527d..6c60beaa 100644
--- a/Graphics/GraphicsEngineVulkan/include/QueryManagerVk.h
+++ b/Graphics/GraphicsEngineVulkan/include/QueryManagerVk.hpp
@@ -33,10 +33,10 @@
 #include <vector>
 
 #include "Query.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanPhysicalDevice.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.h b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
index c326ce4f..a17e3fde 100644
--- a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
@@ -32,8 +32,8 @@
 
 #include "QueryVk.h"
 #include "QueryBase.hpp"
-#include "RenderDeviceVkImpl.h"
-#include "QueryManagerVk.h"
+#include "RenderDeviceVkImpl.hpp"
+#include "QueryManagerVk.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
index bd1451f6..3a1c6330 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
@@ -34,20 +34,20 @@
 #include "RenderDeviceVk.h"
 #include "RenderDeviceBase.hpp"
 #include "RenderDeviceNextGenBase.hpp"
-#include "DescriptorPoolManager.h"
-#include "VulkanDynamicHeap.h"
+#include "DescriptorPoolManager.hpp"
+#include "VulkanDynamicHeap.hpp"
 #include "Atomics.h"
 #include "CommandQueueVk.h"
-#include "VulkanUtilities/VulkanInstance.h"
-#include "VulkanUtilities/VulkanPhysicalDevice.h"
-#include "VulkanUtilities/VulkanCommandBufferPool.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "VulkanUtilities/VulkanMemoryManager.h"
-#include "VulkanUploadHeap.h"
-#include "FramebufferCache.h"
-#include "RenderPassCache.h"
-#include "CommandPoolManager.h"
+#include "VulkanUtilities/VulkanInstance.hpp"
+#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
+#include "VulkanUtilities/VulkanCommandBufferPool.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "VulkanUtilities/VulkanMemoryManager.hpp"
+#include "VulkanUploadHeap.hpp"
+#include "FramebufferCache.hpp"
+#include "RenderPassCache.hpp"
+#include "CommandPoolManager.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderPassCache.h b/Graphics/GraphicsEngineVulkan/include/RenderPassCache.hpp
index 2cc0ba95..68587de6 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderPassCache.h
+++ b/Graphics/GraphicsEngineVulkan/include/RenderPassCache.hpp
@@ -35,7 +35,7 @@
 #include "GraphicsTypes.h"
 #include "Constants.h"
 #include "HashUtils.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.h b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
index ed412ed7..37a8d863 100644
--- a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
@@ -33,8 +33,8 @@
 #include "SamplerVk.h"
 #include "RenderDeviceVk.h"
 #include "SamplerBase.hpp"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
index b79177e5..a839222b 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
@@ -34,8 +34,8 @@
 #include "RenderDeviceVk.h"
 #include "ShaderResourceBindingBase.hpp"
 #include "ShaderBase.hpp"
-#include "ShaderResourceCacheVk.h"
-#include "ShaderVariableVk.h"
+#include "ShaderResourceCacheVk.hpp"
+#include "ShaderVariableVk.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceCacheVk.h b/Graphics/GraphicsEngineVulkan/include/ShaderResourceCacheVk.hpp
index a8548dd4..b1c7f56b 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceCacheVk.h
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceCacheVk.hpp
@@ -54,9 +54,9 @@
 // Descriptor set for dynamic resources is assigned at every draw call
 
 #include <vector>
-#include "DescriptorPoolManager.h"
+#include "DescriptorPoolManager.hpp"
 #include "SPIRVShaderResources.hpp"
-#include "BufferVkImpl.h"
+#include "BufferVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.h b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp
index 2cd12452..56615308 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.h
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceLayoutVk.hpp
@@ -103,9 +103,9 @@
 #include "PipelineState.h"
 #include "ShaderBase.hpp"
 #include "HashUtils.h"
-#include "ShaderResourceCacheVk.h"
+#include "ShaderResourceCacheVk.hpp"
 #include "SPIRVShaderResources.hpp"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.h b/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.hpp
index b494f4b5..24931767 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.h
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderVariableVk.hpp
@@ -61,7 +61,7 @@
 
 #include <memory>
 
-#include "ShaderResourceLayoutVk.h"
+#include "ShaderResourceLayoutVk.hpp"
 #include "ShaderResourceVariableBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.h b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
index d1bee3ba..d1801615 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
@@ -34,7 +34,7 @@
 #include "ShaderVk.h"
 #include "ShaderBase.hpp"
 #include "SPIRVShaderResources.hpp"
-#include "RenderDeviceVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.hpp
index 807d7489..961343f2 100644
--- a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.hpp
@@ -32,9 +32,9 @@
 
 #include "SwapChainVk.h"
 #include "SwapChainBase.hpp"
-#include "VulkanUtilities/VulkanInstance.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "ManagedVulkanObject.h"
+#include "VulkanUtilities/VulkanInstance.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "ManagedVulkanObject.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
index abde01ef..5731512f 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
@@ -33,8 +33,8 @@
 #include "TextureViewVk.h"
 #include "RenderDeviceVk.h"
 #include "TextureViewBase.hpp"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
index 2140a43d..8ba8a392 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
@@ -33,9 +33,9 @@
 #include "TextureVk.h"
 #include "RenderDeviceVk.h"
 #include "TextureBase.hpp"
-#include "TextureViewVkImpl.h"
-#include "VulkanUtilities/VulkanMemoryManager.h"
-#include "RenderDeviceVkImpl.h"
+#include "TextureViewVkImpl.hpp"
+#include "VulkanUtilities/VulkanMemoryManager.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h b/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.hpp
index 86b9434a..b9b066b5 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.hpp
@@ -29,9 +29,9 @@
 
 #include <mutex>
 #include "vulkan.h"
-#include "VulkanUtilities/VulkanMemoryManager.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanMemoryManager.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 #include "DynamicHeap.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp
index 5cf1427e..69e665f0 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.hpp
@@ -29,7 +29,7 @@
 
 #include "Errors.h"
 #include "DebugUtilities.h"
-#include "VulkanUtilities/VulkanDebug.h"
+#include "VulkanUtilities/VulkanDebug.hpp"
 
 #define CHECK_VK_ERROR(err, ...)                                                                                                                                 \
     {                                                                                                                                                            \
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h b/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.hpp
index 1f752700..1f752700 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.hpp
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h b/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.hpp
index ce06a912..0de10baf 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUploadHeap.hpp
@@ -28,8 +28,8 @@
 #pragma once
 
 #include <unordered_map>
-#include "VulkanUtilities/VulkanMemoryManager.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanMemoryManager.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp
index 786a2059..786a2059 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBuffer.hpp
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBufferPool.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBufferPool.hpp
index 2a43a8c8..1454a0a5 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBufferPool.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanCommandBufferPool.hpp
@@ -32,8 +32,8 @@
 #include <mutex>
 #include <atomic>
 #include "vulkan.h"
-#include "VulkanLogicalDevice.h"
-#include "VulkanObjectWrappers.h"
+#include "VulkanLogicalDevice.hpp"
+#include "VulkanObjectWrappers.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanDebug.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanDebug.hpp
index ee812f08..ee812f08 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanDebug.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanDebug.hpp
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanFencePool.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanFencePool.hpp
index a768eb77..a1402b99 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanFencePool.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanFencePool.hpp
@@ -30,8 +30,8 @@
 #include <vector>
 #include <memory>
 #include "vulkan.h"
-#include "VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanInstance.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanInstance.hpp
index 5993848c..5993848c 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanInstance.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanInstance.hpp
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanLogicalDevice.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanLogicalDevice.hpp
index b580eb45..b580eb45 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanLogicalDevice.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanLogicalDevice.hpp
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanMemoryManager.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanMemoryManager.hpp
index 53baa84b..afc7c423 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanMemoryManager.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanMemoryManager.hpp
@@ -34,9 +34,9 @@
 #include <string>
 #include "MemoryAllocator.h"
 #include "VariableSizeAllocationsManager.hpp"
-#include "VulkanUtilities/VulkanPhysicalDevice.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 #include "HashUtils.h"
 
 namespace VulkanUtilities
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanObjectWrappers.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanObjectWrappers.hpp
index 03d7cdf7..7e2f8385 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanObjectWrappers.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanObjectWrappers.hpp
@@ -28,7 +28,7 @@
 #pragma once
 
 #include <memory>
-#include "VulkanLogicalDevice.h"
+#include "VulkanLogicalDevice.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp
index 43f4be84..43f4be84 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanPhysicalDevice.hpp
diff --git a/Graphics/GraphicsEngineVulkan/include/pch.h b/Graphics/GraphicsEngineVulkan/include/pch.h
index 2c193f3e..3e19eebd 100644
--- a/Graphics/GraphicsEngineVulkan/include/pch.h
+++ b/Graphics/GraphicsEngineVulkan/include/pch.h
@@ -73,6 +73,6 @@ template <> struct hash<VkFormat>
 #include "PlatformDefinitions.h"
 #include "Errors.h"
 #include "RefCntAutoPtr.h"
-#include "VulkanErrors.h"
+#include "VulkanErrors.hpp"
 #include "RenderDeviceBase.hpp"
 #include "ValidatedCast.h"
diff --git a/Graphics/GraphicsEngineVulkan/src/BufferViewVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BufferViewVkImpl.cpp
index 7552f804..314358ef 100644
--- a/Graphics/GraphicsEngineVulkan/src/BufferViewVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/BufferViewVkImpl.cpp
@@ -26,9 +26,9 @@
  */
 
 #include "pch.h"
-#include "BufferViewVkImpl.h"
-#include "RenderDeviceVkImpl.h"
-#include "BufferVkImpl.h"
+#include "BufferViewVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "BufferVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
index b36a8a76..0a71b354 100644
--- a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
@@ -26,16 +26,16 @@
  */
 
 #include "pch.h"
-#include "BufferVkImpl.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "VulkanTypeConversions.h"
-#include "BufferViewVkImpl.h"
+#include "BufferVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
+#include "BufferViewVkImpl.hpp"
 #include "GraphicsAccessories.hpp"
 #include "EngineMemory.h"
 #include "StringTools.h"
-#include "VulkanUtilities/VulkanDebug.h"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
+#include "VulkanUtilities/VulkanDebug.hpp"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp b/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp
index 97e67c1a..1c0f21c5 100644
--- a/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "CommandPoolManager.h"
-#include "RenderDeviceVkImpl.h"
+#include "CommandPoolManager.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/CommandQueueVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/CommandQueueVkImpl.cpp
index f62951e5..147e8c56 100644
--- a/Graphics/GraphicsEngineVulkan/src/CommandQueueVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/CommandQueueVkImpl.cpp
@@ -27,7 +27,7 @@
 
 #include <thread>
 #include "pch.h"
-#include "CommandQueueVkImpl.h"
+#include "CommandQueueVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/DescriptorPoolManager.cpp b/Graphics/GraphicsEngineVulkan/src/DescriptorPoolManager.cpp
index 99ae5d55..a4cf5973 100644
--- a/Graphics/GraphicsEngineVulkan/src/DescriptorPoolManager.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/DescriptorPoolManager.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "DescriptorPoolManager.h"
-#include "RenderDeviceVkImpl.h"
+#include "DescriptorPoolManager.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
index 9584d499..75b1305d 100644
--- a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
@@ -27,14 +27,14 @@
 
 #include "pch.h"
 #include <sstream>
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "PipelineStateVkImpl.h"
-#include "TextureVkImpl.h"
-#include "BufferVkImpl.h"
-#include "VulkanTypeConversions.h"
-#include "CommandListVkImpl.h"
-#include "FenceVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "PipelineStateVkImpl.hpp"
+#include "TextureVkImpl.hpp"
+#include "BufferVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
+#include "CommandListVkImpl.hpp"
+#include "FenceVkImpl.hpp"
 #include "GraphicsAccessories.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
index 8614c925..b34a8689 100644
--- a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
@@ -31,13 +31,13 @@
 #include "pch.h"
 #include <array>
 #include "EngineFactoryVk.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "SwapChainVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "SwapChainVkImpl.hpp"
 #include "EngineMemory.h"
-#include "CommandQueueVkImpl.h"
-#include "VulkanUtilities/VulkanInstance.h"
-#include "VulkanUtilities/VulkanPhysicalDevice.h"
+#include "CommandQueueVkImpl.hpp"
+#include "VulkanUtilities/VulkanInstance.hpp"
+#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
 #include "EngineFactoryBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/FenceVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/FenceVkImpl.cpp
index 6b38ac7d..8b73ea74 100644
--- a/Graphics/GraphicsEngineVulkan/src/FenceVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/FenceVkImpl.cpp
@@ -27,9 +27,9 @@
 
 #include "pch.h"
 
-#include "FenceVkImpl.h"
+#include "FenceVkImpl.hpp"
 #include "EngineMemory.h"
-#include "RenderDeviceVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp b/Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp
index d6c84d02..a6a0fe97 100644
--- a/Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/FramebufferCache.cpp
@@ -26,9 +26,9 @@
  */
 
 #include "pch.h"
-#include "FramebufferCache.h"
+#include "FramebufferCache.hpp"
 #include "HashUtils.h"
-#include "RenderDeviceVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
index 7aaa1838..dcfccc7f 100644
--- a/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/GenerateMipsVkHelper.cpp
@@ -27,13 +27,13 @@
 
 #include "pch.h"
 #include <sstream>
-#include "GenerateMipsVkHelper.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "TextureViewVkImpl.h"
-#include "TextureVkImpl.h"
+#include "GenerateMipsVkHelper.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "TextureViewVkImpl.hpp"
+#include "TextureVkImpl.hpp"
 #include "PlatformMisc.h"
-#include "VulkanTypeConversions.h"
+#include "VulkanTypeConversions.hpp"
 #include "../../GraphicsTools/interface/ShaderMacroHelper.hpp"
 #include "../../GraphicsTools/interface/CommonlyUsedStates.h"
 #include "../../GraphicsTools/interface/MapHelper.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
index 81f354de..c4d1f42e 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
@@ -27,14 +27,14 @@
 
 #include "pch.h"
 
-#include "PipelineLayout.h"
-#include "ShaderResourceLayoutVk.h"
-#include "ShaderVkImpl.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "TextureVkImpl.h"
-#include "BufferVkImpl.h"
-#include "VulkanTypeConversions.h"
+#include "PipelineLayout.hpp"
+#include "ShaderResourceLayoutVk.hpp"
+#include "ShaderVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "TextureVkImpl.hpp"
+#include "BufferVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
 #include "HashUtils.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
index d507bdc1..46c67a9f 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
@@ -27,12 +27,12 @@
 
 #include "pch.h"
 #include <array>
-#include "PipelineStateVkImpl.h"
-#include "ShaderVkImpl.h"
-#include "VulkanTypeConversions.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "ShaderResourceBindingVkImpl.h"
+#include "PipelineStateVkImpl.hpp"
+#include "ShaderVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "ShaderResourceBindingVkImpl.hpp"
 #include "EngineMemory.h"
 #include "StringTools.h"
 #include "spirv-tools/optimizer.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/src/QueryManagerVk.cpp b/Graphics/GraphicsEngineVulkan/src/QueryManagerVk.cpp
index 2cd6cff1..901f7228 100644
--- a/Graphics/GraphicsEngineVulkan/src/QueryManagerVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/QueryManagerVk.cpp
@@ -27,10 +27,10 @@
 
 #include "pch.h"
 #include <algorithm>
-#include "QueryManagerVk.h"
-#include "RenderDeviceVkImpl.h"
+#include "QueryManagerVk.hpp"
+#include "RenderDeviceVkImpl.hpp"
 #include "GraphicsAccessories.hpp"
-#include "VulkanUtilities/VulkanCommandBuffer.h"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/QueryVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/QueryVkImpl.cpp
index 60f33ed9..b4464d50 100644
--- a/Graphics/GraphicsEngineVulkan/src/QueryVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/QueryVkImpl.cpp
@@ -27,10 +27,10 @@
 
 #include "pch.h"
 
-#include "QueryVkImpl.h"
+#include "QueryVkImpl.hpp"
 #include "EngineMemory.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp
index 64853356..6f81e96c 100644
--- a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp
@@ -26,17 +26,17 @@
  */
 
 #include "pch.h"
-#include "RenderDeviceVkImpl.h"
-#include "PipelineStateVkImpl.h"
-#include "ShaderVkImpl.h"
-#include "TextureVkImpl.h"
-#include "VulkanTypeConversions.h"
-#include "SamplerVkImpl.h"
-#include "BufferVkImpl.h"
-#include "ShaderResourceBindingVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "FenceVkImpl.h"
-#include "QueryVkImpl.h"
+#include "RenderDeviceVkImpl.hpp"
+#include "PipelineStateVkImpl.hpp"
+#include "ShaderVkImpl.hpp"
+#include "TextureVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
+#include "SamplerVkImpl.hpp"
+#include "BufferVkImpl.hpp"
+#include "ShaderResourceBindingVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "FenceVkImpl.hpp"
+#include "QueryVkImpl.hpp"
 #include "EngineMemory.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/RenderPassCache.cpp b/Graphics/GraphicsEngineVulkan/src/RenderPassCache.cpp
index c3e61cac..7c7c404d 100644
--- a/Graphics/GraphicsEngineVulkan/src/RenderPassCache.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/RenderPassCache.cpp
@@ -27,9 +27,9 @@
 
 #include "pch.h"
 #include <sstream>
-#include "RenderPassCache.h"
-#include "RenderDeviceVkImpl.h"
-#include "PipelineStateVkImpl.h"
+#include "RenderPassCache.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "PipelineStateVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp
index fc174461..13800f49 100644
--- a/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/SamplerVkImpl.cpp
@@ -26,9 +26,9 @@
  */
 
 #include "pch.h"
-#include "SamplerVkImpl.h"
-#include "RenderDeviceVkImpl.h"
-#include "VulkanTypeConversions.h"
+#include "SamplerVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
index 49aa090a..da361e1a 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
@@ -26,10 +26,10 @@
  */
 
 #include "pch.h"
-#include "ShaderResourceBindingVkImpl.h"
-#include "PipelineStateVkImpl.h"
-#include "ShaderVkImpl.h"
-#include "RenderDeviceVkImpl.h"
+#include "ShaderResourceBindingVkImpl.hpp"
+#include "PipelineStateVkImpl.hpp"
+#include "ShaderVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp
index 8320bc35..1f09846a 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp
@@ -27,13 +27,13 @@
 
 #include "pch.h"
 
-#include "ShaderResourceCacheVk.h"
-#include "DeviceContextVkImpl.h"
-#include "BufferViewVkImpl.h"
-#include "TextureViewVkImpl.h"
-#include "TextureVkImpl.h"
-#include "SamplerVkImpl.h"
-#include "VulkanTypeConversions.h"
+#include "ShaderResourceCacheVk.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "BufferViewVkImpl.hpp"
+#include "TextureViewVkImpl.hpp"
+#include "TextureVkImpl.hpp"
+#include "SamplerVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp
index fb383f37..f362c752 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceLayoutVk.cpp
@@ -27,18 +27,18 @@
 
 #include "pch.h"
 
-#include "ShaderResourceLayoutVk.h"
-#include "ShaderResourceCacheVk.h"
-#include "BufferVkImpl.h"
+#include "ShaderResourceLayoutVk.hpp"
+#include "ShaderResourceCacheVk.hpp"
+#include "BufferVkImpl.hpp"
 #include "BufferViewVk.h"
-#include "TextureVkImpl.h"
-#include "TextureViewVkImpl.h"
-#include "SamplerVkImpl.h"
-#include "ShaderVkImpl.h"
-#include "PipelineLayout.h"
+#include "TextureVkImpl.hpp"
+#include "TextureViewVkImpl.hpp"
+#include "SamplerVkImpl.hpp"
+#include "ShaderVkImpl.hpp"
+#include "PipelineLayout.hpp"
 #include "ShaderResourceVariableBase.hpp"
 #include "StringTools.h"
-#include "PipelineStateVkImpl.h"
+#include "PipelineStateVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp
index 8c8a4460..8f476082 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderVariableVk.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 
-#include "ShaderVariableVk.h"
+#include "ShaderVariableVk.hpp"
 #include "ShaderResourceVariableBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp
index fb749ad4..da5d30e6 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp
@@ -29,8 +29,8 @@
 #include <cctype>
 #include "pch.h"
 
-#include "ShaderVkImpl.h"
-#include "RenderDeviceVkImpl.h"
+#include "ShaderVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
 #include "DataBlobImpl.h"
 #include "GLSLSourceBuilder.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
index bd0bf0cf..2a906a2b 100644
--- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
@@ -26,11 +26,11 @@
  */
 
 #include "pch.h"
-#include "SwapChainVkImpl.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "VulkanTypeConversions.h"
-#include "TextureVkImpl.h"
+#include "SwapChainVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
+#include "TextureVkImpl.hpp"
 #include "EngineMemory.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/TextureViewVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/TextureViewVkImpl.cpp
index 2ac64270..1c65b3d5 100644
--- a/Graphics/GraphicsEngineVulkan/src/TextureViewVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/TextureViewVkImpl.cpp
@@ -26,9 +26,9 @@
  */
 
 #include "pch.h"
-#include "TextureViewVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "RenderDeviceVkImpl.h"
+#include "TextureViewVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp
index 85686d2c..0ce92558 100644
--- a/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp
@@ -26,12 +26,12 @@
  */
 
 #include "pch.h"
-#include "TextureVkImpl.h"
-#include "RenderDeviceVkImpl.h"
-#include "DeviceContextVkImpl.h"
-#include "VulkanTypeConversions.h"
-#include "TextureViewVkImpl.h"
-#include "VulkanTypeConversions.h"
+#include "TextureVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
+#include "DeviceContextVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
+#include "TextureViewVkImpl.hpp"
+#include "VulkanTypeConversions.hpp"
 #include "EngineMemory.h"
 #include "StringTools.h"
 #include "GraphicsAccessories.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanDynamicHeap.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanDynamicHeap.cpp
index f158106b..c1af82ea 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanDynamicHeap.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanDynamicHeap.cpp
@@ -28,8 +28,8 @@
 #include "pch.h"
 #include <chrono>
 #include <thread>
-#include "VulkanDynamicHeap.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanDynamicHeap.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
index 5bf3ada9..bf8d8517 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
@@ -29,7 +29,7 @@
 #include <unordered_map>
 #include <array>
 
-#include "VulkanTypeConversions.h"
+#include "VulkanTypeConversions.hpp"
 #include "PlatformMisc.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUploadHeap.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUploadHeap.cpp
index aea4693c..5a1894c0 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUploadHeap.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUploadHeap.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "VulkanUploadHeap.h"
-#include "RenderDeviceVkImpl.h"
+#include "VulkanUploadHeap.hpp"
+#include "RenderDeviceVkImpl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBuffer.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBuffer.cpp
index e14d963b..11444c33 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBuffer.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBuffer.cpp
@@ -26,7 +26,7 @@
  */
 #include <sstream>
 
-#include "VulkanUtilities/VulkanCommandBuffer.h"
+#include "VulkanUtilities/VulkanCommandBuffer.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp
index 7fa9ea7e..83e6db4f 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanCommandBufferPool.cpp
@@ -26,11 +26,11 @@
  */
 #include <sstream>
 
-#include "VulkanUtilities/VulkanCommandBufferPool.h"
-#include "VulkanUtilities/VulkanDebug.h"
+#include "VulkanUtilities/VulkanCommandBufferPool.hpp"
+#include "VulkanUtilities/VulkanDebug.hpp"
 #include "Errors.h"
 #include "DebugUtilities.h"
-#include "VulkanErrors.h"
+#include "VulkanErrors.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
index 428f8ead..af5d2d64 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
@@ -11,8 +11,8 @@
 #include <sstream>
 #include <cstring>
 
-#include "VulkanUtilities/VulkanDebug.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
+#include "VulkanUtilities/VulkanDebug.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
 #include "Errors.h"
 #include "DebugUtilities.h"
 
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp
index b65efbac..8db94750 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanFencePool.cpp
@@ -26,7 +26,7 @@
  */
 #include <sstream>
 
-#include "VulkanUtilities/VulkanFencePool.h"
+#include "VulkanUtilities/VulkanFencePool.hpp"
 #include "Errors.h"
 #include "DebugUtilities.h"
 
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp
index 5392e208..9f6334a2 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp
@@ -27,9 +27,9 @@
 
 #include <vector>
 #include <cstring>
-#include "VulkanErrors.h"
-#include "VulkanUtilities/VulkanInstance.h"
-#include "VulkanUtilities/VulkanDebug.h"
+#include "VulkanErrors.hpp"
+#include "VulkanUtilities/VulkanInstance.hpp"
+#include "VulkanUtilities/VulkanDebug.hpp"
 
 #if !NO_GLSLANG
 #    include "SPIRVUtils.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanLogicalDevice.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanLogicalDevice.cpp
index 23fd559e..4f69421d 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanLogicalDevice.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanLogicalDevice.cpp
@@ -26,10 +26,10 @@
  */
 
 #include <limits>
-#include "VulkanErrors.h"
-#include "VulkanUtilities/VulkanLogicalDevice.h"
-#include "VulkanUtilities/VulkanDebug.h"
-#include "VulkanUtilities/VulkanObjectWrappers.h"
+#include "VulkanErrors.hpp"
+#include "VulkanUtilities/VulkanLogicalDevice.hpp"
+#include "VulkanUtilities/VulkanDebug.hpp"
+#include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp
index 53bb289d..a125233f 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp
@@ -27,7 +27,7 @@
 
 #include "pch.h"
 #include <sstream>
-#include "VulkanUtilities/VulkanMemoryManager.h"
+#include "VulkanUtilities/VulkanMemoryManager.hpp"
 
 namespace VulkanUtilities
 {
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp
index 8a592044..11eb766d 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanPhysicalDevice.cpp
@@ -27,8 +27,8 @@
 
 #include <limits>
 #include <cstring>
-#include "VulkanErrors.h"
-#include "VulkanUtilities/VulkanPhysicalDevice.h"
+#include "VulkanErrors.hpp"
+#include "VulkanUtilities/VulkanPhysicalDevice.hpp"
 
 namespace VulkanUtilities
 {