From d645d5f0d692d8fe6640afbc2e1705d9900a9bf0 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 1 Mar 2022 12:25:31 +0000
Subject: [PATCH] Remove some unused STL includes

---
 renderdoc/driver/d3d11/d3d11_shader_cache.h      | 2 --
 renderdoc/driver/d3d12/d3d12_shader_cache.h      | 2 --
 renderdoc/driver/d3d12/d3d12_state.h             | 1 -
 renderdoc/driver/ihv/intel/intel_gl_counters.cpp | 3 ---
 renderdoc/driver/shaders/dxil/dxil_bytecode.cpp  | 1 -
 renderdoc/driver/vulkan/imagestate_tests.cpp     | 3 +--
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_shader_cache.h b/renderdoc/driver/d3d11/d3d11_shader_cache.h
index 371316713..5aedfa5db 100644
--- a/renderdoc/driver/d3d11/d3d11_shader_cache.h
+++ b/renderdoc/driver/d3d11/d3d11_shader_cache.h
@@ -25,8 +25,6 @@
 #pragma once
 
 #include <map>
-#include <string>
-#include <vector>
 #include "driver/dx/official/d3d11_4.h"
 
 class WrappedID3D11Device;
diff --git a/renderdoc/driver/d3d12/d3d12_shader_cache.h b/renderdoc/driver/d3d12/d3d12_shader_cache.h
index eaf0f6ef9..90b1161e4 100644
--- a/renderdoc/driver/d3d12/d3d12_shader_cache.h
+++ b/renderdoc/driver/d3d12/d3d12_shader_cache.h
@@ -25,8 +25,6 @@
 #pragma once
 
 #include <map>
-#include <string>
-#include <vector>
 #include "driver/dx/official/d3d11_4.h"
 #include "d3d12_common.h"
 
diff --git a/renderdoc/driver/d3d12/d3d12_state.h b/renderdoc/driver/d3d12/d3d12_state.h
index 9258eff2d..7a6a0fd0a 100644
--- a/renderdoc/driver/d3d12/d3d12_state.h
+++ b/renderdoc/driver/d3d12/d3d12_state.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include <vector>
 #include "d3d12_common.h"
 #include "d3d12_manager.h"
 
diff --git a/renderdoc/driver/ihv/intel/intel_gl_counters.cpp b/renderdoc/driver/ihv/intel/intel_gl_counters.cpp
index 1e1b1b1c1..a04ac56e2 100644
--- a/renderdoc/driver/ihv/intel/intel_gl_counters.cpp
+++ b/renderdoc/driver/ihv/intel/intel_gl_counters.cpp
@@ -22,9 +22,6 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
-#include <algorithm>
-#include <fstream>
-
 #include "common/common.h"
 #include "driver/gl/gl_dispatch_table.h"
 #include "strings/string_utils.h"
diff --git a/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp b/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp
index 2d3d06bb8..c7e7c9bd5 100644
--- a/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp
@@ -25,7 +25,6 @@
 #include "dxil_bytecode.h"
 #include <ctype.h>
 #include <stdio.h>
-#include <string>
 #include "common/common.h"
 #include "common/formatting.h"
 #include "os/os_specific.h"
diff --git a/renderdoc/driver/vulkan/imagestate_tests.cpp b/renderdoc/driver/vulkan/imagestate_tests.cpp
index 9b86af1af..823c3ee0d 100644
--- a/renderdoc/driver/vulkan/imagestate_tests.cpp
+++ b/renderdoc/driver/vulkan/imagestate_tests.cpp
@@ -31,12 +31,11 @@
 #include "vk_resources.h"
 
 #include <stdint.h>
-#include <vector>
 
 void CheckSubresourceRanges(const ImageState &state, bool expectAspectsSplit,
                             bool expectLevelsSplit, bool expectLayersSplit, bool expectDepthSplit)
 {
-  std::vector<VkImageAspectFlags> splitAspects;
+  rdcarray<VkImageAspectFlags> splitAspects;
   if(expectAspectsSplit)
   {
     for(auto it = ImageAspectFlagIter::begin(state.GetImageInfo().Aspects());