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

Commit eb3d894

Browse files
jkoritzinskyjkoritzinsky
committed
Update MSBuild.Sdk.Extras and SharpGenTools.Sdk.
1 parent 8c51cb3 commit eb3d894

28 files changed

Lines changed: 100 additions & 325 deletions

‎Source/Directory.build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</PropertyGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.4-ci425" PrivateAssets="All" />
44+
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.4-ci436" PrivateAssets="All" />
4545
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.0.4-ci418" PrivateAssets="All" />
4646
<SharpGenGlobalNamespaceOverrides Include="InterfaceArray" Override="ComArray" />
4747
<SharpGenGlobalNamespaceOverrides Include="MemoryHelpers" Override="Utilities" />

‎Source/Mapping.Direct3D1x.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
<map field="D3DX?(\d+)_PASS_DESC::BlendFactor" type="SHARPDX_COLOR4" pointer="" array="0" override-native-type="true" />
262262
<map field="D3DX?(\d+)_PASS_DESC::StencilRef" name="StencilReference" />
263263
<map field="D3DX?(\d+)_PASS_SHADER_DESC::pShaderVariable" visibility="internal" />
264-
<map field="D3DX?(\d+)_PASS_SHADER_DESC::pShaderVariable" name="VariablePointer" />
264+
<map field="D3DX?(\d+)_PASS_SHADER_DESC::pShaderVariable" name="VariablePointer" type="void" />
265265
<map field="D3DX?(\d+)_PASS_SHADER_DESC::ShaderIndex" name="Index" />
266266
<map field="D3DX?(\d+)_EFFECT_SHADER_DESC::pInputSignature" visibility="internal" name="InputSignaturePointer" />
267267
<map field="D3DX?(\d+)_EFFECT_SHADER_DESC::pBytecode" visibility="internal" name="BytecodePointer" />
@@ -338,8 +338,8 @@
338338
<map method="ID3D(\d+)DeviceContext::SetVertexBuffers" visibility="internal" />
339339
<map method="ID3D(\d+)DeviceContext::SetTargets" visibility="internal" />
340340
<map method="ID3D(\d+)DeviceContext::SetRenderTargetsAndUnorderedAccessViews" visibility="internal" />
341-
<map param="ID3D(\d+)DeviceContext::ClearRenderTargetView::ColorRGBA" type="SHARPDX_COLOR4" pointer="*" array="0" />
342-
<map param="ID3D(\d+)DeviceContext1::ClearView::Color" type="SHARPDX_COLOR4" pointer="*" array="0"/>
341+
<map param="ID3D(\d+)DeviceContext::ClearRenderTargetView::ColorRGBA" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0" />
342+
<map param="ID3D(\d+)DeviceContext1::ClearView::Color" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0"/>
343343
<map method="ID3D\d+DeviceContext::IA(.*)" name="$1" />
344344
<map method="ID3D\d+DeviceContext::VS(.*)" name="$1" />
345345
<map method="ID3D\d+DeviceContext::PS(.*)" name="$1" />
@@ -390,8 +390,8 @@
390390
<map param="ID3D(\d+)DeviceContext::RSGetViewports::pViewports" type="void" />
391391
<map method="ID3D(\d+)DeviceContext::RSSetViewports" visibility="internal" />
392392
<map param="ID3D(\d+)DeviceContext::RSSetViewports::pViewports" type="void" />
393-
<map param="ID3D(\d+)DeviceContext::OMGetBlendState::BlendFactor" type="SHARPDX_COLOR4" pointer="*" array="0" />
394-
<map param="ID3D(\d+)DeviceContext::OMSetBlendState::BlendFactor" type="SHARPDX_COLOR4" pointer="*" array="0" default="null"/>
393+
<map param="ID3D(\d+)DeviceContext::OMGetBlendState::BlendFactor" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0" />
394+
<map param="ID3D(\d+)DeviceContext::OMSetBlendState::BlendFactor" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0" default="null"/>
395395
<map param="ID3D(\d+)DeviceContext::OMSetBlendState::SampleMask" default="-1"/>
396396
<map param="ID3D(\d+)DeviceContext::OMSetDepthStencilState::StencilRef" default="0"/>
397397
<map param="ID3D(\d+)DeviceContext::[A-Z][A-Z]GetShader::pNumClassInstances" attribute="inout" />
@@ -407,8 +407,8 @@
407407
<map method="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewFloat" name="ClearUnorderedAccessView" />
408408
<map method="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewUint" name="ClearUnorderedAccessView" />
409409

410-
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewFloat::Values" type="SHARPDX_VECTOR4" />
411-
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewUint::Values" type="SHARPDX_INT4" />
410+
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewFloat::Values" type="SHARPDX_VECTOR4" override-native-type="true" pointer="*" array="0" />
411+
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewUint::Values" type="SHARPDX_INT4" override-native-type="true" pointer="*" array="0" />
412412

413413
<map param="ID3D(\d+)DeviceContext::ClearDepthStencilView::ClearFlags" type="D3D11_CLEAR_FLAG" />
414414
<remove interface="ID3DX(\d+)ThreadPump" />
@@ -445,14 +445,14 @@
445445
<map method="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTranspose" visibility="internal" />
446446
<map method="ID3DX?(\d+)EffectMatrixVariable::SetMatrix" visibility="public" />
447447
<map method="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTranspose" visibility="public" />
448-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrix::pData" type="SHARPDX_MATRIX" attribute="in" />
449-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTranspose::pData" type="SHARPDX_MATRIX" attribute="in" />
450-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixArray::pData" type="SHARPDX_MATRIX" attribute="in buffer" />
451-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" attribute="in buffer" />
452-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrix::pData" type="SHARPDX_MATRIX" attribute="out" />
453-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixArray::pData" type="SHARPDX_MATRIX" attribute="out buffer" />
454-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTranspose::pData" type="SHARPDX_MATRIX" attribute="out"/>
455-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" attribute="out buffer" />
448+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrix::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in" />
449+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTranspose::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in" />
450+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in buffer" />
451+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in buffer" />
452+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrix::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out" />
453+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out buffer" />
454+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTranspose::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out"/>
455+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out buffer" />
456456

457457
<map param="ID3DX?(\d+)EffectPass::GetDesc::pDesc" attribute="out" />
458458
<map param="ID3DX?(\d+)EffectPass::GetVertexShaderDesc::pDesc" attribute="out" />
@@ -504,18 +504,18 @@
504504
<map method="ID3DX?(\d+)EffectVectorVariable::SetIntVector" visibility="public" />
505505
<map method="ID3DX?(\d+)EffectVectorVariable::SetFloatVector" visibility="public" />
506506
<map method="ID3DX?(\d+)EffectVectorVariable::SetBoolVector" visibility="public" />
507-
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVector::pData" type="SHARPDX_INT4" attribute="out" />
508-
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVector::pData" type="SHARPDX_VECTOR4" attribute="out" />
509-
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVectorArray::pData" type="SHARPDX_INT4" attribute="out buffer" />
510-
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVectorArray::pData" type="SHARPDX_VECTOR4" attribute="out buffer" />
511-
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVectorArray::pData" type="SHARPDX_INT4" attribute="in buffer" />
512-
<map param="ID3DX?(\d+)EffectVectorVariable::SetFloatVectorArray::pData" type="SHARPDX_VECTOR4" attribute="in buffer" />
513-
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVector::pData" type="SHARPDX_INT4" attribute="in" />
507+
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVector::pData" type="SHARPDX_INT4" override-native-type="true" attribute="out" />
508+
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVector::pData" type="SHARPDX_VECTOR4" override-native-type="true" attribute="out" />
509+
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVectorArray::pData" type="SHARPDX_INT4" override-native-type="true" attribute="out buffer" />
510+
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVectorArray::pData" type="SHARPDX_VECTOR4" override-native-type="true" attribute="out buffer" />
511+
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVectorArray::pData" type="SHARPDX_INT4" override-native-type="true" attribute="in buffer" />
512+
<map param="ID3DX?(\d+)EffectVectorVariable::SetFloatVectorArray::pData" type="SHARPDX_VECTOR4" override-native-type="true" attribute="in buffer" />
513+
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVector::pData" type="SHARPDX_INT4" override-native-type="true" attribute="in" />
514514
<map method="ID3DX?(\d+)EffectVectorVariable::Set.*" name="Set" />
515-
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVector::pData" type="SHARPDX_BOOL4" attribute="out" />
516-
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVectorArray::pData" type="SHARPDX_BOOL4" attribute="out buffer" />
517-
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVector::pData" type="SHARPDX_BOOL4" attribute="in" />
518-
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVectorArray::pData" type="SHARPDX_BOOL4" attribute="in buffer" />
515+
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVector::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="out" />
516+
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVectorArray::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="out buffer" />
517+
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVector::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="in" />
518+
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVectorArray::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="in buffer" />
519519

520520
<map param="ID3DX?(\d+)EffectTechnique::GetDesc::pDesc" attribute="out" />
521521
<map param="ID3DX?(\d+)Effect::GetDevice::ppDevice" attribute="out" />

‎Source/Mapping.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,12 @@
508508
</extension>
509509

510510
<bindings>
511-
<!-- Primitive bindings -->
511+
<!-- Primitive bindings -->
512512
<bind from="void" to="System.Void" />
513513
<bind from="int" to="System.Int32" />
514514
<bind from="unsigned int" to="System.Int32" />
515+
<bind from="long" to="System.Int32" />
516+
<bind from="unsigned long" to="System.Int32" />
515517
<bind from="short" to="System.Int16" />
516518
<bind from="unsigned short" to="System.Int16" />
517519
<bind from="unsigned char" to="System.Byte" />

‎Source/SharpDX.Animation/Storyboard.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Storyboard(Manager manager)
3939
/// <unmanaged>HRESULT IUIAnimationStoryboard::RepeatBetweenKeyframes([In] __MIDL___MIDL_itf_UIAnimation_0000_0002_0003* startKeyframe,[In] __MIDL___MIDL_itf_UIAnimation_0000_0002_0003* endKeyframe,[In] int repetitionCount)</unmanaged>
4040
public void RepeatBetweenKeyframes(SharpDX.Animation.KeyFrame startKeyframe, SharpDX.Animation.KeyFrame endKeyframe, RepeatCount repetitionCount)
4141
{
42-
RepeatBetweenKeyframes(ref startKeyframe, ref endKeyframe, (int)repetitionCount);
42+
RepeatBetweenKeyframes(startKeyframe, endKeyframe, (int)repetitionCount);
4343
}
4444

4545
/// <summary>

‎Source/SharpDX.Direct2D1/BitmapProperties1.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,5 @@ public BitmapProperties1(PixelFormat pixelFormat, float dpiX, float dpiY, Bitmap
7777
BitmapOptions = bitmapOptions;
7878
ColorContext = colorContext;
7979
}
80-
81-
/// <summary>
82-
/// Gets or sets the color context.
83-
/// </summary>
84-
/// <value>
85-
/// The color context.
86-
/// </value>
87-
public ColorContext ColorContext
88-
{
89-
get
90-
{
91-
return colorContext;
92-
}
93-
set
94-
{
95-
colorContext = value;
96-
ColorContextPointer = colorContext == null ? IntPtr.Zero : colorContext.NativePointer;
97-
}
98-
}
9980
}
10081
}

‎Source/SharpDX.Direct2D1/CommandSinkShadow.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,9 @@ private unsafe static int PushLayerImpl(IntPtr thisPtr, IntPtr layerParameters1,
537537
{
538538
var shadow = ToShadow<CommandSinkShadow>(thisPtr);
539539
var callback = (CommandSink)shadow.Callback;
540-
callback.PushLayer(ref *(LayerParameters1*)layerParameters1, layer == IntPtr.Zero ? null : new Layer(layer));
540+
var layerParameters = new LayerParameters1();
541+
layerParameters.__MarshalFrom(ref *(LayerParameters1.__Native*)layerParameters1);
542+
callback.PushLayer(ref layerParameters, layer == IntPtr.Zero ? null : new Layer(layer));
541543
}
542544
catch (Exception exception)
543545
{

‎Source/SharpDX.Direct2D1/EffectInputDescription.cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎Source/SharpDX.Direct2D1/LayerParameters.cs‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,5 @@ namespace SharpDX.Direct2D1
2323
{
2424
public partial struct LayerParameters
2525
{
26-
/// <summary>
27-
/// Sets the geometric mask.
28-
/// </summary>
29-
/// <value>
30-
/// The geometric mask.
31-
/// </value>
32-
/// <unmanaged>ID2D1Geometry* geometricMask</unmanaged>
33-
public Geometry GeometricMask
34-
{
35-
set
36-
{
37-
GeometricMaskPointer = value == null ? IntPtr.Zero : value.NativePointer;
38-
}
39-
}
40-
41-
/// <summary>
42-
/// Sets the opacity brush.
43-
/// </summary>
44-
/// <value>
45-
/// The opacity brush.
46-
/// </value>
47-
/// <unmanaged>ID2D1Brush* opacityBrush</unmanaged>
48-
public Brush OpacityBrush
49-
{
50-
set
51-
{
52-
OpacityBrushPointer = value == null ? IntPtr.Zero : value.NativePointer;
53-
}
54-
}
5526
}
5627
}

‎Source/SharpDX.Direct2D1/LayerParameters1.cs‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,43 +39,12 @@ public LayerParameters1(RawRectangleF contentBounds, Geometry geometryMask, Anti
3939
: this()
4040
{
4141
ContentBounds = contentBounds;
42-
GeometricMaskPointer = geometryMask.NativePointer;
42+
GeometricMask = geometryMask;
4343
MaskAntialiasMode = maskAntialiasMode;
4444
MaskTransform = maskTransform;
4545
Opacity = opacity;
46-
OpacityBrushPointer = opacityBrush.NativePointer;
46+
OpacityBrush = opacityBrush;
4747
LayerOptions = layerOptions;
4848
}
49-
50-
/// <summary>
51-
/// Sets the geometric mask.
52-
/// </summary>
53-
/// <value>
54-
/// The geometric mask.
55-
/// </value>
56-
/// <unmanaged>ID2D1Geometry* geometricMask</unmanaged>
57-
public Geometry GeometricMask
58-
{
59-
set
60-
61-
{
62-
GeometricMaskPointer = value == null ? IntPtr.Zero : value.NativePointer;
63-
}
64-
}
65-
66-
/// <summary>
67-
/// Sets the opacity brush.
68-
/// </summary>
69-
/// <value>
70-
/// The opacity brush.
71-
/// </value>
72-
/// <unmanaged>ID2D1Brush* opacityBrush</unmanaged>
73-
public Brush OpacityBrush
74-
{
75-
set
76-
{
77-
OpacityBrushPointer = value == null ? IntPtr.Zero : value.NativePointer;
78-
}
79-
}
8049
}
8150
}

‎Source/SharpDX.Direct2D1/Mapping-direct2d1.xml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,6 @@
247247
<map struct="D2D1(.*)" name-tmp="$1" />
248248
<map field="D2D1_BLEND_DESCRIPTION::blendFactor" type="SHARPDX_COLOR4" override-native-type="true" array="0"/>
249249
<map struct="D2D1_BITMAP_PROPERTIES1" struct-to-class="true"/>
250-
<map field="D2D1_BITMAP_PROPERTIES1::colorContext" name="ColorContextPointer" visibility="internal"/>
251-
252-
<map field="D2D1_LAYER_PARAMETERS1::geometricMask" visibility="internal" name="GeometricMaskPointer"/>
253-
<map field="D2D1_LAYER_PARAMETERS1::opacityBrush" visibility="internal" name="OpacityBrushPointer"/>
254250

255251
<map struct="D2D1_PROPERTY_BINDING" struct-to-class="true" visibility="internal"/>
256252
<map field="D2D1_PROPERTY_BINDING::[gs]etFunction" visibility="internal"/>
@@ -275,14 +271,9 @@
275271
<map struct="D2D1_FEATURE_DATA_.*" visibility="internal"/>
276272

277273
<map struct="D2D1_EFFECT_INPUT_DESCRIPTION" struct-to-class="true" />
278-
<map field="D2D1_EFFECT_INPUT_DESCRIPTION::effect" name="EffectPointer" visibility="internal"/>
279274

280275
<map struct="D2D1_MAPPED_RECT" visibility="internal"/>
281276

282-
<map field="D2D1_LAYER_PARAMETERS::geometricMask" name="GeometricMaskPointer" visibility="internal"/>
283-
<map field="D2D1_LAYER_PARAMETERS::opacityBrush" name="OpacityBrushPointer" visibility="internal"/>
284-
285-
286277
<!--
287278
// *****************************************************************
288279
// D2D1 Interfaces
@@ -391,10 +382,10 @@
391382
<map method="ID2D1RenderTarget::DrawTextA" visibility="internal" name="DrawText" />
392383
<map method="ID2D1RenderTarget::(.*)Dpi" visibility="internal" />
393384
<map method="ID2D(\d+)Mesh::Open" visibility="internal" name="Open_" />
394-
<map interface="ID2D(\d+).*Sink1?" callback="true" callback-dual="true" />
395-
<map interface="ID2D(\d+).*Sink2?" callback="true" callback-dual="true" />
396-
<map interface="ID2D(\d+).*Sink3?" callback="true" callback-dual="true" />
397-
<map interface="ID2D(\d+).*Sink4?" callback="true" callback-dual="true" />
385+
<map interface="ID2D(\d+).*Sink1?" callback="true" callback-dual="true" callback-visibility="internal" />
386+
<map interface="ID2D(\d+).*Sink2?" callback="true" callback-dual="true" callback-visibility="internal" />
387+
<map interface="ID2D(\d+).*Sink3?" callback="true" callback-dual="true" callback-visibility="internal" />
388+
<map interface="ID2D(\d+).*Sink4?" callback="true" callback-dual="true" callback-visibility="internal" />
398389

399390
<!--<map param="ID2D1DeviceContext::CreateColorContextFromWicColorContext::wicColorContext" type="IUnknown"/>
400391
<map param="ID2D1DeviceContext::CreateColorContextFromWicColorContext::colorContext" type="IUnknown"/>-->
@@ -423,7 +414,7 @@
423414

424415
<map param="ID2D1Effect::GetInput::input" return="true"/>
425416

426-
<map interface="ID2D1EffectImpl" name="CustomEffect" callback="true" callback-dual="true" />
417+
<map interface="ID2D1EffectImpl" name="CustomEffect" callback="true" callback-dual="true" callback-visibility="internal" />
427418

428419
<map method="ID2D1EffectContext::GetDpi" visibility="internal"/>
429420

0 commit comments

Comments
 (0)