Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit f7b0bb5

Browse files
author
AndrewSt
committed
update maping on window 10 SDK 15063
1 parent 56eaf4a commit f7b0bb5

6 files changed

Lines changed: 19 additions & 5 deletions

File tree

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You can find more documentation on the [Wiki](http://sharpdx.org/wiki)
1313
In order to compile SharpDX, you need to install **Visual Studio 2017 or newer** with the following workloads and components:
1414

1515
- [x] Visual C++ Toolset Component
16-
- [x] Windows 10 Anniversary SDK (10.0.14393.0) Component
16+
- [x] Windows 10 SDK (10.0.15063.0) Component
1717
- [x] C# Development Workload
1818
- [x] .NET Core Cross Platform Development Workload
1919

Source/Mapping.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
<include-dir override="true">$(THIS_CONFIG_PATH)\..\External\LegacyHeaders</include-dir>
2626
<include-dir>$(VC_TOOLS_PATH)\include</include-dir>
27-
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\shared</include-dir>
28-
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\um</include-dir>
29-
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\ucrt</include-dir>
27+
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\shared</include-dir>
28+
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\um</include-dir>
29+
<include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\ucrt</include-dir>
3030

3131
<var name="FILTER_PASTING_ERROR">error: pasting .*a valid preprocessing token</var>
3232

Source/SharpDX.DXGI/Mapping.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,26 @@
3131
<include id="dxgiformat" file="dxgiformat.h" attach="true" />
3232
<include id="winerror" file="winerror.h"/>
3333
<include id="dxgitype" file="dxgitype.h" attach="true"/>
34+
<include id="dxgicommon" file="dxgicommon.h" attach="true"/>
3435
<include id="dxgi1_2" file="dxgi1_2.h" attach="true" />
3536
<include id="windows.ui.xaml.media.dxinterop" file="windows.ui.xaml.media.dxinterop.h" attach="true" />
3637
<include id="dxgi1_3" file="dxgi1_3.h" attach="true" />
3738
<include id="dxgi1_4" file="dxgi1_4.h" attach="true" />
3839
<include id="dxgi1_5" file="dxgi1_5.h" attach="true" />
40+
<include id="dxgi1_6" file="dxgi1_6.h" attach="true" />
3941

4042
<context-set id="dxgi-all">
4143
<context>sharpdx-dxgi</context>
4244
<context>sharpdx-dxgi-ext</context>
4345
<context>dxgi</context>
4446
<context>dxgiformat</context>
4547
<context>dxgitype</context>
48+
<context>dxgicommon</context>
4649
<context>dxgi1_2</context>
4750
<context>dxgi1_3</context>
4851
<context>dxgi1_4</context>
4952
<context>dxgi1_5</context>
53+
<context>dxgi1_6</context>
5054
<context>winerror</context>
5155
<context>windows.ui.xaml.media.dxinterop</context>
5256
</context-set>

Source/SharpDX.Direct2D1/Mapping-direct2d1.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<include file="d2d1effectauthor_1.h" attach="true" />
5858
<include file="d2d1_3.h" attach="true" />
5959
<include file="d2d1effects_2.h" attach="true" />
60+
<include file="d2d1svg.h" attach="true" />
6061

6162
<naming />
6263

@@ -73,6 +74,7 @@
7374
<context>d2d1effects_2</context>
7475
<context>d2d1effectauthor</context>
7576
<context>d2d1effectauthor_1</context>
77+
<context>d2d1svg</context>
7678

7779
<const from-guid="CLSID_D2D1([A-Z].*)" class="SharpDX.Direct2D1.Effect" type="System.Guid" name="$1">new System.Guid("$1")</const>
7880
<const from-guid="CLSID_D2D12DAffineTransform" class="SharpDX.Direct2D1.Effect" type="System.Guid" name="AffineTransform2D">new System.Guid("$1")</const>
@@ -118,6 +120,7 @@
118120
<context>d2d1effects_2</context>
119121
<context>d2d1effectauthor</context>
120122
<context>d2d1effectauthor_1</context>
123+
<context>d2d1svg</context>
121124

122125
<!--
123126
// *****************************************************************

Source/SharpDX.Direct3D12/Mapping.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<map enum-item="D3D_ROOT_SIGNATURE_VERSION(.*)" name-tmp="Version$1"/>
107107
<map enum-item="D3D12_SHADER_MIN_PRECISION_SUPPORT_(\d*)_BIT" name-tmp="Bit$1"/>
108108
<map enum-item="D3D12_DSV_FLAG(.*)" name-tmp="$1"/>
109+
<map enum-item="D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_(.*)" name-tmp="Tier$1"/>
109110

110111
<map enum="D3D12_FORMAT_SUPPORT1" flags="true"/>
111112
<map enum="D3D12_FORMAT_SUPPORT2" flags="true"/>
@@ -320,6 +321,9 @@
320321

321322
<map method="ID3D12Device::CheckFeatureSupport" check="false" visibility="private"/>
322323

324+
<map method="ID3D12Device2::CreatePipelineState" visibility="private"/>
325+
<map param="ID3D12Device2::CreatePipelineState::ppPipelineState" attribute="out" type="ID3D12PipelineState" return="true"/>
326+
323327
<!--
324328
// *****************************************************************
325329
// D3D12 Functions

Source/SharpDX.MediaFoundation/Mapping-core.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,8 +1021,11 @@
10211021
<remove function="MFCreateContentDecryptorContext" />
10221022
<remove function="MFCreateContentProtectionDevice" />
10231023
<remove function="MFIsContentProtectionDeviceSupported" />
1024+
<remove function="MFCreatePMPMediaSession" />
1025+
<remove function="MFCreateTopology" />
1026+
<remove function="MFCreateTopologyNode" />
1027+
10241028
</ifdef>
1025-
10261029
<context-clear />
10271030
</mapping>
10281031
</config>

0 commit comments

Comments
 (0)