Merge pull request #13322 from Xphalnos/D3D_Update

VideoBackends: Use DXGI 1.6 and D3D11_4

16 files changed, 19 insertions, 13 deletions

diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h
index 767237a5cd..a938340a7f 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.h
+++ b/Source/Core/VideoBackends/D3D/D3DBase.h
@@ -3,10 +3,9 @@
 
 #pragma once
 
-#include <d3d11.h>
-#include <d3d11_1.h>
+#include <d3d11_4.h>
 #include <d3dcompiler.h>
-#include <dxgi1_5.h>
+#include <dxgi1_6.h>
 #include <fmt/format.h>
 #include <vector>
 #include <wrl/client.h>
diff --git a/Source/Core/VideoBackends/D3D/D3DGfx.h b/Source/Core/VideoBackends/D3D/D3DGfx.h
index 03104c25f4..96c5f316be 100644
--- a/Source/Core/VideoBackends/D3D/D3DGfx.h
+++ b/Source/Core/VideoBackends/D3D/D3DGfx.h
@@ -3,8 +3,9 @@
 
 #pragma once
 
-#include <d3d11.h>
+#include <d3d11_4.h>
 #include <string_view>
+
 #include "VideoBackends/D3D/D3DState.h"
 #include "VideoCommon/AbstractGfx.h"
 
diff --git a/Source/Core/VideoBackends/D3D/D3DSwapChain.h b/Source/Core/VideoBackends/D3D/D3DSwapChain.h
index 4a6120b9b0..ea483ab671 100644
--- a/Source/Core/VideoBackends/D3D/D3DSwapChain.h
+++ b/Source/Core/VideoBackends/D3D/D3DSwapChain.h
@@ -3,8 +3,7 @@
 
 #pragma once
 
-#include <d3d11.h>
-#include <dxgi.h>
+#include <d3d11_4.h>
 #include <memory>
 #include <vector>
 
diff --git a/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp b/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
index 5929788b03..124e30a182 100644
--- a/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
@@ -3,7 +3,7 @@
 
 #include "VideoBackends/D3D/D3DVertexManager.h"
 
-#include <d3d11.h>
+#include <d3d11_4.h>
 
 #include "Common/Align.h"
 #include "Common/Assert.h"
diff --git a/Source/Core/VideoBackends/D3D/DXPipeline.h b/Source/Core/VideoBackends/D3D/DXPipeline.h
index cc9fb74d56..a251b75fc1 100644
--- a/Source/Core/VideoBackends/D3D/DXPipeline.h
+++ b/Source/Core/VideoBackends/D3D/DXPipeline.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <d3d11.h>
+#include <d3d11_4.h>
 #include <memory>
 
 #include "VideoBackends/D3D/D3DBase.h"
diff --git a/Source/Core/VideoBackends/D3D/DXTexture.h b/Source/Core/VideoBackends/D3D/DXTexture.h
index 7997ca6f18..57a1165d4c 100644
--- a/Source/Core/VideoBackends/D3D/DXTexture.h
+++ b/Source/Core/VideoBackends/D3D/DXTexture.h
@@ -3,11 +3,12 @@
 
 #pragma once
 
-#include <d3d11.h>
+#include <d3d11_4.h>
 #include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
+
 #include "Common/CommonTypes.h"
 
 #include "VideoBackends/D3D/D3DBase.h"
diff --git a/Source/Core/VideoBackends/D3D12/D3D12Gfx.h b/Source/Core/VideoBackends/D3D12/D3D12Gfx.h
index 1f8e40314b..a852a46a0f 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12Gfx.h
+++ b/Source/Core/VideoBackends/D3D12/D3D12Gfx.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <d3d12.h>
+
 #include "VideoBackends/D3D12/DescriptorAllocator.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
 #include "VideoCommon/AbstractGfx.h"
diff --git a/Source/Core/VideoBackends/D3D12/D3D12SwapChain.h b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.h
index 41c51029aa..e044412ade 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12SwapChain.h
+++ b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <d3d12.h>
-#include <dxgi.h>
 #include <memory>
 #include <vector>
 
diff --git a/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h
index 2dd2cdfee9..0d6f1811c6 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h
+++ b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <memory>
+
 #include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
 #include "VideoCommon/VertexManagerBase.h"
diff --git a/Source/Core/VideoBackends/D3D12/DX12Context.cpp b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
index 574ce9c016..f3b481e8fc 100644
--- a/Source/Core/VideoBackends/D3D12/DX12Context.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 #include <array>
-#include <dxgi1_2.h>
+#include <dxgi1_6.h>
 #include <queue>
 #include <vector>
 
diff --git a/Source/Core/VideoBackends/D3D12/DX12Shader.h b/Source/Core/VideoBackends/D3D12/DX12Shader.h
index ab6329d424..8c4c9292b4 100644
--- a/Source/Core/VideoBackends/D3D12/DX12Shader.h
+++ b/Source/Core/VideoBackends/D3D12/DX12Shader.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+
 #include "VideoBackends/D3D12/Common.h"
 #include "VideoBackends/D3DCommon/Shader.h"
 
diff --git a/Source/Core/VideoBackends/D3D12/DX12Texture.h b/Source/Core/VideoBackends/D3D12/DX12Texture.h
index 2054b195b2..a64c1c9327 100644
--- a/Source/Core/VideoBackends/D3D12/DX12Texture.h
+++ b/Source/Core/VideoBackends/D3D12/DX12Texture.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+
 #include "Common/CommonTypes.h"
 #include "VideoBackends/D3D12/Common.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
diff --git a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.h b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.h
index bdc5f3996b..72b58b6cb5 100644
--- a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.h
+++ b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <map>
+
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
 #include "VideoCommon/Constants.h"
 
diff --git a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.h b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.h
index c7c00d518f..3abf849711 100644
--- a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.h
+++ b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.h
@@ -5,6 +5,7 @@
 
 #include <bitset>
 #include <unordered_map>
+
 #include "VideoBackends/D3D12/Common.h"
 #include "VideoCommon/RenderState.h"
 
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.h b/Source/Core/VideoBackends/D3D12/VideoBackend.h
index db03b738d0..6167833c94 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "VideoCommon/VideoBackendBase.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
index 18406c2142..0658f1df8c 100644
--- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
+++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
@@ -3,9 +3,9 @@
 
 #include "VideoBackends/D3DCommon/D3DCommon.h"
 
-#include <d3d11.h>
+#include <d3d11_4.h>
 #include <d3d12.h>
-#include <dxgi1_3.h>
+#include <dxgi1_6.h>
 #include <wrl/client.h>
 
 #include "Common/Assert.h"