early-access version 2590

src/video_core/vulkan_common/nsight_aftermath_tracker.h

@@ -4,20 +4,22 @@
 
 #pragma once
 
-#include <filesystem>
-#include <mutex>
 #include <span>
-#include <string>
-#include <vector>
 
 #include "common/common_types.h"
-#include "common/dynamic_library.h"
-#include "video_core/vulkan_common/vulkan_wrapper.h"
 
 #ifdef HAS_NSIGHT_AFTERMATH
+#include <filesystem>
+#include <mutex>
+
+// Vulkan headers must be included before Aftermath
+#include "video_core/vulkan_common/vulkan_wrapper.h"
+
 #include <GFSDK_Aftermath_Defines.h>
 #include <GFSDK_Aftermath_GpuCrashDump.h>
 #include <GFSDK_Aftermath_GpuCrashDumpDecoding.h>
+
+#include "common/dynamic_library.h"
 #endif
 
 namespace Vulkan {

src/video_core/vulkan_common/vulkan_device.cpp

@@ -6,7 +6,6 @@
 #include <bitset>
 #include <chrono>
 #include <optional>
-#include <string_view>
 #include <thread>
 #include <unordered_set>
 #include <utility>

src/video_core/vulkan_common/vulkan_device.h

@@ -6,7 +6,6 @@
 
 #include <span>
 #include <string>
-#include <string_view>
 #include <unordered_map>
 #include <vector>
 

src/video_core/vulkan_common/vulkan_instance.cpp

@@ -2,11 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <algorithm>
 #include <future>
 #include <optional>
 #include <span>
-#include <utility>
 #include <vector>
 
 #include "common/common_types.h"

src/video_core/vulkan_common/vulkan_library.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cstdlib>
 #include <string>
 
 #include "common/dynamic_library.h"

src/video_core/vulkan_common/vulkan_memory_allocator.h

@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <span>
-#include <utility>
 #include <vector>
 #include "common/common_types.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"

src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -3,10 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <exception>
 #include <memory>
 #include <optional>
-#include <string_view>
 #include <utility>
 #include <vector>
 

src/video_core/vulkan_common/vulkan_wrapper.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <exception>
-#include <iterator>
 #include <limits>
 #include <memory>
 #include <optional>