ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3656 from phire/windows-10-sdk-update 

Updated D3D12 to build on the newer windows 10 sdk.
This commit is contained in:
Pierre Bourdon 2016-03-30 18:37:53 +02:00
parent 6d42054274 c036cf7a5f
commit 486d3a7114
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D12/D3D12.vcxproj
View File

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{570215B7-E32F-4438-95AE-C8D955F9FCA3}</ProjectGuid> <ProjectGuid>{570215B7-E32F-4438-95AE-C8D955F9FCA3}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">

2
Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.cpp
View File

@ -955,7 +955,7 @@ void STDMETHODCALLTYPE ID3D12QueuedCommandList::SetPredication(
void STDMETHODCALLTYPE ID3D12QueuedCommandList::SetDescriptorHeaps( void STDMETHODCALLTYPE ID3D12QueuedCommandList::SetDescriptorHeaps(
_In_ UINT NumDescriptorHeaps, _In_ UINT NumDescriptorHeaps,
_In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap** pDescriptorHeaps _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const * pDescriptorHeaps
) )
{ {
// No ignored parameters, no assumptions to DEBUGCHECK. // No ignored parameters, no assumptions to DEBUGCHECK.

4
Source/Core/VideoBackends/D3D12/D3DQueuedCommandList.h
View File

@ -152,7 +152,7 @@ struct CopyTextureRegionArguments
struct SetDescriptorHeapsArguments struct SetDescriptorHeapsArguments
{ {
ID3D12DescriptorHeap** ppDescriptorHeap; ID3D12DescriptorHeap* const* ppDescriptorHeap;
UINT NumDescriptorHeaps; UINT NumDescriptorHeaps;
}; };
@ -447,7 +447,7 @@ public:
void STDMETHODCALLTYPE SetDescriptorHeaps( void STDMETHODCALLTYPE SetDescriptorHeaps(
_In_ UINT NumDescriptorHeaps, _In_ UINT NumDescriptorHeaps,
_In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap** pDescriptorHeaps _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const * pDescriptorHeaps
); );
void STDMETHODCALLTYPE SetComputeRootSignature( void STDMETHODCALLTYPE SetComputeRootSignature(