Merge pull request #4267 from lioncash/vulkan

Vulkan: Amend header includes

Source/Core/VideoBackends/Vulkan/BoundingBox.cpp

@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "Common/Assert.h"
+#include "Common/Logging/Log.h"
 
 #include "VideoBackends/Vulkan/BoundingBox.h"
 #include "VideoBackends/Vulkan/CommandBufferManager.h"

Source/Core/VideoBackends/Vulkan/BoundingBox.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <array>
 #include <memory>
 #include <string>
 

Source/Core/VideoBackends/Vulkan/CommandBufferManager.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
 #include <deque>
 #include <functional>
 #include <map>

Source/Core/VideoBackends/Vulkan/Constants.h

@@ -4,7 +4,10 @@
 
 #pragma once
 
+#include <cstddef>
+
 #include "Common/BitField.h"
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/VulkanLoader.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp

@@ -2,13 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/FramebufferManager.h"
+
 #include <algorithm>
-#include <cassert>
+#include <cstddef>
 
 #include "Common/CommonFuncs.h"
+#include "Common/Logging/Log.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/FramebufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/StagingTexture2D.h"
 #include "VideoBackends/Vulkan/StateTracker.h"

Source/Core/VideoBackends/Vulkan/FramebufferManager.h

@@ -2,11 +2,13 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#pragma once
+
 #include <memory>
 
-#include "VideoCommon/FramebufferManagerBase.h"
-
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
+#include "VideoCommon/FramebufferManagerBase.h"
 
 namespace Vulkan
 {

Source/Core/VideoBackends/Vulkan/ObjectCache.cpp

@@ -2,7 +2,10 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/ObjectCache.h"
+
 #include <algorithm>
+#include <sstream>
 #include <type_traits>
 #include <xxhash.h>
 
@@ -10,7 +13,6 @@
 #include "Common/LinearDiskCache.h"
 #include "Core/ConfigManager.h"
 
-#include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/ShaderCompiler.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"
 #include "VideoBackends/Vulkan/Util.h"

Source/Core/VideoBackends/Vulkan/ObjectCache.h

@@ -5,11 +5,13 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
 
+#include "Common/CommonTypes.h"
 #include "Common/LinearDiskCache.h"
 
 #include "VideoBackends/Vulkan/Constants.h"

Source/Core/VideoBackends/Vulkan/PaletteTextureConverter.cpp

@@ -2,16 +2,21 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/PaletteTextureConverter.h"
+
 #include <algorithm>
+#include <cstddef>
 #include <cstring>
+#include <string>
 
 #include "Common/Assert.h"
 #include "Common/CommonFuncs.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/FramebufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/PaletteTextureConverter.h"
 #include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"

Source/Core/VideoBackends/Vulkan/PaletteTextureConverter.h

@@ -4,10 +4,11 @@
 
 #pragma once
 
+#include <array>
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"
-
 #include "VideoCommon/TextureDecoder.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/PerfQuery.cpp

@@ -2,15 +2,17 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/PerfQuery.h"
+
 #include <algorithm>
 #include <cstring>
 #include <functional>
 
 #include "Common/Assert.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/PerfQuery.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StagingBuffer.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/Util.h"

Source/Core/VideoBackends/Vulkan/PerfQuery.h

@@ -7,6 +7,7 @@
 #include <array>
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoCommon/PerfQueryBase.h"
 

Source/Core/VideoBackends/Vulkan/RasterFont.cpp

@@ -2,10 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/RasterFont.h"
+
+#include <cstring>
 #include <vector>
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/RasterFont.h"
 #include "VideoBackends/Vulkan/Texture2D.h"
 #include "VideoBackends/Vulkan/Util.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"

Source/Core/VideoBackends/Vulkan/Renderer.cpp

@@ -2,8 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/Renderer.h"
+
+#include <cstddef>
 #include <cstdio>
 #include <limits>
+#include <string>
+
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 
 #include "Core/ConfigManager.h"
 
@@ -12,7 +19,6 @@
 #include "VideoBackends/Vulkan/FramebufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/RasterFont.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StagingTexture2D.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/SwapChain.h"

Source/Core/VideoBackends/Vulkan/Renderer.h

@@ -5,8 +5,10 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoCommon/RenderBase.h"
 

Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp

@@ -2,7 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/ShaderCompiler.h"
+
+#include <cstddef>
+#include <cstdlib>
 #include <fstream>
+#include <memory>
 #include <string>
 
 // glslang includes
@@ -15,7 +20,6 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 
-#include "VideoBackends/Vulkan/ShaderCompiler.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/ShaderCompiler.h

@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <cstddef>
 #include <vector>
 
-#include "VideoBackends/Vulkan/Constants.h"
+#include "Common/CommonTypes.h"
 
 namespace Vulkan
 {

Source/Core/VideoBackends/Vulkan/StagingBuffer.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <memory>
 
 #include "VideoBackends/Vulkan/Constants.h"

Source/Core/VideoBackends/Vulkan/StagingTexture2D.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
+#include <cstddef>
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/StateTracker.cpp

@@ -2,13 +2,16 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/StateTracker.h"
+
+#include <cstring>
+
 #include "Common/Assert.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoBackends/Vulkan/FramebufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"
 #include "VideoBackends/Vulkan/Util.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"

Source/Core/VideoBackends/Vulkan/StateTracker.h

@@ -4,9 +4,13 @@
 
 #pragma once
 
+#include <array>
+#include <cstddef>
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
+#include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoCommon/GeometryShaderGen.h"
 #include "VideoCommon/PixelShaderGen.h"
 #include "VideoCommon/RenderBase.h"

Source/Core/VideoBackends/Vulkan/StreamBuffer.cpp

@@ -2,14 +2,16 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/StreamBuffer.h"
+
 #include <algorithm>
 #include <cstdint>
+#include <functional>
 
 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/StreamBuffer.h"
 #include "VideoBackends/Vulkan/Util.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 

Source/Core/VideoBackends/Vulkan/StreamBuffer.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <deque>
 #include <memory>
 #include <utility>

Source/Core/VideoBackends/Vulkan/SwapChain.cpp

@@ -2,15 +2,17 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/SwapChain.h"
+
 #include <algorithm>
 #include <cstdint>
 
 #include "Common/Assert.h"
 #include "Common/CommonFuncs.h"
 #include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/SwapChain.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 #if defined(VK_USE_PLATFORM_XLIB_KHR)

Source/Core/VideoBackends/Vulkan/SwapChain.h

@@ -7,6 +7,7 @@
 #include <memory>
 #include <vector>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoBackends/Vulkan/Texture2D.h"
 

Source/Core/VideoBackends/Vulkan/Texture2D.h

@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/TextureCache.cpp

@@ -2,12 +2,17 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/TextureCache.h"
+
 #include <algorithm>
 #include <cstring>
+#include <string>
 #include <vector>
 
 #include "Common/Assert.h"
 #include "Common/CommonFuncs.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/FramebufferManager.h"
@@ -18,7 +23,6 @@
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"
 #include "VideoBackends/Vulkan/Texture2D.h"
-#include "VideoBackends/Vulkan/TextureCache.h"
 #include "VideoBackends/Vulkan/TextureEncoder.h"
 #include "VideoBackends/Vulkan/Util.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"

Source/Core/VideoBackends/Vulkan/TextureCache.h

@@ -6,8 +6,8 @@
 
 #include <memory>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"
-
 #include "VideoCommon/TextureCacheBase.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/TextureEncoder.cpp

@@ -2,21 +2,21 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/TextureEncoder.h"
+
 #include <algorithm>
 #include <cstring>
 
 #include "Common/CommonFuncs.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/FramebufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/StagingTexture2D.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
-#include "VideoBackends/Vulkan/StreamBuffer.h"
 #include "VideoBackends/Vulkan/Texture2D.h"
-#include "VideoBackends/Vulkan/TextureCache.h"
-#include "VideoBackends/Vulkan/TextureEncoder.h"
 #include "VideoBackends/Vulkan/Util.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 

Source/Core/VideoBackends/Vulkan/TextureEncoder.h

@@ -4,10 +4,12 @@
 
 #pragma once
 
+#include <array>
 #include <memory>
 
-#include "VideoBackends/Vulkan/StreamBuffer.h"
-
+#include "Common/CommonTypes.h"
+#include "VideoBackends/Vulkan/VulkanLoader.h"
+#include "VideoCommon/BPMemory.h"
 #include "VideoCommon/VideoCommon.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/Util.cpp

@@ -2,17 +2,18 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "VideoBackends/Vulkan/Util.h"
+
 #include "Common/Assert.h"
 #include "Common/CommonFuncs.h"
 #include "Common/MathUtil.h"
+#include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
-#include "VideoBackends/Vulkan/Renderer.h"
 #include "VideoBackends/Vulkan/ShaderCompiler.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/StreamBuffer.h"
-#include "VideoBackends/Vulkan/Util.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/Util.h

@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <array>
+#include <cstddef>
+
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 

Source/Core/VideoBackends/Vulkan/VertexManager.h

@@ -4,8 +4,10 @@
 
 #pragma once
 
+#include <memory>
 #include <vector>
 
+#include "Common/CommonTypes.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 namespace Vulkan

Source/Core/VideoBackends/Vulkan/VulkanContext.h

@@ -7,6 +7,7 @@
 #include <memory>
 #include <vector>
 
+#include "Common/CommonTypes.h"
 #include "VideoBackends/Vulkan/Constants.h"
 #include "VideoCommon/VideoConfig.h"