From c036cf7a5f494eacdb691d45e0d31cf7c61cc84a Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Fri, 19 Feb 2016 16:21:53 +1300
Subject: [PATCH] Updated D3D12 to build on the newer windows 10 sdk.

---
 Source/Core/VideoBackends/D3D12/D3D12.vcxproj            | 2 +-
 Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.cpp | 2 +-
 Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
index b44179a441..d0f3787378 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
+++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{570215B7-E32F-4438-95AE-C8D955F9FCA3}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
diff --git a/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.cpp b/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.cpp
index 4bfb58735a..c7b5f659cb 100644
--- a/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.cpp
@@ -955,7 +955,7 @@ void STDMETHODCALLTYPE ID3D12QueuedCommandList::SetPredication(
 
 void STDMETHODCALLTYPE ID3D12QueuedCommandList::SetDescriptorHeaps(
 	_In_  UINT NumDescriptorHeaps,
-	_In_reads_(NumDescriptorHeaps)  ID3D12DescriptorHeap** pDescriptorHeaps
+	_In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const * pDescriptorHeaps
 	)
 {
 	// No ignored parameters, no assumptions to DEBUGCHECK.
diff --git a/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.h b/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.h
index 1ca0334dba..2933b2fc72 100644
--- a/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.h
+++ b/Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.h
@@ -152,7 +152,7 @@ struct CopyTextureRegionArguments
 
 struct SetDescriptorHeapsArguments
 {
-	ID3D12DescriptorHeap** ppDescriptorHeap;
+	ID3D12DescriptorHeap* const* ppDescriptorHeap;
 	UINT NumDescriptorHeaps;
 };
 
@@ -447,7 +447,7 @@ public:
 
 	void STDMETHODCALLTYPE SetDescriptorHeaps(
 		_In_  UINT NumDescriptorHeaps,
-		_In_reads_(NumDescriptorHeaps)  ID3D12DescriptorHeap** pDescriptorHeaps
+		_In_reads_(NumDescriptorHeaps)  ID3D12DescriptorHeap *const * pDescriptorHeaps
 		);
 
 	void STDMETHODCALLTYPE SetComputeRootSignature(