From 90c4c9855c597b316d98649ae1d1c3bde3407807 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 2 Dec 2019 11:59:55 +0000
Subject: [PATCH] Remove unnecessary STL includes from header files

* Some of these were leftover and no longer needed, some only needed in a subset
  of cpp files.
---
 renderdoc/android/android.cpp                 |  1 +
 renderdoc/core/core.cpp                       | 18 +++++-
 renderdoc/core/core.h                         | 10 ++-
 renderdoc/core/intervals.h                    |  1 -
 renderdoc/driver/d3d11/d3d11_context.cpp      |  1 +
 renderdoc/driver/d3d11/d3d11_debug.h          |  1 -
 renderdoc/driver/d3d11/d3d11_postvs.cpp       |  1 +
 renderdoc/driver/d3d11/d3d11_resources.h      |  1 -
 .../driver/d3d12/d3d12_command_list_wrap.cpp  |  1 +
 renderdoc/driver/d3d12/d3d12_device.cpp       |  1 +
 renderdoc/driver/d3d12/d3d12_manager.cpp      | 61 ++++++++++++++++++
 renderdoc/driver/d3d12/d3d12_manager.h        | 62 +------------------
 renderdoc/driver/d3d12/d3d12_postvs.cpp       |  1 +
 renderdoc/driver/d3d12/d3d12_replay.h         |  1 -
 renderdoc/driver/d3d8/d3d8_debug.h            |  2 -
 renderdoc/driver/d3d9/d3d9_debug.h            |  2 -
 .../driver/shaders/dxbc/dxbc_container.h      |  1 -
 renderdoc/driver/shaders/dxbc/dxbc_sdbg.h     |  1 -
 renderdoc/driver/shaders/dxbc/dxbc_spdb.h     |  1 -
 renderdoc/driver/vulkan/vk_core.cpp           |  1 +
 renderdoc/driver/vulkan/vk_manager.cpp        |  1 +
 renderdoc/driver/vulkan/vk_manager.h          |  2 -
 renderdoc/driver/vulkan/vk_overlay.cpp        |  1 +
 renderdoc/driver/vulkan/vk_posix.cpp          |  1 +
 renderdoc/driver/vulkan/vk_postvs.cpp         |  1 +
 renderdoc/driver/vulkan/vk_replay.cpp         |  1 +
 .../vulkan/wrappers/vk_device_funcs.cpp       |  1 +
 .../driver/vulkan/wrappers/vk_draw_funcs.cpp  |  1 +
 .../driver/vulkan/wrappers/vk_queue_funcs.cpp |  1 +
 .../vulkan/wrappers/vk_resource_funcs.cpp     |  1 +
 30 files changed, 100 insertions(+), 80 deletions(-)

diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp
index 93d4ec7ac..f8badea05 100644
--- a/renderdoc/android/android.cpp
+++ b/renderdoc/android/android.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "android.h"
+#include <set>
 #include <sstream>
 #include "api/replay/version.h"
 #include "core/core.h"
diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp
index 11c0b9b47..f52565bff 100644
--- a/renderdoc/core/core.cpp
+++ b/renderdoc/core/core.cpp
@@ -638,6 +638,13 @@ void RenderDoc::ProcessGlobalEnvironment(GlobalEnvironment env, const std::vecto
   }
 }
 
+void RenderDoc::RegisterShutdownFunction(ShutdownFunction func)
+{
+  auto it = std::lower_bound(m_ShutdownFunctions.begin(), m_ShutdownFunctions.end(), func);
+  if(it == m_ShutdownFunctions.end() || *it != func)
+    m_ShutdownFunctions.insert(it, func);
+}
+
 bool RenderDoc::MatchClosestWindow(void *&dev, void *&wnd)
 {
   DeviceWnd dw(dev, wnd);
@@ -920,6 +927,13 @@ std::string RenderDoc::GetOverlayText(RDCDriver driver, uint32_t frameNumber, in
   return overlayText;
 }
 
+void RenderDoc::QueueCapture(uint32_t frameNumber)
+{
+  auto it = std::lower_bound(m_QueuedFrameCaptures.begin(), m_QueuedFrameCaptures.end(), frameNumber);
+  if(it == m_QueuedFrameCaptures.end() || *it != frameNumber)
+    m_QueuedFrameCaptures.insert(it, frameNumber);
+}
+
 bool RenderDoc::ShouldTriggerCapture(uint32_t frameNumber)
 {
   bool ret = m_Cap > 0;
@@ -927,7 +941,7 @@ bool RenderDoc::ShouldTriggerCapture(uint32_t frameNumber)
   if(m_Cap > 0)
     m_Cap--;
 
-  std::set<uint32_t> frames;
+  std::vector<uint32_t> frames;
   frames.swap(m_QueuedFrameCaptures);
   for(auto it = frames.begin(); it != frames.end(); ++it)
   {
@@ -943,7 +957,7 @@ bool RenderDoc::ShouldTriggerCapture(uint32_t frameNumber)
     else
     {
       // not hit this yet, keep it around
-      m_QueuedFrameCaptures.insert(*it);
+      m_QueuedFrameCaptures.push_back(*it);
     }
   }
 
diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h
index 4dba7af81..14e9d787d 100644
--- a/renderdoc/core/core.h
+++ b/renderdoc/core/core.h
@@ -27,9 +27,7 @@
 
 #include <stdint.h>
 #include <map>
-#include <set>
 #include <string>
-#include <utility>
 #include <vector>
 #include "api/app/renderdoc_app.h"
 #include "api/replay/renderdoc_replay.h"
@@ -428,7 +426,7 @@ public:
   void ProcessGlobalEnvironment(GlobalEnvironment env, const std::vector<std::string> &args);
 
   int32_t GetForwardedPortSlot() { return Atomic::Inc32(&m_PortSlot); }
-  void RegisterShutdownFunction(ShutdownFunction func) { m_ShutdownFunctions.insert(func); }
+  void RegisterShutdownFunction(ShutdownFunction func);
   void SetReplayApp(bool replay) { m_Replay = replay; }
   bool IsReplayApp() const { return m_Replay; }
   const std::string &GetConfigSetting(std::string name) { return m_ConfigSettings[name]; }
@@ -574,7 +572,7 @@ public:
   void TriggerCapture(uint32_t numFrames) { m_Cap = numFrames; }
   uint32_t GetOverlayBits() { return m_Overlay; }
   void MaskOverlayBits(uint32_t And, uint32_t Or) { m_Overlay = (m_Overlay & And) | Or; }
-  void QueueCapture(uint32_t frameNumber) { m_QueuedFrameCaptures.insert(frameNumber); }
+  void QueueCapture(uint32_t frameNumber);
   void SetFocusKeys(RENDERDOC_InputButton *keys, int num)
   {
     m_FocusKeys.resize(num);
@@ -631,7 +629,7 @@ private:
   CaptureOptions m_Options;
   uint32_t m_Overlay;
 
-  std::set<uint32_t> m_QueuedFrameCaptures;
+  std::vector<uint32_t> m_QueuedFrameCaptures;
 
   uint32_t m_RemoteIdent;
   Threading::ThreadHandle m_RemoteThread;
@@ -667,7 +665,7 @@ private:
   VulkanLayerCheck m_VulkanCheck;
   VulkanLayerInstall m_VulkanInstall;
 
-  std::set<ShutdownFunction> m_ShutdownFunctions;
+  std::vector<ShutdownFunction> m_ShutdownFunctions;
 
   struct FrameCap
   {
diff --git a/renderdoc/core/intervals.h b/renderdoc/core/intervals.h
index 3ad8a56a2..01644c49d 100644
--- a/renderdoc/core/intervals.h
+++ b/renderdoc/core/intervals.h
@@ -23,7 +23,6 @@
 ******************************************************************************/
 #pragma once
 
-#include <algorithm>
 #include <map>
 #include "common/common.h"
 
diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp
index f7cc28c9a..f51f8e8ef 100644
--- a/renderdoc/driver/d3d11/d3d11_context.cpp
+++ b/renderdoc/driver/d3d11/d3d11_context.cpp
@@ -24,6 +24,7 @@
  ******************************************************************************/
 
 #include "driver/d3d11/d3d11_context.h"
+#include <algorithm>
 #include "driver/d3d11/d3d11_device.h"
 #include "driver/d3d11/d3d11_manager.h"
 #include "driver/d3d11/d3d11_renderstate.h"
diff --git a/renderdoc/driver/d3d11/d3d11_debug.h b/renderdoc/driver/d3d11/d3d11_debug.h
index 171030603..0e229023f 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.h
+++ b/renderdoc/driver/d3d11/d3d11_debug.h
@@ -27,7 +27,6 @@
 
 #include <list>
 #include <map>
-#include <utility>
 #include "api/replay/renderdoc_replay.h"
 #include "driver/dx/official/d3d11_4.h"
 #include "replay/replay_driver.h"
diff --git a/renderdoc/driver/d3d11/d3d11_postvs.cpp b/renderdoc/driver/d3d11/d3d11_postvs.cpp
index 62e26ed57..3ebad9d29 100644
--- a/renderdoc/driver/d3d11/d3d11_postvs.cpp
+++ b/renderdoc/driver/d3d11/d3d11_postvs.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "data/resource.h"
 #include "driver/d3d11/d3d11_resources.h"
 #include "strings/string_utils.h"
diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h
index 2986e12bd..6a8cae43e 100644
--- a/renderdoc/driver/d3d11/d3d11_resources.h
+++ b/renderdoc/driver/d3d11/d3d11_resources.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include "driver/d3d11/d3d11_device.h"
 #include "driver/d3d11/d3d11_manager.h"
 #include "driver/shaders/dxbc/dxbc_container.h"
diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
index 48aacc4d3..9c07c7ad0 100644
--- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "d3d12_command_list.h"
+#include <algorithm>
 #include "driver/dxgi/dxgi_common.h"
 #include "driver/ihv/amd/official/DXExt/AmdExtD3DCommandListMarkerApi.h"
 #include "d3d12_command_queue.h"
diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 8d9223ea3..9c795e5cf 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "d3d12_device.h"
+#include <algorithm>
 #include "core/core.h"
 #include "driver/dxgi/dxgi_common.h"
 #include "driver/dxgi/dxgi_wrapped.h"
diff --git a/renderdoc/driver/d3d12/d3d12_manager.cpp b/renderdoc/driver/d3d12/d3d12_manager.cpp
index 88428eb73..3220498ca 100644
--- a/renderdoc/driver/d3d12/d3d12_manager.cpp
+++ b/renderdoc/driver/d3d12/d3d12_manager.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "d3d12_manager.h"
+#include <algorithm>
 #include "driver/dxgi/dxgi_common.h"
 #include "d3d12_command_list.h"
 #include "d3d12_command_queue.h"
@@ -761,3 +762,63 @@ bool D3D12ResourceManager::ResourceTypeRelease(ID3D12DeviceChild *res)
 
   return true;
 }
+
+void GPUAddressRangeTracker::AddTo(const GPUAddressRange &range)
+{
+  SCOPED_WRITELOCK(addressLock);
+  auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
+
+  addresses.insert(it, range);
+}
+
+void GPUAddressRangeTracker::RemoveFrom(const GPUAddressRange &range)
+{
+  {
+    SCOPED_WRITELOCK(addressLock);
+    auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
+
+    // there might be multiple buffers with the same range start, find the exact range for this
+    // buffer
+    while(it != addresses.end() && it->start == range.start)
+    {
+      if(it->id == range.id)
+      {
+        addresses.erase(it);
+        return;
+      }
+
+      ++it;
+    }
+  }
+
+  RDCERR("Couldn't find matching range to remove for %s", ToStr(range.id).c_str());
+}
+
+void GPUAddressRangeTracker::GetResIDFromAddr(D3D12_GPU_VIRTUAL_ADDRESS addr, ResourceId &id,
+                                              UINT64 &offs)
+{
+  id = ResourceId();
+  offs = 0;
+
+  if(addr == 0)
+    return;
+
+  GPUAddressRange range;
+
+  // this should really be a read-write lock
+  {
+    SCOPED_READLOCK(addressLock);
+
+    auto it = std::lower_bound(addresses.begin(), addresses.end(), addr);
+    if(it == addresses.end())
+      return;
+
+    range = *it;
+  }
+
+  if(addr < range.start || addr >= range.end)
+    return;
+
+  id = range.id;
+  offs = addr - range.start;
+}
diff --git a/renderdoc/driver/d3d12/d3d12_manager.h b/renderdoc/driver/d3d12/d3d12_manager.h
index 3644ef3cd..98c9a679f 100644
--- a/renderdoc/driver/d3d12/d3d12_manager.h
+++ b/renderdoc/driver/d3d12/d3d12_manager.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include "api/replay/renderdoc_replay.h"
 #include "common/wrapped_pool.h"
 #include "core/core.h"
@@ -464,64 +463,9 @@ struct GPUAddressRangeTracker
   std::vector<GPUAddressRange> addresses;
   Threading::RWLock addressLock;
 
-  void AddTo(const GPUAddressRange &range)
-  {
-    SCOPED_WRITELOCK(addressLock);
-    auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
-
-    addresses.insert(it, range);
-  }
-
-  void RemoveFrom(const GPUAddressRange &range)
-  {
-    {
-      SCOPED_WRITELOCK(addressLock);
-      auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
-
-      // there might be multiple buffers with the same range start, find the exact range for this
-      // buffer
-      while(it != addresses.end() && it->start == range.start)
-      {
-        if(it->id == range.id)
-        {
-          addresses.erase(it);
-          return;
-        }
-
-        ++it;
-      }
-    }
-
-    RDCERR("Couldn't find matching range to remove for %s", ToStr(range.id).c_str());
-  }
-
-  void GetResIDFromAddr(D3D12_GPU_VIRTUAL_ADDRESS addr, ResourceId &id, UINT64 &offs)
-  {
-    id = ResourceId();
-    offs = 0;
-
-    if(addr == 0)
-      return;
-
-    GPUAddressRange range;
-
-    // this should really be a read-write lock
-    {
-      SCOPED_READLOCK(addressLock);
-
-      auto it = std::lower_bound(addresses.begin(), addresses.end(), addr);
-      if(it == addresses.end())
-        return;
-
-      range = *it;
-    }
-
-    if(addr < range.start || addr >= range.end)
-      return;
-
-    id = range.id;
-    offs = addr - range.start;
-  }
+  void AddTo(const GPUAddressRange &range);
+  void RemoveFrom(const GPUAddressRange &range);
+  void GetResIDFromAddr(D3D12_GPU_VIRTUAL_ADDRESS addr, ResourceId &id, UINT64 &offs);
 };
 
 struct MapState
diff --git a/renderdoc/driver/d3d12/d3d12_postvs.cpp b/renderdoc/driver/d3d12/d3d12_postvs.cpp
index 857998c5b..d8fb6b683 100644
--- a/renderdoc/driver/d3d12/d3d12_postvs.cpp
+++ b/renderdoc/driver/d3d12/d3d12_postvs.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "driver/dxgi/dxgi_common.h"
 #include "strings/string_utils.h"
 #include "d3d12_command_list.h"
diff --git a/renderdoc/driver/d3d12/d3d12_replay.h b/renderdoc/driver/d3d12/d3d12_replay.h
index 83830f02a..3946f269b 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.h
+++ b/renderdoc/driver/d3d12/d3d12_replay.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include <memory>
 #include "api/replay/renderdoc_replay.h"
 #include "core/core.h"
 #include "replay/replay_driver.h"
diff --git a/renderdoc/driver/d3d8/d3d8_debug.h b/renderdoc/driver/d3d8/d3d8_debug.h
index 785175da4..9b56a1fec 100644
--- a/renderdoc/driver/d3d8/d3d8_debug.h
+++ b/renderdoc/driver/d3d8/d3d8_debug.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#include <list>
 #include <map>
-#include <utility>
 #include "driver/dx/official/d3d8.h"
 #include "stb/stb_truetype.h"
 #include "d3d8_common.h"
diff --git a/renderdoc/driver/d3d9/d3d9_debug.h b/renderdoc/driver/d3d9/d3d9_debug.h
index 539ab0b80..a41233be0 100644
--- a/renderdoc/driver/d3d9/d3d9_debug.h
+++ b/renderdoc/driver/d3d9/d3d9_debug.h
@@ -24,9 +24,7 @@
 
 #pragma once
 
-#include <list>
 #include <map>
-#include <utility>
 #include "driver/dx/official/d3d9.h"
 #include "stb/stb_truetype.h"
 #include "d3d9_common.h"
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.h b/renderdoc/driver/shaders/dxbc/dxbc_container.h
index 00f3383ef..57d3f34e4 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_container.h
+++ b/renderdoc/driver/shaders/dxbc/dxbc_container.h
@@ -27,7 +27,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 #include "api/replay/renderdoc_replay.h"
 #include "common/common.h"
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h
index 773266dec..768dc5082 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h
+++ b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h
@@ -27,7 +27,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 #include "dxbc_bytecode.h"
 
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_spdb.h b/renderdoc/driver/shaders/dxbc/dxbc_spdb.h
index fc1c1aeca..59785ae02 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_spdb.h
+++ b/renderdoc/driver/shaders/dxbc/dxbc_spdb.h
@@ -28,7 +28,6 @@
 #include <guiddef.h>
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 #include "dxbc_bytecode.h"
 
diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 214a703bd..20ca201b7 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "vk_core.h"
+#include <algorithm>
 #include "driver/ihv/amd/amd_rgp.h"
 #include "driver/shaders/spirv/spirv_compile.h"
 #include "jpeg-compressor/jpge.h"
diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp
index efcbef598..41bd43cf4 100644
--- a/renderdoc/driver/vulkan/vk_manager.cpp
+++ b/renderdoc/driver/vulkan/vk_manager.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "vk_manager.h"
+#include <algorithm>
 #include "vk_core.h"
 
 // debugging logging for barriers
diff --git a/renderdoc/driver/vulkan/vk_manager.h b/renderdoc/driver/vulkan/vk_manager.h
index 156ac5b1e..091854347 100644
--- a/renderdoc/driver/vulkan/vk_manager.h
+++ b/renderdoc/driver/vulkan/vk_manager.h
@@ -24,8 +24,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <utility>
 #include "core/resource_manager.h"
 #include "vk_resources.h"
 
diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp
index 27ec5b581..70d2603b8 100644
--- a/renderdoc/driver/vulkan/vk_overlay.cpp
+++ b/renderdoc/driver/vulkan/vk_overlay.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include <float.h>
+#include <algorithm>
 #include "data/glsl_shaders.h"
 #include "driver/shaders/spirv/spirv_common.h"
 #include "driver/shaders/spirv/spirv_gen.h"
diff --git a/renderdoc/driver/vulkan/vk_posix.cpp b/renderdoc/driver/vulkan/vk_posix.cpp
index 18f580373..5f880aac7 100644
--- a/renderdoc/driver/vulkan/vk_posix.cpp
+++ b/renderdoc/driver/vulkan/vk_posix.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "api/replay/version.h"
 #include "strings/string_utils.h"
 #include "vk_core.h"
diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp
index 92a5d00dd..df34e4bd7 100644
--- a/renderdoc/driver/vulkan/vk_postvs.cpp
+++ b/renderdoc/driver/vulkan/vk_postvs.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include <float.h>
+#include <algorithm>
 #include "driver/shaders/spirv/spirv_editor.h"
 #include "driver/shaders/spirv/spirv_op_helpers.h"
 #include "vk_core.h"
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index 6811fcb5d..00524edea 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -24,6 +24,7 @@
 
 #include "vk_replay.h"
 #include <float.h>
+#include <algorithm>
 #include "driver/ihv/amd/amd_rgp.h"
 #include "driver/shaders/spirv/spirv_compile.h"
 #include "maths/camera.h"
diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
index e41c648f0..b2b265b6b 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "../vk_core.h"
 #include "../vk_debug.h"
 #include "../vk_rendertext.h"
diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp
index 0763db46c..7746a57ed 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "../vk_core.h"
 
 VkIndirectPatchData WrappedVulkan::FetchIndirectData(VkIndirectPatchType type,
diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
index 9b46640a0..6d3370b54 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "../vk_core.h"
 #include "../vk_debug.h"
 
diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
index 21ffedcff..df58555d3 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <algorithm>
 #include "../vk_core.h"
 #include "../vk_debug.h"