From 4bc41a62968f8d7cd27de96da15f83fd93febae9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 4 Dec 2024 17:38:24 +0000 Subject: [PATCH] Fix nv aftermath include order --- renderdoc/driver/ihv/nv/nv_aftermath.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/ihv/nv/nv_aftermath.cpp b/renderdoc/driver/ihv/nv/nv_aftermath.cpp index 918564687..fc54d12d7 100644 --- a/renderdoc/driver/ihv/nv/nv_aftermath.cpp +++ b/renderdoc/driver/ihv/nv/nv_aftermath.cpp @@ -36,6 +36,16 @@ RDOC_CONFIG(bool, Replay_Debug_EnableAftermath, false, RDOC_CONFIG(bool, Replay_Debug_EnableNVRTValidation, false, "Enable nvidia Raytracing validation on D3D12 and Vulkan."); +// system headers must be included before NV ones +#if ENABLED(RDOC_WIN32) + +#include + +#include "driver/dx/official/d3d12.h" +#include "driver/dx/official/dxgi.h" + +#endif + #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath.h" #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath_GpuCrashDump.h" #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath_GpuCrashDumpDecoding.h" @@ -45,10 +55,6 @@ RDOC_CONFIG(bool, Replay_Debug_EnableNVRTValidation, false, #include "official/nvapi/nvapi.h" -#include - -#include "driver/dx/official/d3d12.h" -#include "driver/dx/official/dxgi.h" #include "driver/vulkan/official/vulkan_core.h" namespace