code cleanup

23 files changed, 5 insertions, 51 deletions

diff --git a/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp
index 3f421920..a38bc849 100644
--- a/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Definition of the Diligent::BottomLevelASVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "BottomLevelASVk.h"
 #include "BottomLevelASBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 #include "VulkanUtilities/VulkanMemoryManager.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
index 09d4b6dc..9283f6bd 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BufferViewVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "BufferViewVk.h"
 #include "BufferViewBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
index 2144fafc..e9a16e54 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BufferVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "BufferVk.h"
 #include "BufferBase.hpp"
 #include "BufferViewVkImpl.hpp" // Required by BufferBase
 
diff --git a/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
index a9a61dee..d07ce349 100644
--- a/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
@@ -35,7 +35,6 @@
 #include <atomic>
 
 #include "EngineVkImplTraits.hpp"
-#include "CommandQueueVk.h"
 #include "ObjectBase.hpp"
 #include "FenceVkImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
index 2d37aa1e..b3d1e1b2 100644
--- a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
@@ -34,8 +34,6 @@
 #include <bitset>
 
 #include "EngineVkImplTraits.hpp"
-
-#include "DeviceContextVk.h"
 #include "DeviceContextNextGenBase.hpp"
 
 // Vk object implementations are required by DeviceContextBase
diff --git a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
index 21b2a7b9..d7b8f6ff 100644
--- a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
@@ -34,7 +34,6 @@
 #include <atomic>
 
 #include "EngineVkImplTraits.hpp"
-#include "FenceVk.h"
 #include "FenceBase.hpp"
 #include "VulkanUtilities/VulkanFencePool.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp
index 19d4fd2a..94d37835 100644
--- a/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::FramebufferVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "FramebufferVk.h"
 #include "FramebufferBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
index 18f1cf65..cb2c0ae7 100644
--- a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
@@ -34,8 +34,6 @@
 namespace Diligent
 {
 
-class RenderDeviceVkImpl;
-
 template <typename VulkanObjectWrapperType>
 class ManagedVulkanObject : public DeviceObjectBase<IDeviceObject, RenderDeviceVkImpl, DeviceObjectAttribs>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp
index 5823f884..bd27267a 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp
@@ -48,8 +48,6 @@
 namespace Diligent
 {
 
-class RenderDeviceVkImpl;
-class ShaderVariableManagerVk;
 struct SPIRVShaderResourceAttribs;
 
 /// Implementation of the Diligent::PipelineResourceSignatureVkImpl class
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
index 9f336fe5..8cd27ea3 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
@@ -34,7 +34,6 @@
 #include <memory>
 
 #include "EngineVkImplTraits.hpp"
-#include "PipelineStateVk.h"
 #include "PipelineStateBase.hpp"
 #include "PipelineResourceSignatureVkImpl.hpp" // Required by PipelineStateBase
 
@@ -48,11 +47,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-class ShaderVariableManagerVk;
-class ShaderVkImpl;
-class ShaderResourceBindingVkImpl;
-
 /// Pipeline state object implementation in Vulkan backend.
 class PipelineStateVkImpl final : public PipelineStateBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
index 76f94f85..45e089dc 100644
--- a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
@@ -33,15 +33,12 @@
 #include <array>
 
 #include "EngineVkImplTraits.hpp"
-#include "QueryVk.h"
 #include "QueryBase.hpp"
 #include "QueryManagerVk.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Query implementation in Vulkan backend.
 class QueryVkImpl final : public QueryBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
index d9145764..9fd7e8c3 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
@@ -33,8 +33,6 @@
 
 #include "EngineVkImplTraits.hpp"
 
-#include "CommandQueueVk.h"
-
 #include "RenderDeviceBase.hpp"
 #include "RenderDeviceNextGenBase.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp
index d155a0cd..8cca21e8 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp
@@ -30,17 +30,13 @@
 /// \file
 /// Declaration of Diligent::RenderPassVkImpl class
 
-#include "RenderDeviceVk.h"
-#include "RenderPassVk.h"
+#include "EngineVkImplTraits.hpp"
 #include "RenderPassBase.hpp"
-#include "RenderDeviceVkImpl.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Render pass implementation in Vulkan backend.
 class RenderPassVkImpl final : public RenderPassBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
index 5a74d660..2ba83141 100644
--- a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
@@ -31,15 +31,12 @@
 /// Declaration of Diligent::SamplerVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "SamplerVk.h"
 #include "SamplerBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Sampler object object implementation in Vulkan backend.
 class SamplerVkImpl final : public SamplerBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp
index d8533118..33a26e8f 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Definition of the Diligent::ShaderBindingTableVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "ShaderBindingTableVk.h"
 #include "ShaderBindingTableBase.hpp"
 #include "TopLevelASVkImpl.hpp"
 #include "PipelineStateVkImpl.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
index 23c9e513..bccd55f9 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::ShaderResourceBindingVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "ShaderResourceBindingVk.h"
 #include "ShaderResourceBindingBase.hpp"
 #include "ShaderBase.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
index 60c464d6..2ade8389 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
@@ -31,16 +31,12 @@
 /// Declaration of Diligent::ShaderVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "ShaderVk.h"
 #include "ShaderBase.hpp"
 #include "SPIRVShaderResources.hpp"
 
 namespace Diligent
 {
 
-class ResourceMapping;
-class FixedBlockMemoryAllocator;
-
 /// Shader object object implementation in Vulkan backend.
 class ShaderVkImpl final : public ShaderBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
index 271fee6c..d8601aff 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
@@ -31,15 +31,12 @@
 /// Declaration of Diligent::TextureViewVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "TextureViewVk.h"
 #include "TextureViewBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Texture view implementation in Vulkan backend.
 class TextureViewVkImpl final : public TextureViewBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
index 7b20f577..cdecd177 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::TextureVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "TextureVk.h"
 #include "TextureBase.hpp"
 #include "TextureViewVkImpl.hpp"
 #include "VulkanUtilities/VulkanMemoryManager.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp
index c8525039..03dd9560 100644
--- a/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Definition of the Diligent::TopLevelASVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "TopLevelASVk.h"
 #include "TopLevelASBase.hpp"
 #include "BottomLevelASVkImpl.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h
index f8b6398a..ba573fc9 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h
@@ -31,13 +31,13 @@
 #    define VK_NO_PROTOTYPES
 #endif
 
+#define VK_ENABLE_BETA_EXTENSIONS
+#include "vulkan/vulkan.h"
+
 #define VK_FORMAT_RANGE_SIZE (VK_FORMAT_ASTC_12x12_SRGB_BLOCK - VK_FORMAT_UNDEFINED + 1)
 
 #if DILIGENT_USE_VOLK
-#    define VK_ENABLE_BETA_EXTENSIONS
 #    include "volk/volk.h"
-#else
-#    include "vulkan/vulkan.h"
 #endif
 
 #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(_X11_XLIB_H_)
diff --git a/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp
index d9ac8d03..0fc7ace9 100644
--- a/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "RenderPassVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
 #include "VulkanTypeConversions.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
index 1cba1686..5135067b 100644
--- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
@@ -33,12 +33,6 @@
 #include "VulkanTypeConversions.hpp"
 #include "EngineMemory.h"
 
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-#    define WIN32_LEAN_AND_MEAN
-#    include <Windows.h>
-#    undef CreateSemaphore
-#endif
-
 namespace Diligent
 {