Improve bindings and push new packages.

This commit is contained in:
Amer Koleci
2022-10-07 14:20:42 +02:00
parent d88b4a2c8d
commit bc6b5ab366
7 changed files with 17 additions and 16 deletions

View File

@@ -7,7 +7,7 @@
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<VersionPrefix>1.7.5</VersionPrefix>
<VersionPrefix>1.7.6</VersionPrefix>
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

View File

@@ -66,10 +66,6 @@ Global
{978D804A-9F52-4ED4-95D9-BBED341E48A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{978D804A-9F52-4ED4-95D9-BBED341E48A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{978D804A-9F52-4ED4-95D9-BBED341E48A6}.Release|Any CPU.Build.0 = Release|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.Build.0 = Release|Any CPU
{08019242-4899-448C-AA40-9F72F3BBE9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08019242-4899-448C-AA40-9F72F3BBE9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08019242-4899-448C-AA40-9F72F3BBE9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,6 +78,10 @@ Global
{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.Build.0 = Debug|Any CPU
{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.ActiveCfg = Release|Any CPU
{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.Build.0 = Release|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -1163,7 +1163,7 @@ public static class Program
}
else if (jsonFile == "Graphics.Imaging.D2D.json")
{
docFile = $"../Vortice.Win32/Generated/Graphics/Imaging";
docFile = $"../Vortice.Win32.Graphics.Imaging/Imaging";
}
else if (jsonFile == "Graphics.Direct3D11on12.json")
{

View File

@@ -9,7 +9,7 @@
namespace Win32.Graphics.Imaging.D2D;
/// <include file='../../Vortice.Win32/Generated/Graphics/Imaging.xml' path='doc/member[@name="IWICImageEncoder"]/*' />
/// <include file='../../Vortice.Win32.Graphics.Imaging/Imaging.xml' path='doc/member[@name="IWICImageEncoder"]/*' />
/// <unmanaged>IWICImageEncoder</unmanaged>
[Guid("04c75bf8-3ce1-473b-acc5-3cc4f5e94999")]
[NativeTypeName("struct IWICImageEncoder : IUnknown")]
@@ -74,7 +74,7 @@ public unsafe partial struct IWICImageEncoder : INativeGuid
return ((delegate* unmanaged[Stdcall]<IUnknown*, uint>)(lpVtbl[2]))((IUnknown*)Unsafe.AsPointer(ref this));
}
/// <include file='../../Vortice.Win32/Generated/Graphics/Imaging.xml' path='doc/member[@name="IWICImageEncoder::WriteFrame"]/*' />
/// <include file='../../Vortice.Win32.Graphics.Imaging/Imaging.xml' path='doc/member[@name="IWICImageEncoder::WriteFrame"]/*' />
[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(3)]
public HResult WriteFrame(Graphics.Direct2D.ID2D1Image* pImage, Graphics.Imaging.IWICBitmapFrameEncode* pFrameEncode, Graphics.Imaging.WICImageParameters* pImageParameters)
@@ -82,7 +82,7 @@ public unsafe partial struct IWICImageEncoder : INativeGuid
return ((delegate* unmanaged[Stdcall]<IWICImageEncoder*, Graphics.Direct2D.ID2D1Image*, Graphics.Imaging.IWICBitmapFrameEncode*, Graphics.Imaging.WICImageParameters*, int>)(lpVtbl[3]))((IWICImageEncoder*)Unsafe.AsPointer(ref this), pImage, pFrameEncode, pImageParameters);
}
/// <include file='../../Vortice.Win32/Generated/Graphics/Imaging.xml' path='doc/member[@name="IWICImageEncoder::WriteFrameThumbnail"]/*' />
/// <include file='../../Vortice.Win32.Graphics.Imaging/Imaging.xml' path='doc/member[@name="IWICImageEncoder::WriteFrameThumbnail"]/*' />
[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(4)]
public HResult WriteFrameThumbnail(Graphics.Direct2D.ID2D1Image* pImage, Graphics.Imaging.IWICBitmapFrameEncode* pFrameEncode, Graphics.Imaging.WICImageParameters* pImageParameters)
@@ -90,7 +90,7 @@ public unsafe partial struct IWICImageEncoder : INativeGuid
return ((delegate* unmanaged[Stdcall]<IWICImageEncoder*, Graphics.Direct2D.ID2D1Image*, Graphics.Imaging.IWICBitmapFrameEncode*, Graphics.Imaging.WICImageParameters*, int>)(lpVtbl[4]))((IWICImageEncoder*)Unsafe.AsPointer(ref this), pImage, pFrameEncode, pImageParameters);
}
/// <include file='../../Vortice.Win32/Generated/Graphics/Imaging.xml' path='doc/member[@name="IWICImageEncoder::WriteThumbnail"]/*' />
/// <include file='../../Vortice.Win32.Graphics.Imaging/Imaging.xml' path='doc/member[@name="IWICImageEncoder::WriteThumbnail"]/*' />
[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(5)]
public HResult WriteThumbnail(Graphics.Direct2D.ID2D1Image* pImage, Graphics.Imaging.IWICBitmapEncoder* pEncoder, Graphics.Imaging.WICImageParameters* pImageParameters)

View File

@@ -9,7 +9,7 @@
namespace Win32.Graphics.Imaging.D2D;
/// <include file='../../Vortice.Win32/Generated/Graphics/Imaging.xml' path='doc/member[@name="IWICImagingFactory2"]/*' />
/// <include file='../../Vortice.Win32.Graphics.Imaging/Imaging.xml' path='doc/member[@name="IWICImagingFactory2"]/*' />
/// <unmanaged>IWICImagingFactory2</unmanaged>
[Guid("7b816b45-1996-4476-b132-de9e247c8af0")]
[NativeTypeName("struct IWICImagingFactory2 : IWICImagingFactory")]
@@ -248,7 +248,7 @@ public unsafe partial struct IWICImagingFactory2 : INativeGuid
return ((delegate* unmanaged[Stdcall]<IWICImagingFactory2*, Graphics.Imaging.IWICMetadataQueryReader*, Guid*, Graphics.Imaging.IWICMetadataQueryWriter**, int>)(lpVtbl[24]))((IWICImagingFactory2*)Unsafe.AsPointer(ref this), pIQueryReader, pguidVendor, ppIQueryWriter);
}
/// <include file='../../Vortice.Win32/Generated/Graphics/Imaging.xml' path='doc/member[@name="IWICImagingFactory2::CreateImageEncoder"]/*' />
/// <include file='../../Vortice.Win32.Graphics.Imaging/Imaging.xml' path='doc/member[@name="IWICImagingFactory2::CreateImageEncoder"]/*' />
[MethodImpl(MethodImplOptions.AggressiveInlining)]
[VtblIndex(25)]
public HResult CreateImageEncoder(Graphics.Direct2D.ID2D1Device* pD2DDevice, IWICImageEncoder** ppWICImageEncoder)

View File

@@ -18,7 +18,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj" />
<ProjectReference Include="..\Vortice.Win32.Graphics.Imaging\Vortice.Win32.Graphics.Imaging.csproj" />
<ProjectReference Include="..\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Vortice.Win32.Direct2D\Vortice.Win32.Direct2D.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Dxc\Vortice.Win32.Dxc.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D11\Vortice.Win32.Graphics.Direct3D11.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D12\Vortice.Win32.Graphics.Direct3D12.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D11on12\Vortice.Win32.Graphics.Direct3D11on12.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct2D\Vortice.Win32.Graphics.Direct2D.csproj" />
<ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D.Dxc\Vortice.Win32.Graphics.Direct3D.Dxc.csproj" />
</ItemGroup>
<ItemGroup>