diff --git a/Directory.Build.props b/Directory.Build.props index c0a44af..24d573b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ true true - 1.7.5 + 1.7.6 true diff --git a/Vortice.Win32.sln b/Vortice.Win32.sln index a64cf86..139e0a5 100644 --- a/Vortice.Win32.sln +++ b/Vortice.Win32.sln @@ -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 diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index 6ae1a90..a53abda 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -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") { diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImageEncoder.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImageEncoder.cs index 9279f2d..d3088bd 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImageEncoder.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImageEncoder.cs @@ -9,7 +9,7 @@ namespace Win32.Graphics.Imaging.D2D; -/// +/// /// IWICImageEncoder [Guid("04c75bf8-3ce1-473b-acc5-3cc4f5e94999")] [NativeTypeName("struct IWICImageEncoder : IUnknown")] @@ -74,7 +74,7 @@ public unsafe partial struct IWICImageEncoder : INativeGuid return ((delegate* unmanaged[Stdcall])(lpVtbl[2]))((IUnknown*)Unsafe.AsPointer(ref this)); } - /// + /// [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])(lpVtbl[3]))((IWICImageEncoder*)Unsafe.AsPointer(ref this), pImage, pFrameEncode, pImageParameters); } - /// + /// [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])(lpVtbl[4]))((IWICImageEncoder*)Unsafe.AsPointer(ref this), pImage, pFrameEncode, pImageParameters); } - /// + /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(5)] public HResult WriteThumbnail(Graphics.Direct2D.ID2D1Image* pImage, Graphics.Imaging.IWICBitmapEncoder* pEncoder, Graphics.Imaging.WICImageParameters* pImageParameters) diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs index e5fcc74..950f63f 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs @@ -9,7 +9,7 @@ namespace Win32.Graphics.Imaging.D2D; -/// +/// /// IWICImagingFactory2 [Guid("7b816b45-1996-4476-b132-de9e247c8af0")] [NativeTypeName("struct IWICImagingFactory2 : IWICImagingFactory")] @@ -248,7 +248,7 @@ public unsafe partial struct IWICImagingFactory2 : INativeGuid return ((delegate* unmanaged[Stdcall])(lpVtbl[24]))((IWICImagingFactory2*)Unsafe.AsPointer(ref this), pIQueryReader, pguidVendor, ppIQueryWriter); } - /// + /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(25)] public HResult CreateImageEncoder(Graphics.Direct2D.ID2D1Device* pD2DDevice, IWICImageEncoder** ppWICImageEncoder) diff --git a/src/Vortice.Win32.Graphics.Direct2D/Vortice.Win32.Graphics.Direct2D.csproj b/src/Vortice.Win32.Graphics.Direct2D/Vortice.Win32.Graphics.Direct2D.csproj index 7e501d6..af60f55 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Vortice.Win32.Graphics.Direct2D.csproj +++ b/src/Vortice.Win32.Graphics.Direct2D/Vortice.Win32.Graphics.Direct2D.csproj @@ -18,7 +18,8 @@ - + + diff --git a/src/samples/01-ClearScreen/01-ClearScreen.csproj b/src/samples/01-ClearScreen/01-ClearScreen.csproj index 8ce3ec2..01902a8 100644 --- a/src/samples/01-ClearScreen/01-ClearScreen.csproj +++ b/src/samples/01-ClearScreen/01-ClearScreen.csproj @@ -8,12 +8,12 @@ - - - + + +