Added Direct3D11On12 Support to the Direct3D11 Library

Made the necessary changes to the direct3D11 mappings to allow for
Direct3D11On12 support and added the function device to handle the case.
as well as removed the old mapping from direct3d12 that was designed for
the same task

Author: curin

Source/SharpDX.Direct3D11/Device.cs

@@ -666,5 +666,14 @@ private void CreateDevice(Adapter adapter, DriverType driverType, DeviceCreation
                 ImmediateContext__.Device__ = this;
             }
         }
+
+        public static Device CreateFromDirect3D12(ComObject d3d12Device, Direct3D11.DeviceCreationFlags flags, Direct3D.FeatureLevel[] featureLevels, DXGI.Adapter adapter, params ComObject[] commandQueues)
+        {
+            Device devOut;
+            DeviceContext contextOut;
+            Direct3D.FeatureLevel featurelevelOut;
+            D3D11.On12CreateDevice(d3d12Device, flags, featureLevels, featureLevels == null ? 0 : featureLevels.Length, commandQueues, commandQueues.Length, 0, out devOut, out contextOut, out featurelevelOut);
+            return devOut;
+        }
     }
 }

Source/SharpDX.Direct3D11/Mapping.xml

@@ -42,13 +42,15 @@
   <include file="d3d11_2.h" attach="true" />
   <include file="d3d11_3.h" attach="true" />
   <include file="d3d11sdklayers.h" attach="true" />
+  <include file="d3d11on12.h" attach="true" />
 
   <naming />
 
   <context-set id="d3d11-all">
     <context>sharpdx-direct3d11</context>
     <context>sharpdx-direct3d11-ext</context>
     <context>d3d11</context>
+    <context>d3d11on12</context>
     <context>d3d11sdklayers</context>
     <context>d3d11_1</context>
     <context>d3d11_2</context>
@@ -280,6 +282,10 @@
 
     <map param="ID3D11DeviceContext2::.*Tile.*::Flags" type="D3D11_TILE_MAPPING_FLAG" />
     <map param="ID3D11DeviceContext2::UpdateTileMappings::pRangeFlags" type="D3D11_TILE_RANGE_FLAG" />
+    
+    <map param="ID3D11On12Device::CreateWrappedResource::InState" type="int" />
+    <map param="ID3D11On12Device::CreateWrappedResource::OutState" type="int" />
+    <map param="ID3D11On12Device::CreateWrappedResource::ppResource11" type="ID3D11Resource" />
 
     <!--
     // *****************************************************************
@@ -292,6 +298,9 @@
     <map function="D3D11.*" dll='"d3d11.dll"' group="SharpDX.Direct3D11.D3D11" />
     <map param="D3D11CreateDevice::ppDevice" attribute="out fast" />
     <map function="D3D11CreateDevice" check="false"/>
+    <map function="D3D11On12CreateDevice" dll='"d3d11.dll"' group="SharpDX.Direct3D11.D3D11"/>
+    <map param="D3D11On12CreateDevice::Flags" type ="D3D11_CREATE_DEVICE_FLAG"/>
+    <map param="D3D11On12CreateDevice::ppDevice" type="ID3D11Device" attribute="out" />
 
     <remove function="ID3D11DeviceContext1_.*"/>
 

Source/SharpDX.Direct3D12/Mapping.xml

@@ -316,7 +316,6 @@
     <remove function=".*_Proxy"/>
     <map function="D3D12(.+)" name-tmp="$1" />
     <map function="D3D12.*" dll='"d3d12.dll"' group="SharpDX.Direct3D12.D3D12" />
-    <map function="D3D11CreateDeviceForD3D12" dll='"d3d12.dll"' group="SharpDX.Direct3D12.D3D12" />
     <map param="D3D12CreateDevice::ppDevice" type="ID3D12Device" attribute="out fast" />
     <map function="D3D12CreateDevice" check="false"/>
     <map param="D3D12CreateDevice.*?::Flags" type="D3D12_CREATE_DEVICE_FLAG" />
@@ -328,9 +327,6 @@
     <map param="D3D12CreateDeviceAndSwapChain::ppDevice" type="ID3D12Device"/>
 
 
-    <!-- Temporary remove d3d11 types -->
-    <remove function="D3D11CreateDeviceForD3D12"/>
-
     <!--
     // *****************************************************************
     // D3D12 Constants