From 64250d17bcb29d790b6e78146b5b196212c46b73 Mon Sep 17 00:00:00 2001 From: Amer Koleci Date: Tue, 20 Sep 2022 12:41:14 +0200 Subject: [PATCH] Better naming convention and bump to version 1.5.3 --- src/Generator/Program.cs | 43 ++++++ .../Generated/Graphics/Direct2D.cs | 118 +++++++-------- .../Direct2D/ID2D1GdiInteropRenderTarget.cs | 4 +- .../Generated/Graphics/Direct3D.cs | 6 +- .../Generated/Graphics/Direct3D11.cs | 10 +- .../Direct3D11/ID3D11VideoContext2.cs | 16 +-- .../Direct3D11/ID3D11VideoContext3.cs | 16 +-- .../Generated/Graphics/Direct3D12.cs | 8 +- .../Direct3D12/ID3D12GraphicsCommandList1.cs | 8 +- .../Direct3D12/ID3D12GraphicsCommandList2.cs | 8 +- .../Direct3D12/ID3D12GraphicsCommandList3.cs | 8 +- .../Direct3D12/ID3D12GraphicsCommandList4.cs | 8 +- .../Direct3D12/ID3D12GraphicsCommandList5.cs | 8 +- .../Direct3D12/ID3D12GraphicsCommandList6.cs | 8 +- .../Generated/Graphics/Dxgi.Common.cs | 2 +- src/Vortice.Win32/Generated/Graphics/Dxgi.cs | 6 +- .../Graphics/Dxgi/IDXGISwapChain4.cs | 4 +- .../Graphics/Imaging/IWICJpegFrameDecode.cs | 4 +- .../Graphics/Imaging/IWICJpegFrameEncode.cs | 4 +- .../Graphics/Direct2D/ID2D1DeviceContext.cs | 13 ++ .../Graphics/Direct2D/ID2D1Effect.cs | 14 ++ .../Graphics/Direct2D/ID2D1EffectContext.cs | 25 ++++ .../Graphics/Direct2D/ID2D1Properties.cs | 134 ++++++++++++++++++ src/Vortice.Win32/Vortice.Win32.csproj | 6 +- 24 files changed, 357 insertions(+), 124 deletions(-) create mode 100644 src/Vortice.Win32/Graphics/Direct2D/ID2D1EffectContext.cs create mode 100644 src/Vortice.Win32/Graphics/Direct2D/ID2D1Properties.cs diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index 9a10e79..940a3aa 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -203,6 +203,13 @@ public static class Program private static readonly HashSet s_partRenamesSet = new(StringComparer.OrdinalIgnoreCase) { + "Int16", + "UInt16", + "Int32", + "UInt32", + "Int64", + "UInt64", + "IUnknown", "DispatchMesh", "EncodeFrame", "DrawInstanced", @@ -623,6 +630,34 @@ public static class Program "NoCache", "CacheOnDemand", "CacheOnLoad", + "DpiCompensation", + "ArithmeticComposite", + "BitmapSource", + "ChromaKey", + "ColorManagement", + "ConvolveMatrix", + "DirectionalBlur", + "DiscreteTransfer", + "DisplacementMap", + "DistantDiffuse", + "DistantSpecular", + "EdgeDetection", + "GammaTransfer", + "GaussianBlur", + "HDRTonemap", + "HighlightSandShadows", + "HueRotation", + "HueToRgb", + "LinearTransfer", + "OpacityMetadata", + "PointDiffuse", + "PointSpecular", + "SpotDiffuse", + "SpotSpecular", + "RgbToHue", + "SubProperty", + "TableTransfer", + "WhiteLevelAdjustment", }; private static readonly HashSet s_preserveCaps = new(StringComparer.OrdinalIgnoreCase) @@ -649,11 +684,14 @@ public static class Program "3D", "MRT", "D3D", + "D3D10", "D3D11", "D3D12", "D2D", "D2D1", "DWRITE", + "HDR", + "DC", }; @@ -795,6 +833,11 @@ public static class Program // D2D1 { "D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE", "AffineTransform2DInterpolationMode" }, + { "D2D1_3DTRANSFORM_PROP", "Transform3DProperties" }, + { "D2D1_3DTRANSFORM_INTERPOLATION_MODE", "Transform3DInterpolationMode" }, + { "D2D1_3DPERSPECTIVETRANSFORM_PROP", "PerspectiveTransform3DProperties" }, + { "D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE", "PerspectiveTransform3DInteroplationMode" }, + { "D2D1_2DAFFINETRANSFORM_PROP", "AffineTransform2DProperties" }, // Dxc { "DXC_HASHFLAG", "DxcHashFlags" }, diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.cs index 8441a83..3cf2b6d 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct2D.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.cs @@ -1962,7 +1962,7 @@ public enum CompatibleRenderTargetOptions : uint /// /// D2D1_DC_INITIALIZE_MODE -public enum DcInitializeMode : uint +public enum DCInitializeMode : uint { /// /// D2D1_DC_INITIALIZE_MODE_COPY @@ -2022,7 +2022,7 @@ public enum ChannelSelector : uint /// /// D2D1_BITMAPSOURCE_ORIENTATION -public enum BitmapsourceOrientation : uint +public enum BitmapSourceOrientation : uint { /// /// D2D1_BITMAPSOURCE_ORIENTATION_DEFAULT @@ -2052,7 +2052,7 @@ public enum BitmapsourceOrientation : uint /// /// D2D1_GAUSSIANBLUR_PROP -public enum GaussianblurProp : uint +public enum GaussianBlurProp : uint { /// /// D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION @@ -2067,7 +2067,7 @@ public enum GaussianblurProp : uint /// /// D2D1_GAUSSIANBLUR_OPTIMIZATION -public enum GaussianblurOptimization : uint +public enum GaussianBlurOptimization : uint { /// /// D2D1_GAUSSIANBLUR_OPTIMIZATION_SPEED @@ -2082,7 +2082,7 @@ public enum GaussianblurOptimization : uint /// /// D2D1_DIRECTIONALBLUR_PROP -public enum DirectionalblurProp : uint +public enum DirectionalBlurProp : uint { /// /// D2D1_DIRECTIONALBLUR_PROP_STANDARD_DEVIATION @@ -2100,7 +2100,7 @@ public enum DirectionalblurProp : uint /// /// D2D1_DIRECTIONALBLUR_OPTIMIZATION -public enum DirectionalblurOptimization : uint +public enum DirectionalBlurOptimization : uint { /// /// D2D1_DIRECTIONALBLUR_OPTIMIZATION_SPEED @@ -2163,7 +2163,7 @@ public enum SaturationProp : uint /// /// D2D1_HUEROTATION_PROP -public enum HuerotationProp : uint +public enum HueRotationProp : uint { /// /// D2D1_HUEROTATION_PROP_ANGLE @@ -2187,7 +2187,7 @@ public enum ColorMatrixProp : uint /// /// D2D1_BITMAPSOURCE_PROP -public enum BitmapsourceProp : uint +public enum BitmapSourceProp : uint { /// /// D2D1_BITMAPSOURCE_PROP_WIC_BITMAP_SOURCE @@ -2211,7 +2211,7 @@ public enum BitmapsourceProp : uint /// /// D2D1_BITMAPSOURCE_INTERPOLATION_MODE -public enum BitmapsourceInterpolationMode : uint +public enum BitmapSourceInterpolationMode : uint { /// /// D2D1_BITMAPSOURCE_INTERPOLATION_MODE_NEAREST_NEIGHBOR @@ -2232,7 +2232,7 @@ public enum BitmapsourceInterpolationMode : uint /// /// D2D1_BITMAPSOURCE_ALPHA_MODE -public enum BitmapsourceAlphaMode : uint +public enum BitmapSourceAlphaMode : uint { /// /// D2D1_BITMAPSOURCE_ALPHA_MODE_PREMULTIPLIED @@ -2253,7 +2253,7 @@ public enum CompositeProp : uint /// /// D2D1_3DTRANSFORM_PROP -public enum _3dtransformProp : uint +public enum Transform3DProperties : uint { /// /// D2D1_3DTRANSFORM_PROP_INTERPOLATION_MODE @@ -2268,7 +2268,7 @@ public enum _3dtransformProp : uint /// /// D2D1_3DTRANSFORM_INTERPOLATION_MODE -public enum _3dtransformInterpolationMode : uint +public enum Transform3DInterpolationMode : uint { /// /// D2D1_3DTRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR @@ -2289,7 +2289,7 @@ public enum _3dtransformInterpolationMode : uint /// /// D2D1_3DPERSPECTIVETRANSFORM_PROP -public enum _3dperspectivetransformProp : uint +public enum PerspectiveTransform3DProperties : uint { /// /// D2D1_3DPERSPECTIVETRANSFORM_PROP_INTERPOLATION_MODE @@ -2319,7 +2319,7 @@ public enum _3dperspectivetransformProp : uint /// /// D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE -public enum _3dperspectivetransformInterpolationMode : uint +public enum PerspectiveTransform3DInteroplationMode : uint { /// /// D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR @@ -2340,7 +2340,7 @@ public enum _3dperspectivetransformInterpolationMode : uint /// /// D2D1_2DAFFINETRANSFORM_PROP -public enum _2daffinetransformProp : uint +public enum AffineTransform2DProperties : uint { /// /// D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE @@ -2358,7 +2358,7 @@ public enum _2daffinetransformProp : uint /// /// D2D1_DPICOMPENSATION_PROP -public enum DpicompensationProp : uint +public enum DpiCompensationProp : uint { /// /// D2D1_DPICOMPENSATION_PROP_INTERPOLATION_MODE @@ -2373,7 +2373,7 @@ public enum DpicompensationProp : uint /// /// D2D1_DPICOMPENSATION_INTERPOLATION_MODE -public enum DpicompensationInterpolationMode : uint +public enum DpiCompensationInterpolationMode : uint { /// /// D2D1_DPICOMPENSATION_INTERPOLATION_MODE_NEAREST_NEIGHBOR @@ -2469,7 +2469,7 @@ public enum TurbulenceProp : uint /// /// D2D1_DISPLACEMENTMAP_PROP -public enum DisplacementmapProp : uint +public enum DisplacementMapProp : uint { /// /// D2D1_DISPLACEMENTMAP_PROP_SCALE @@ -2484,7 +2484,7 @@ public enum DisplacementmapProp : uint /// /// D2D1_COLORMANAGEMENT_PROP -public enum ColormanagementProp : uint +public enum ColorManagementProp : uint { /// /// D2D1_COLORMANAGEMENT_PROP_SOURCE_COLOR_CONTEXT @@ -2508,7 +2508,7 @@ public enum ColormanagementProp : uint /// /// D2D1_COLORMANAGEMENT_ALPHA_MODE -public enum ColormanagementAlphaMode : uint +public enum ColorManagementAlphaMode : uint { /// /// D2D1_COLORMANAGEMENT_ALPHA_MODE_PREMULTIPLIED @@ -2520,7 +2520,7 @@ public enum ColormanagementAlphaMode : uint /// /// D2D1_COLORMANAGEMENT_QUALITY -public enum ColormanagementQuality : uint +public enum ColorManagementQuality : uint { /// /// D2D1_COLORMANAGEMENT_QUALITY_PROOF @@ -2535,7 +2535,7 @@ public enum ColormanagementQuality : uint /// /// D2D1_COLORMANAGEMENT_RENDERING_INTENT -public enum ColormanagementRenderingIntent : uint +public enum ColorManagementRenderingIntent : uint { /// /// D2D1_COLORMANAGEMENT_RENDERING_INTENT_PERCEPTUAL @@ -2568,7 +2568,7 @@ public enum HistogramProp : uint /// /// D2D1_POINTSPECULAR_PROP -public enum PointspecularProp : uint +public enum PointSpecularProp : uint { /// /// D2D1_POINTSPECULAR_PROP_LIGHT_POSITION @@ -2595,7 +2595,7 @@ public enum PointspecularProp : uint /// /// D2D1_POINTSPECULAR_SCALE_MODE -public enum PointspecularScaleMode : uint +public enum PointSpecularScaleMode : uint { /// /// D2D1_POINTSPECULAR_SCALE_MODE_NEAREST_NEIGHBOR @@ -2619,7 +2619,7 @@ public enum PointspecularScaleMode : uint /// /// D2D1_SPOTSPECULAR_PROP -public enum SpotspecularProp : uint +public enum SpotSpecularProp : uint { /// /// D2D1_SPOTSPECULAR_PROP_LIGHT_POSITION @@ -2655,7 +2655,7 @@ public enum SpotspecularProp : uint /// /// D2D1_SPOTSPECULAR_SCALE_MODE -public enum SpotspecularScaleMode : uint +public enum SpotSpecularScaleMode : uint { /// /// D2D1_SPOTSPECULAR_SCALE_MODE_NEAREST_NEIGHBOR @@ -2679,7 +2679,7 @@ public enum SpotspecularScaleMode : uint /// /// D2D1_DISTANTSPECULAR_PROP -public enum DistantspecularProp : uint +public enum DistantSpecularProp : uint { /// /// D2D1_DISTANTSPECULAR_PROP_AZIMUTH @@ -2709,7 +2709,7 @@ public enum DistantspecularProp : uint /// /// D2D1_DISTANTSPECULAR_SCALE_MODE -public enum DistantspecularScaleMode : uint +public enum DistantSpecularScaleMode : uint { /// /// D2D1_DISTANTSPECULAR_SCALE_MODE_NEAREST_NEIGHBOR @@ -2733,7 +2733,7 @@ public enum DistantspecularScaleMode : uint /// /// D2D1_POINTDIFFUSE_PROP -public enum PointdiffuseProp : uint +public enum PointDiffuseProp : uint { /// /// D2D1_POINTDIFFUSE_PROP_LIGHT_POSITION @@ -2757,7 +2757,7 @@ public enum PointdiffuseProp : uint /// /// D2D1_POINTDIFFUSE_SCALE_MODE -public enum PointdiffuseScaleMode : uint +public enum PointDiffuseScaleMode : uint { /// /// D2D1_POINTDIFFUSE_SCALE_MODE_NEAREST_NEIGHBOR @@ -2781,7 +2781,7 @@ public enum PointdiffuseScaleMode : uint /// /// D2D1_SPOTDIFFUSE_PROP -public enum SpotdiffuseProp : uint +public enum SpotDiffuseProp : uint { /// /// D2D1_SPOTDIFFUSE_PROP_LIGHT_POSITION @@ -2814,7 +2814,7 @@ public enum SpotdiffuseProp : uint /// /// D2D1_SPOTDIFFUSE_SCALE_MODE -public enum SpotdiffuseScaleMode : uint +public enum SpotDiffuseScaleMode : uint { /// /// D2D1_SPOTDIFFUSE_SCALE_MODE_NEAREST_NEIGHBOR @@ -2838,7 +2838,7 @@ public enum SpotdiffuseScaleMode : uint /// /// D2D1_DISTANTDIFFUSE_PROP -public enum DistantdiffuseProp : uint +public enum DistantDiffuseProp : uint { /// /// D2D1_DISTANTDIFFUSE_PROP_AZIMUTH @@ -2865,7 +2865,7 @@ public enum DistantdiffuseProp : uint /// /// D2D1_DISTANTDIFFUSE_SCALE_MODE -public enum DistantdiffuseScaleMode : uint +public enum DistantDiffuseScaleMode : uint { /// /// D2D1_DISTANTDIFFUSE_SCALE_MODE_NEAREST_NEIGHBOR @@ -2898,7 +2898,7 @@ public enum FloodProp : uint /// /// D2D1_LINEARTRANSFER_PROP -public enum LineartransferProp : uint +public enum LinearTransferProp : uint { /// /// D2D1_LINEARTRANSFER_PROP_RED_Y_INTERCEPT @@ -2943,7 +2943,7 @@ public enum LineartransferProp : uint /// /// D2D1_GAMMATRANSFER_PROP -public enum GammatransferProp : uint +public enum GammaTransferProp : uint { /// /// D2D1_GAMMATRANSFER_PROP_RED_AMPLITUDE @@ -3000,7 +3000,7 @@ public enum GammatransferProp : uint /// /// D2D1_TABLETRANSFER_PROP -public enum TabletransferProp : uint +public enum TableTransferProp : uint { /// /// D2D1_TABLETRANSFER_PROP_RED_TABLE @@ -3033,7 +3033,7 @@ public enum TabletransferProp : uint /// /// D2D1_DISCRETETRANSFER_PROP -public enum DiscretetransferProp : uint +public enum DiscreteTransferProp : uint { /// /// D2D1_DISCRETETRANSFER_PROP_RED_TABLE @@ -3066,7 +3066,7 @@ public enum DiscretetransferProp : uint /// /// D2D1_CONVOLVEMATRIX_PROP -public enum ConvolvematrixProp : uint +public enum ConvolveMatrixProp : uint { /// /// D2D1_CONVOLVEMATRIX_PROP_KERNEL_UNIT_LENGTH @@ -3105,7 +3105,7 @@ public enum ConvolvematrixProp : uint /// /// D2D1_CONVOLVEMATRIX_SCALE_MODE -public enum ConvolvematrixScaleMode : uint +public enum ConvolveMatrixScaleMode : uint { /// /// D2D1_CONVOLVEMATRIX_SCALE_MODE_NEAREST_NEIGHBOR @@ -3141,7 +3141,7 @@ public enum BrightnessProp : uint /// /// D2D1_ARITHMETICCOMPOSITE_PROP -public enum ArithmeticcompositeProp : uint +public enum ArithmeticCompositeProp : uint { /// /// D2D1_ARITHMETICCOMPOSITE_PROP_COEFFICIENTS @@ -3240,7 +3240,7 @@ public enum AtlasProp : uint /// /// D2D1_OPACITYMETADATA_PROP -public enum OpacitymetadataProp : uint +public enum OpacityMetadataProp : uint { /// /// D2D1_OPACITYMETADATA_PROP_INPUT_OPAQUE_RECT @@ -3262,7 +3262,7 @@ public enum PropertyType : uint Bool = 2, /// /// D2D1_PROPERTY_TYPE_UINT32 - Uint32 = 3, + UInt32 = 3, /// /// D2D1_PROPERTY_TYPE_INT32 Int32 = 4, @@ -3283,7 +3283,7 @@ public enum PropertyType : uint Blob = 9, /// /// D2D1_PROPERTY_TYPE_IUNKNOWN - Iunknown = 10, + IUnknown = 10, /// /// D2D1_PROPERTY_TYPE_ENUM Enum = 11, @@ -3348,7 +3348,7 @@ public enum Property : uint /// /// D2D1_SUBPROPERTY -public enum Subproperty : uint +public enum SubProperty : uint { /// /// D2D1_SUBPROPERTY_DISPLAYNAME @@ -3856,7 +3856,7 @@ public enum ContrastProp : uint /// /// D2D1_RGBTOHUE_PROP -public enum RgbtohueProp : uint +public enum RgbToHueProp : uint { /// /// D2D1_RGBTOHUE_PROP_OUTPUT_COLOR_SPACE @@ -3865,7 +3865,7 @@ public enum RgbtohueProp : uint /// /// D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE -public enum RgbtohueOutputColorSpace : uint +public enum RgbToHueOutputColorSpace : uint { /// /// D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE_HUE_SATURATION_VALUE @@ -3877,7 +3877,7 @@ public enum RgbtohueOutputColorSpace : uint /// /// D2D1_HUETORGB_PROP -public enum HuetorgbProp : uint +public enum HueToRgbProp : uint { /// /// D2D1_HUETORGB_PROP_INPUT_COLOR_SPACE @@ -3886,7 +3886,7 @@ public enum HuetorgbProp : uint /// /// D2D1_HUETORGB_INPUT_COLOR_SPACE -public enum HuetorgbInputColorSpace : uint +public enum HueToRgbInputColorSpace : uint { /// /// D2D1_HUETORGB_INPUT_COLOR_SPACE_HUE_SATURATION_VALUE @@ -3898,7 +3898,7 @@ public enum HuetorgbInputColorSpace : uint /// /// D2D1_CHROMAKEY_PROP -public enum ChromakeyProp : uint +public enum ChromaKeyProp : uint { /// /// D2D1_CHROMAKEY_PROP_COLOR @@ -4039,7 +4039,7 @@ public enum VignetteProp : uint /// /// D2D1_EDGEDETECTION_PROP -public enum EdgedetectionProp : uint +public enum EdgeDetectionProp : uint { /// /// D2D1_EDGEDETECTION_PROP_STRENGTH @@ -4060,7 +4060,7 @@ public enum EdgedetectionProp : uint /// /// D2D1_EDGEDETECTION_MODE -public enum EdgedetectionMode : uint +public enum EdgeDetectionMode : uint { /// /// D2D1_EDGEDETECTION_MODE_SOBEL @@ -4072,7 +4072,7 @@ public enum EdgedetectionMode : uint /// /// D2D1_HIGHLIGHTSANDSHADOWS_PROP -public enum HighlightsandshadowsProp : uint +public enum HighlightSandShadowsProp : uint { /// /// D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS @@ -4093,7 +4093,7 @@ public enum HighlightsandshadowsProp : uint /// /// D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA -public enum HighlightsandshadowsInputGamma : uint +public enum HighlightSandShadowsInputGamma : uint { /// /// D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA_LINEAR @@ -4147,7 +4147,7 @@ public enum TintProp : uint /// /// D2D1_WHITELEVELADJUSTMENT_PROP -public enum WhiteleveladjustmentProp : uint +public enum WhiteLevelAdjustmentProp : uint { /// /// D2D1_WHITELEVELADJUSTMENT_PROP_INPUT_WHITE_LEVEL @@ -4159,7 +4159,7 @@ public enum WhiteleveladjustmentProp : uint /// /// D2D1_HDRTONEMAP_PROP -public enum HdrtonemapProp : uint +public enum HDRTonemapProp : uint { /// /// D2D1_HDRTONEMAP_PROP_INPUT_MAX_LUMINANCE @@ -4174,14 +4174,14 @@ public enum HdrtonemapProp : uint /// /// D2D1_HDRTONEMAP_DISPLAY_MODE -public enum HdrtonemapDisplayMode : uint +public enum HDRTonemapDisplayMode : uint { /// /// D2D1_HDRTONEMAP_DISPLAY_MODE_SDR Sdr = 0, /// /// D2D1_HDRTONEMAP_DISPLAY_MODE_HDR - Hdr = 1, + HDR = 1, } /// @@ -5277,7 +5277,7 @@ public partial struct FeatureDataDoubles /// /// D2D1_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS -public partial struct FeatureDataD3d10XHardwareOptions +public partial struct FeatureDataD3D10XHardwareOptions { /// public Bool32 computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D/ID2D1GdiInteropRenderTarget.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D/ID2D1GdiInteropRenderTarget.cs index b9c0c00..2ecddec 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct2D/ID2D1GdiInteropRenderTarget.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct2D/ID2D1GdiInteropRenderTarget.cs @@ -83,9 +83,9 @@ public unsafe partial struct ID2D1GdiInteropRenderTarget /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(3)] - public HResult GetDC(DcInitializeMode mode, IntPtr* hdc) + public HResult GetDC(DCInitializeMode mode, IntPtr* hdc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[3]))((ID2D1GdiInteropRenderTarget*)Unsafe.AsPointer(ref this), mode, hdc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[3]))((ID2D1GdiInteropRenderTarget*)Unsafe.AsPointer(ref this), mode, hdc); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D.cs index 547fd31..818cabb 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D.cs @@ -818,7 +818,7 @@ public enum ShaderVariableType : int Int16 = 58, /// /// D3D_SVT_UINT16 - Uint16 = 59, + UInt16 = 59, /// /// D3D_SVT_FLOAT16 Float16 = 60, @@ -827,7 +827,7 @@ public enum ShaderVariableType : int Int64 = 61, /// /// D3D_SVT_UINT64 - Uint64 = 62, + UInt64 = 62, } /// @@ -1059,7 +1059,7 @@ public enum RegisterComponentType : int Unknown = 0, /// /// D3D_REGISTER_COMPONENT_UINT32 - Uint32 = 1, + UInt32 = 1, /// /// D3D_REGISTER_COMPONENT_SINT32 Sint32 = 2, diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs index 995f2f1..3378e7c 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs @@ -2935,13 +2935,13 @@ public enum CounterType : int Float32 = 0, /// /// D3D11_COUNTER_TYPE_UINT16 - Uint16 = 1, + UInt16 = 1, /// /// D3D11_COUNTER_TYPE_UINT32 - Uint32 = 2, + UInt32 = 2, /// /// D3D11_COUNTER_TYPE_UINT64 - Uint64 = 3, + UInt64 = 3, } /// @@ -5415,7 +5415,7 @@ public enum MessageId : int DeviceRSSetScissorRectsNegativescissor = 1048632, /// /// D3D11_MESSAGE_ID_SLOT_ZERO_MUST_BE_D3D10_INPUT_PER_VERTEX_DATA - SlotZeroMustBeD3d10InputPerVertexData = 1048633, + SlotZeroMustBeD3D10InputPerVertexData = 1048633, /// /// D3D11_MESSAGE_ID_CREATERESOURCE_NON_POW_2_MIPMAP CreateResourceNonPow2Mipmap = 1048634, @@ -10234,7 +10234,7 @@ public partial struct FeatureDataFormatSupport2 /// /// D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS -public partial struct FeatureDataD3d10XHardwareOptions +public partial struct FeatureDataD3D10XHardwareOptions { /// public Bool32 ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext2.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext2.cs index 73278d7..37ddaf7 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext2.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext2.cs @@ -691,33 +691,33 @@ public unsafe partial struct ID3D11VideoContext2 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(79)] - public void VideoProcessorSetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HdrMetadataType Type, uint Size, void* pHDRMetaData) + public void VideoProcessorSetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HDRMetadataType Type, uint Size, void* pHDRMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[79]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, Type, Size, pHDRMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[79]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, Type, Size, pHDRMetaData); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(80)] - public void VideoProcessorGetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HdrMetadataType* pType, uint Size, void* pMetaData) + public void VideoProcessorGetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HDRMetadataType* pType, uint Size, void* pMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[80]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, pType, Size, pMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[80]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, pType, Size, pMetaData); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(81)] - public void VideoProcessorSetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HdrMetadataType Type, uint Size, void* pHDRMetaData) + public void VideoProcessorSetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HDRMetadataType Type, uint Size, void* pHDRMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[81]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Type, Size, pHDRMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[81]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Type, Size, pHDRMetaData); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(82)] - public void VideoProcessorGetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HdrMetadataType* pType, uint Size, void* pMetaData) + public void VideoProcessorGetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HDRMetadataType* pType, uint Size, void* pMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[82]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pType, Size, pMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[82]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pType, Size, pMetaData); } } diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext3.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext3.cs index a48b9ea..bf99ca6 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext3.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoContext3.cs @@ -691,33 +691,33 @@ public unsafe partial struct ID3D11VideoContext3 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(79)] - public void VideoProcessorSetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HdrMetadataType Type, uint Size, void* pHDRMetaData) + public void VideoProcessorSetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HDRMetadataType Type, uint Size, void* pHDRMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[79]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, Type, Size, pHDRMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[79]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, Type, Size, pHDRMetaData); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(80)] - public void VideoProcessorGetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HdrMetadataType* pType, uint Size, void* pMetaData) + public void VideoProcessorGetOutputHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, Graphics.Dxgi.HDRMetadataType* pType, uint Size, void* pMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[80]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, pType, Size, pMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[80]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, pType, Size, pMetaData); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(81)] - public void VideoProcessorSetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HdrMetadataType Type, uint Size, void* pHDRMetaData) + public void VideoProcessorSetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HDRMetadataType Type, uint Size, void* pHDRMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[81]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Type, Size, pHDRMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[81]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Type, Size, pHDRMetaData); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(82)] - public void VideoProcessorGetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HdrMetadataType* pType, uint Size, void* pMetaData) + public void VideoProcessorGetStreamHDRMetaData(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Graphics.Dxgi.HDRMetadataType* pType, uint Size, void* pMetaData) { - ((delegate* unmanaged[Stdcall])(lpVtbl[82]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pType, Size, pMetaData); + ((delegate* unmanaged[Stdcall])(lpVtbl[82]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pType, Size, pMetaData); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs index fad9d18..ab40ec5 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs @@ -3059,7 +3059,7 @@ public enum MetaCommandParameterType : int Float = 0, /// /// D3D12_META_COMMAND_PARAMETER_TYPE_UINT64 - Uint64 = 1, + UInt64 = 1, /// /// D3D12_META_COMMAND_PARAMETER_TYPE_GPU_VIRTUAL_ADDRESS GpuVirtualAddress = 2, @@ -8097,7 +8097,7 @@ public partial struct Range /// /// D3D12_RANGE_UINT64 -public partial struct RangeUint64 +public partial struct RangeUInt64 { /// public ulong Begin; @@ -8108,13 +8108,13 @@ public partial struct RangeUint64 /// /// D3D12_SUBRESOURCE_RANGE_UINT64 -public partial struct SubresourceRangeUint64 +public partial struct SubresourceRangeUInt64 { /// public uint Subresource; /// - public RangeUint64 Range; + public RangeUInt64 Range; } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList1.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList1.cs index 0751381..64a9ed7 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList1.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList1.cs @@ -539,17 +539,17 @@ public unsafe partial struct ID3D12GraphicsCommandList1 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(61)] - public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList2.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList2.cs index 5fbe129..f95c6cf 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList2.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList2.cs @@ -539,17 +539,17 @@ public unsafe partial struct ID3D12GraphicsCommandList2 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(61)] - public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList3.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList3.cs index 20334ae..25bfa20 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList3.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList3.cs @@ -539,17 +539,17 @@ public unsafe partial struct ID3D12GraphicsCommandList3 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(61)] - public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList4.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList4.cs index 23b8122..dbcecb9 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList4.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList4.cs @@ -539,17 +539,17 @@ public unsafe partial struct ID3D12GraphicsCommandList4 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(61)] - public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList5.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList5.cs index 669aceb..8c61367 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList5.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList5.cs @@ -539,17 +539,17 @@ public unsafe partial struct ID3D12GraphicsCommandList5 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(61)] - public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList6.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList6.cs index 4e5e8a4..136f5b1 100644 --- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList6.cs +++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12GraphicsCommandList6.cs @@ -539,17 +539,17 @@ public unsafe partial struct ID3D12GraphicsCommandList6 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(60)] - public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[60]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(61)] - public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUint64* pDependentSubresourceRanges) + public void AtomicCopyBufferUINT64(ID3D12Resource* pDstBuffer, ulong DstOffset, ID3D12Resource* pSrcBuffer, ulong SrcOffset, uint Dependencies, ID3D12Resource** ppDependentResources, SubresourceRangeUInt64* pDependentSubresourceRanges) { - ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); + ((delegate* unmanaged[Stdcall])(lpVtbl[61]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), pDstBuffer, DstOffset, pSrcBuffer, SrcOffset, Dependencies, ppDependentResources, pDependentSubresourceRanges); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi.Common.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi.Common.cs index 9268b4e..28e8829 100644 --- a/src/Vortice.Win32/Generated/Graphics/Dxgi.Common.cs +++ b/src/Vortice.Win32/Generated/Graphics/Dxgi.Common.cs @@ -1713,7 +1713,7 @@ public partial struct ModeDescription /// /// DXGI_JPEG_DC_HUFFMAN_TABLE -public partial struct JpegDcHuffmanTable +public partial struct JpegDCHuffmanTable { /// public unsafe fixed byte CodeCounts[12]; diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi.cs index beb4351..ebca316 100644 --- a/src/Vortice.Win32/Generated/Graphics/Dxgi.cs +++ b/src/Vortice.Win32/Generated/Graphics/Dxgi.cs @@ -462,7 +462,7 @@ public enum OutduplFlags : int /// /// DXGI_HDR_METADATA_TYPE -public enum HdrMetadataType : int +public enum HDRMetadataType : int { /// /// DXGI_HDR_METADATA_TYPE_NONE @@ -2244,7 +2244,7 @@ public partial struct QueryVideoMemoryInfo /// /// DXGI_HDR_METADATA_HDR10 -public partial struct HdrMetadataHdr10 +public partial struct HDRMetadataHdr10 { /// public unsafe fixed ushort RedPrimary[2]; @@ -2273,7 +2273,7 @@ public partial struct HdrMetadataHdr10 /// /// DXGI_HDR_METADATA_HDR10PLUS -public partial struct HdrMetadataHdr10plus +public partial struct HDRMetadataHdr10plus { /// public unsafe fixed byte Data[72]; diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs index 236bcc1..4e8aa0e 100644 --- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs +++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs @@ -379,9 +379,9 @@ public unsafe partial struct IDXGISwapChain4 /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(40)] - public HResult SetHDRMetaData(HdrMetadataType Type, uint Size, void* pMetaData) + public HResult SetHDRMetaData(HDRMetadataType Type, uint Size, void* pMetaData) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[40]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), Type, Size, pMetaData); + return ((delegate* unmanaged[Stdcall])(lpVtbl[40]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), Type, Size, pMetaData); } } diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameDecode.cs b/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameDecode.cs index f88ef30..7edf265 100644 --- a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameDecode.cs +++ b/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameDecode.cs @@ -115,9 +115,9 @@ public unsafe partial struct IWICJpegFrameDecode /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(7)] - public HResult GetDcHuffmanTable(uint scanIndex, uint tableIndex, Graphics.Dxgi.Common.JpegDcHuffmanTable* pDcHuffmanTable) + public HResult GetDcHuffmanTable(uint scanIndex, uint tableIndex, Graphics.Dxgi.Common.JpegDCHuffmanTable* pDcHuffmanTable) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[7]))((IWICJpegFrameDecode*)Unsafe.AsPointer(ref this), scanIndex, tableIndex, pDcHuffmanTable); + return ((delegate* unmanaged[Stdcall])(lpVtbl[7]))((IWICJpegFrameDecode*)Unsafe.AsPointer(ref this), scanIndex, tableIndex, pDcHuffmanTable); } /// diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameEncode.cs b/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameEncode.cs index 6ea55f1..d6ff1e5 100644 --- a/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameEncode.cs +++ b/src/Vortice.Win32/Generated/Graphics/Imaging/IWICJpegFrameEncode.cs @@ -91,9 +91,9 @@ public unsafe partial struct IWICJpegFrameEncode /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(4)] - public HResult GetDcHuffmanTable(uint scanIndex, uint tableIndex, Graphics.Dxgi.Common.JpegDcHuffmanTable* pDcHuffmanTable) + public HResult GetDcHuffmanTable(uint scanIndex, uint tableIndex, Graphics.Dxgi.Common.JpegDCHuffmanTable* pDcHuffmanTable) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[4]))((IWICJpegFrameEncode*)Unsafe.AsPointer(ref this), scanIndex, tableIndex, pDcHuffmanTable); + return ((delegate* unmanaged[Stdcall])(lpVtbl[4]))((IWICJpegFrameEncode*)Unsafe.AsPointer(ref this), scanIndex, tableIndex, pDcHuffmanTable); } /// diff --git a/src/Vortice.Win32/Graphics/Direct2D/ID2D1DeviceContext.cs b/src/Vortice.Win32/Graphics/Direct2D/ID2D1DeviceContext.cs index d861cd7..2fcf216 100644 --- a/src/Vortice.Win32/Graphics/Direct2D/ID2D1DeviceContext.cs +++ b/src/Vortice.Win32/Graphics/Direct2D/ID2D1DeviceContext.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. using System.Drawing; +using System.Runtime.CompilerServices; using Win32.Graphics.Direct2D.Common; using Win32.Graphics.Imaging; @@ -98,6 +99,18 @@ public unsafe partial struct ID2D1DeviceContext return CreateBitmapBrush(bitmap, null, null, bitmapBrush); } + public HResult CreateEffect(in Guid effectId, ID2D1Effect** effect) + { + return CreateEffect((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in effectId)), effect); + } + + public ComPtr CreateEffect(in Guid effectId) + { + using ComPtr effect = default; + CreateEffect((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in effectId)), effect.GetAddressOf()).ThrowIfFailed(); + return effect.Move(); + } + public void DrawImage( ID2D1Effect* effect, PointF* targetOffset = null, diff --git a/src/Vortice.Win32/Graphics/Direct2D/ID2D1Effect.cs b/src/Vortice.Win32/Graphics/Direct2D/ID2D1Effect.cs index 7d007d3..adbb40a 100644 --- a/src/Vortice.Win32/Graphics/Direct2D/ID2D1Effect.cs +++ b/src/Vortice.Win32/Graphics/Direct2D/ID2D1Effect.cs @@ -5,6 +5,8 @@ namespace Win32.Graphics.Direct2D; public unsafe partial struct ID2D1Effect { + public uint PropertyCount => GetPropertyCount(); + public HResult SetValueByName(ReadOnlySpan name, ReadOnlySpan data) where T : unmanaged { @@ -48,6 +50,18 @@ public unsafe partial struct ID2D1Effect } } + public HResult GetValueByName(ReadOnlySpan name, ReadOnlySpan data) + where T : unmanaged + { + fixed (char* namePtr = name) + { + fixed (T* dataPtr = data) + { + return GetValueByName((ushort*)namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); + } + } + } + public HResult GetValue(uint index, byte* data, uint dataSize) { return GetValue(index, PropertyType.Unknown, data, dataSize); diff --git a/src/Vortice.Win32/Graphics/Direct2D/ID2D1EffectContext.cs b/src/Vortice.Win32/Graphics/Direct2D/ID2D1EffectContext.cs new file mode 100644 index 0000000..a595d31 --- /dev/null +++ b/src/Vortice.Win32/Graphics/Direct2D/ID2D1EffectContext.cs @@ -0,0 +1,25 @@ +// Copyright © Amer Koleci and Contributors. +// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. + +using System.Drawing; +using System.Runtime.CompilerServices; +using Win32.Graphics.Direct2D.Common; +using Win32.Graphics.Direct3D11; +using Win32.Graphics.Imaging; + +namespace Win32.Graphics.Direct2D; + +public unsafe partial struct ID2D1EffectContext +{ + public HResult CreateEffect(in Guid effectId, ID2D1Effect** effect) + { + return CreateEffect((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in effectId)), effect); + } + + public ComPtr CreateEffect(in Guid effectId) + { + using ComPtr effect = default; + CreateEffect((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in effectId)), effect.GetAddressOf()).ThrowIfFailed(); + return effect.Move(); + } +} diff --git a/src/Vortice.Win32/Graphics/Direct2D/ID2D1Properties.cs b/src/Vortice.Win32/Graphics/Direct2D/ID2D1Properties.cs new file mode 100644 index 0000000..adf1c84 --- /dev/null +++ b/src/Vortice.Win32/Graphics/Direct2D/ID2D1Properties.cs @@ -0,0 +1,134 @@ +// Copyright © Amer Koleci and Contributors. +// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information. + +namespace Win32.Graphics.Direct2D; + +public unsafe partial struct ID2D1Properties +{ + public uint PropertyCount => GetPropertyCount(); + + public bool Cached + { + get => GetBoolValue((uint)Property.Cached); + set => SetValue((uint)Property.Cached, value); + } + + public HResult SetValueByName(ReadOnlySpan name, ReadOnlySpan data) + where T : unmanaged + { + fixed (char* namePtr = name) + { + fixed (T* dataPtr = data) + { + return SetValueByName((ushort*)namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); + } + } + } + + public HResult SetValueByName(ReadOnlySpan name, byte* data, uint dataSize) + { + fixed (char* namePtr = name) + { + return SetValueByName((ushort*)namePtr, PropertyType.Unknown, data, dataSize); + } + } + + public HResult SetValueByName(ushort* name, byte* data, [NativeTypeName("UINT32")] uint dataSize) + { + return SetValueByName(name, PropertyType.Unknown, data, dataSize); + } + + public HResult SetValue(uint index, byte* data, [NativeTypeName("UINT32")] uint dataSize) + { + return SetValue(index, PropertyType.Unknown, data, dataSize); + } + + public HResult GetValueByName(ReadOnlySpan name, byte* data, uint dataSize) + { + fixed (char* namePtr = name) + { + return GetValueByName((ushort*)namePtr, PropertyType.Unknown, data, dataSize); + } + } + + public HResult GetValueByName(ReadOnlySpan name, ReadOnlySpan data) + where T : unmanaged + { + fixed (char* namePtr = name) + { + fixed (T* dataPtr = data) + { + return GetValueByName((ushort*)namePtr, PropertyType.Unknown, (byte*)dataPtr, (uint)(data.Length * sizeof(T))); + } + } + } + + public HResult GetValueByName(ushort* name, byte* data, uint dataSize) + { + return GetValueByName(name, PropertyType.Unknown, data, dataSize); + } + + public HResult GetValue(uint index, byte* data, uint dataSize) + { + return GetValue(index, PropertyType.Unknown, data, dataSize); + } + + public bool GetBoolValue(uint index) + { + int value = 0; + GetValue(index, PropertyType.Bool, (byte*)&value, (uint)sizeof(Bool32)); + return value != 0; + } + + public void SetValue(uint index, Bool32 value) + { + SetValue(index, PropertyType.Bool, (byte*)&value, (uint)sizeof(Bool32)); + } + + public float GetFloatValue(uint index) + { + float value = 0f; + GetValue(index, PropertyType.Float, (byte*)&value, 4); + return value; + } + + public void SetValue(uint index, float value) + { + SetValue(index, PropertyType.Float, (byte*)&value, 4u); + } + + public T GetEnumValue(uint index) where T : unmanaged, Enum + { + T value = default; + GetValue(index, PropertyType.Enum, (byte*)&value, 4); + return value; + } + + public void SetValue(uint index, T value) where T : unmanaged, Enum + { + SetValue(index, PropertyType.Enum, (byte*)&value, 4); + } + + public Guid GetGuidValue(uint index) + { + Guid value = default; + GetValue(index, PropertyType.Clsid, (byte*)&value, (uint)sizeof(Guid)); + return value; + } + + public void SetValue(uint index, Guid value) + { + + SetValue(index, PropertyType.Clsid, (byte*)&value, (uint)sizeof(Guid)); + } + + public void SetValue(uint index, IUnknown* value) + { + SetValue(index, PropertyType.IUnknown, (byte*)value, (uint)sizeof(void*)); + } + + public void SetValue(uint index, ID2D1ColorContext* value) + { + SetValue(index, PropertyType.ColorContext, (byte*)value, (uint)sizeof(void*)); + } +} diff --git a/src/Vortice.Win32/Vortice.Win32.csproj b/src/Vortice.Win32/Vortice.Win32.csproj index 6c0df4d..9755b67 100644 --- a/src/Vortice.Win32/Vortice.Win32.csproj +++ b/src/Vortice.Win32/Vortice.Win32.csproj @@ -3,7 +3,7 @@ netstandard2.0;net6.0; Windows API low level bindings. - 1.5.2 + 1.5.3 true @@ -24,4 +24,8 @@ + + + +