update maping on window 10 SDK 15063

sharpdx · Apr 7, 2017 · f7b0bb5 · f7b0bb5
1 parent 56eaf4a
commit f7b0bb5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/Readme.md b/Readme.md
@@ -13,7 +13,7 @@ You can find more documentation on the [Wiki](http://sharpdx.org/wiki)
 In order to compile SharpDX, you need to install **Visual Studio 2017 or newer** with the following workloads and components:
 
 - [x] Visual C++ Toolset Component
-- [x] Windows 10 Anniversary SDK (10.0.14393.0) Component
+- [x] Windows 10 SDK (10.0.15063.0) Component
 - [x] C# Development Workload
 - [x] .NET Core Cross Platform Development Workload
 

diff --git a/Source/Mapping.xml b/Source/Mapping.xml
@@ -24,9 +24,9 @@
 
   <include-dir override="true">$(THIS_CONFIG_PATH)\..\External\LegacyHeaders</include-dir>
   <include-dir>$(VC_TOOLS_PATH)\include</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\shared</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\um</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.14393.0\ucrt</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\shared</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\um</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\ucrt</include-dir>
 
   <var name="FILTER_PASTING_ERROR">error: pasting .*a valid preprocessing token</var>
 

diff --git a/Source/SharpDX.DXGI/Mapping.xml b/Source/SharpDX.DXGI/Mapping.xml
@@ -31,22 +31,26 @@
   <include id="dxgiformat" file="dxgiformat.h" attach="true" />
   <include id="winerror" file="winerror.h"/>
   <include id="dxgitype" file="dxgitype.h" attach="true"/>
+  <include id="dxgicommon" file="dxgicommon.h" attach="true"/>
   <include id="dxgi1_2" file="dxgi1_2.h" attach="true" />
   <include id="windows.ui.xaml.media.dxinterop" file="windows.ui.xaml.media.dxinterop.h" attach="true" />
   <include id="dxgi1_3" file="dxgi1_3.h" attach="true" />
   <include id="dxgi1_4" file="dxgi1_4.h" attach="true" />
   <include id="dxgi1_5" file="dxgi1_5.h" attach="true" />
+  <include id="dxgi1_6" file="dxgi1_6.h" attach="true" />
 
   <context-set id="dxgi-all">
     <context>sharpdx-dxgi</context>
     <context>sharpdx-dxgi-ext</context>
     <context>dxgi</context>
     <context>dxgiformat</context>
     <context>dxgitype</context>
+    <context>dxgicommon</context>
     <context>dxgi1_2</context>
     <context>dxgi1_3</context>
     <context>dxgi1_4</context>
     <context>dxgi1_5</context>
+    <context>dxgi1_6</context>
     <context>winerror</context>
     <context>windows.ui.xaml.media.dxinterop</context>
   </context-set>

diff --git a/Source/SharpDX.Direct2D1/Mapping-direct2d1.xml b/Source/SharpDX.Direct2D1/Mapping-direct2d1.xml
@@ -57,6 +57,7 @@
   <include file="d2d1effectauthor_1.h" attach="true" />
   <include file="d2d1_3.h" attach="true" />
   <include file="d2d1effects_2.h" attach="true" />
+  <include file="d2d1svg.h" attach="true" />
 
   <naming />
 
@@ -73,6 +74,7 @@
     <context>d2d1effects_2</context>
     <context>d2d1effectauthor</context>
     <context>d2d1effectauthor_1</context>
+    <context>d2d1svg</context>
 
     <const from-guid="CLSID_D2D1([A-Z].*)" class="SharpDX.Direct2D1.Effect" type="System.Guid" name="$1">new System.Guid("$1")</const>
     <const from-guid="CLSID_D2D12DAffineTransform" class="SharpDX.Direct2D1.Effect" type="System.Guid" name="AffineTransform2D">new System.Guid("$1")</const>
@@ -118,6 +120,7 @@
     <context>d2d1effects_2</context>
     <context>d2d1effectauthor</context>
     <context>d2d1effectauthor_1</context>
+    <context>d2d1svg</context>
 
     <!--
     // *****************************************************************

diff --git a/Source/SharpDX.Direct3D12/Mapping.xml b/Source/SharpDX.Direct3D12/Mapping.xml
@@ -106,6 +106,7 @@
     <map enum-item="D3D_ROOT_SIGNATURE_VERSION(.*)" name-tmp="Version$1"/>
     <map enum-item="D3D12_SHADER_MIN_PRECISION_SUPPORT_(\d*)_BIT" name-tmp="Bit$1"/>
     <map enum-item="D3D12_DSV_FLAG(.*)" name-tmp="$1"/>
+    <map enum-item="D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_(.*)" name-tmp="Tier$1"/>
 
     <map enum="D3D12_FORMAT_SUPPORT1" flags="true"/>
     <map enum="D3D12_FORMAT_SUPPORT2" flags="true"/>
@@ -320,6 +321,9 @@
 
     <map method="ID3D12Device::CheckFeatureSupport" check="false" visibility="private"/>
 
+     <map method="ID3D12Device2::CreatePipelineState" visibility="private"/>
+     <map param="ID3D12Device2::CreatePipelineState::ppPipelineState" attribute="out" type="ID3D12PipelineState" return="true"/>
+
     <!--
     // *****************************************************************
     // D3D12 Functions

diff --git a/Source/SharpDX.MediaFoundation/Mapping-core.xml b/Source/SharpDX.MediaFoundation/Mapping-core.xml
@@ -1021,8 +1021,11 @@
       <remove function="MFCreateContentDecryptorContext" />
       <remove function="MFCreateContentProtectionDevice" />
       <remove function="MFIsContentProtectionDeviceSupported" />
+	  <remove function="MFCreatePMPMediaSession" />
+	  <remove function="MFCreateTopology" />
+	  <remove function="MFCreateTopologyNode" />
+
     </ifdef>
-
     <context-clear />
   </mapping>
 </config>