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

Commit 31f49ac

Browse files
authored
Merge pull request #1057 from sharpdx/fix-sharpgen
Fix SharpGenTools Regressions
2 parents ef64d18 + 49288e1 commit 31f49ac

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

Source/Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</PropertyGroup>
5151

5252
<ItemGroup>
53-
<PackageReference Include="SharpGenTools.Sdk" Version="1.1.1-ci462" PrivateAssets="All" />
53+
<PackageReference Include="SharpGenTools.Sdk" Version="1.1.1-ci464" PrivateAssets="All" />
5454
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.1.0" PrivateAssets="All" />
5555
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All"/>
5656
<SharpGenGlobalNamespaceOverrides Include="InterfaceArray" Override="ComArray" />

Source/SharpDX.Direct2D1/WIC/ColorContextsHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ internal static ColorContext[] TryGetColorContexts(ColorContextsProvider getColo
5959
ColorContext[] colorContexts;
6060
Result result = TryGetColorContexts(getColorContexts, imagingFactory, out colorContexts);
6161

62-
if (ResultCode.Unsupportedoperation != result)
62+
if (ResultCode.UnsupportedOperation != result)
6363
result.CheckError();
6464

6565
return colorContexts;

Source/SharpDX.Direct3D11/Mapping.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,13 @@
7373
<const from-macro="D3D11_REQ_TEXTURECUBE_DIMENSION" class="SharpDX.Direct3D11.Resource" type="int" name="MaximumTextureCubeSize" />
7474

7575
<create class="ResultCode" visibility="public static" />
76+
<context>winerror</context>
7677
<const from-macro="D3D11_ERROR_(.*)" type="SharpDX.ResultDescriptor" cpp-type="int" name="$1" class="SharpDX.Direct3D11.ResultCode" visibility="public static readonly">new SharpDX.ResultDescriptor($1, "$3", "$0", "$2")</const>
7778
<const from-macro="D3DX11_ERR_(.*)" type="SharpDX.ResultDescriptor" cpp-type="int" name="$1" class="SharpDX.Direct3D11.ResultCode" visibility="public static readonly">new SharpDX.ResultDescriptor($1, "$3", "$0", "$2")</const>
78-
79+
<context-clear />
80+
81+
<context id="d3d11-all"/>
82+
7983
<create class="CommonShaderStage" visibility="public abstract partial" />
8084
<const from-macro="D3D11_COMMONSHADER_(.*)" class="SharpDX.Direct3D11.CommonShaderStage" type="int" name="$1" />
8185
<const from-macro="D3D11_IA_(.*)" class="SharpDX.Direct3D11.InputAssemblerStage" type="int" name="$1" />

Source/SharpDX/Direct3D/Mapping.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
// *****************************************************************
6666
-->
6767
<map enum="D3D(.*)" name-tmp="$1" />
68-
<map enum-item="D3D(.*)" name-tmp="$1" />
68+
<map enum-item="D3D(?!_PF_)(.*)" name-tmp="$1" />
6969
<map enum-item="D3D_INTERPOLATION(.*)" name-tmp="$1" />
7070
<remove enum-item="D3D(\d+)_CBF_USERPACKED.*"/>
7171
<remove enum-item="D3D(\d+)_PRIMITIVE_TOPOLOGY_.*" />

0 commit comments

Comments
 (0)