diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 13c606899e..29cd35a33d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -87,7 +87,7 @@ jobs: - name: Restore run: dotnet restore --runtime ${{ matrix.rid }} - name: Test - run: dotnet test -c Release --no-restore --runtime ${{ matrix.rid }} --collect:"XPlat Code Coverage" --results-directory ./coverage --logger:"trx" + run: dotnet test --results-directory coverage --coverage --coverage-output-format cobertura --report-trx -c Release # TODO: https://github.com/dorny/test-reporter?tab=readme-ov-file#recommended-setup-for-public-repositories #- name: Test Report # uses: dorny/test-reporter@v1 diff --git a/.silktouch/91c9aa14a031651f.stout b/.silktouch/91c9aa14a031651f.stout deleted file mode 100644 index 7948b40ed8..0000000000 Binary files a/.silktouch/91c9aa14a031651f.stout and /dev/null differ diff --git a/.silktouch/72b687a9cceac28c.stout b/.silktouch/openal-clangsharp.stout similarity index 98% rename from .silktouch/72b687a9cceac28c.stout rename to .silktouch/openal-clangsharp.stout index 641872d24c..e9812a32ba 100644 Binary files a/.silktouch/72b687a9cceac28c.stout and b/.silktouch/openal-clangsharp.stout differ diff --git a/.silktouch/c8c046b328b09d23.stout b/.silktouch/opengl-clangsharp.stout similarity index 99% rename from .silktouch/c8c046b328b09d23.stout rename to .silktouch/opengl-clangsharp.stout index 6caec14f29..2d7e10b4fa 100644 Binary files a/.silktouch/c8c046b328b09d23.stout and b/.silktouch/opengl-clangsharp.stout differ diff --git a/.silktouch/2b50d7d447412fec.stout b/.silktouch/sdl-clangsharp.stout similarity index 80% rename from .silktouch/2b50d7d447412fec.stout rename to .silktouch/sdl-clangsharp.stout index 10237a99ca..6fae9da526 100644 Binary files a/.silktouch/2b50d7d447412fec.stout and b/.silktouch/sdl-clangsharp.stout differ diff --git a/.silktouch/82fde6eb3b68e085.stout b/.silktouch/vulkan-clangsharp.stout similarity index 80% rename from .silktouch/82fde6eb3b68e085.stout rename to .silktouch/vulkan-clangsharp.stout index 3a1c211031..e904a2fc72 100644 Binary files a/.silktouch/82fde6eb3b68e085.stout and b/.silktouch/vulkan-clangsharp.stout differ diff --git a/Directory.Packages.props b/Directory.Packages.props index de0b8f8952..0c0cf4d13b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,11 +6,11 @@ - + - + @@ -40,8 +40,11 @@ - + + + + - \ No newline at end of file + diff --git a/eng/build/Build.Publishing.cs b/eng/build/Build.Publishing.cs index ff6cd6fad4..e90d55f256 100644 --- a/eng/build/Build.Publishing.cs +++ b/eng/build/Build.Publishing.cs @@ -46,31 +46,21 @@ partial class Build AbsolutePath OutputPackageDir => RootDirectory / "artifacts" / "pkg"; - private void RemoveTemporaryFeeds() - { - try - { - if (DotNet("nuget list source").Any(x => x.Text.Contains(TemporaryNuGetFeed))) - { - DotNet($"nuget remove source \"{TemporaryNuGetFeed}\""); - } - } - catch - { - // probably hasn't existed yet, don't care. - } - } + AbsolutePath NuGetConfigFile => TemporaryDirectory / "push.nuget.config"; + + private void RemoveTemporaryFeeds() => NuGetConfigFile.DeleteFile(); private IEnumerable AddTemporaryFeed() { - if (NugetFeed.Contains("nuget.org")) - { - return []; - } + NuGetConfigFile.WriteAllText( + "" + + "" + ); var srcSettings = new DotNetNuGetAddSourceSettings() .SetName(TemporaryNuGetFeed) - .SetSource(NugetFeed); + .SetSource(NugetFeed) + .SetConfigFile(NuGetConfigFile); if (NugetUsername is null != NugetPassword is null) { @@ -130,7 +120,8 @@ DotNetNuGetPushSettings NuGetPushSettings var ret = new DotNetNuGetPushSettings() .SetNoServiceEndpoint(NugetNoServiceEndpoint) .EnableSkipDuplicate() - .SetSource(NugetFeed.Contains("nuget.org") ? "nuget.org" : TemporaryNuGetFeed); + .SetSource(NugetFeed.Contains("nuget.org") ? "nuget.org" : TemporaryNuGetFeed) + .AddProcessAdditionalArguments("--configfile", NuGetConfigFile); if (NugetApiKey is not null) { ret = ret.SetApiKey(NugetApiKey); diff --git a/eng/submodules/silk.net-2.x b/eng/submodules/silk.net-2.x index 3c0313b2d6..c87fc664cc 160000 --- a/eng/submodules/silk.net-2.x +++ b/eng/submodules/silk.net-2.x @@ -1 +1 @@ -Subproject commit 3c0313b2d69bbde12224c759a76bc2e7e064a893 +Subproject commit c87fc664cc5d15abd754997b0a9ad138470554c4 diff --git a/generator.json b/generator.json index e99c8cdf09..e57ffed302 100644 --- a/generator.json +++ b/generator.json @@ -2,8 +2,8 @@ "Jobs": { "Microsoft": { "Solution": "Silk.NET.sln", - "SourceProject": "TODO.csproj", - "TestProject": "tests/TODO.csproj", + "SourceProject": "sources/Win32/Win32/Silk.NET.Win32.csproj", + "TestProject": "tests/Win32/Win32/Silk.NET.Win32.UnitTests.csproj", "DefaultLicenseHeader": "eng/silktouch/header.txt", "Mods": [ "AddIncludes", @@ -18,7 +18,8 @@ "sources/Windows/um/icm/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs", "sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs", "sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs", - "sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs" + "sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs", + "sources/Windows/shared/strsafe/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/shared/strsafe/Windows.gen.cs" }, "InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows", "InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows", @@ -57,13 +58,9 @@ "InputSourceRoot": "sources/SDL", "InputTestRoot": "tests/SDL" }, - "ExtractNestedTyping": { - "DelegateSuffixOrder": 1 - }, "TransformHandles": { "AssumeMissingTypesOpaque": true, - "UseDSL": true, - "HandleSuffixOrder": 1 + "UseDSL": true }, "TransformFunctions": { "BoolTypes": { @@ -154,9 +151,9 @@ "PathRenderingTokenNV": "byte", "PathCoordType": "byte" }, - "TrimFunctionDataTypes": true, - "TrimEnumTypeNonExclusiveVendors": true, - "TrimEnumMemberImpliedVendors": true + "IdentifyFunctionDataTypes": true, + "IdentifyEnumTypeNonExclusiveVendors": true, + "IdentifyEnumMemberImpliedVendors": true }, "AddVTables": { "VTables": [ @@ -181,6 +178,26 @@ "OcclusionQueryParameterNameNV": "GL", "TexStorageAttribs": "GL", "ContainerType": "GL" + }, + "Affixes": { + "HandleType": { + "Order": 1 + }, + "FunctionPointerDelegateType": { + "Order": 1 + }, + "KhronosVendor": { + "Order": -1 + }, + "KhronosFunctionDataType": { + "IsDiscriminator": true + }, + "KhronosImpliedVendor": { + "Remove": true + }, + "KhronosNonExclusiveVendor": { + "Remove": true + } } }, "TransformEnums": { @@ -248,9 +265,9 @@ "NonVendorSuffixes": [ "Direct" ], - "TrimFunctionDataTypes": true, - "TrimEnumTypeNonExclusiveVendors": true, - "TrimEnumMemberImpliedVendors": true + "IdentifyFunctionDataTypes": true, + "IdentifyEnumTypeNonExclusiveVendors": true, + "IdentifyEnumMemberImpliedVendors": true }, "InterceptNativeFunctions": { "NativeFunctionNames": [ @@ -297,6 +314,26 @@ "EAXGetDirect": "EAXGetDirect", "EAXGetBufferModeDirect": "EAXGetBufferModeDirect", "EAXSetBufferModeDirect": "EAXSetBufferModeDirect" + }, + "Affixes": { + "HandleType": { + "Order": 1 + }, + "FunctionPointerDelegateType": { + "Order": 1 + }, + "KhronosVendor": { + "Order": -1 + }, + "KhronosFunctionDataType": { + "IsDiscriminator": true + }, + "KhronosImpliedVendor": { + "Remove": true + }, + "KhronosNonExclusiveVendor": { + "Remove": true + } } }, "TransformEnums": { @@ -312,11 +349,7 @@ }, "TransformHandles": { "AssumeMissingTypesOpaque": true, - "UseDSL": true, - "HandleSuffixOrder": 1 - }, - "ExtractNestedTyping": { - "DelegateSuffixOrder": 1 + "UseDSL": true }, "StripAttributes": { "Remove": [ @@ -361,9 +394,6 @@ } ] }, - "ExtractNestedTyping": { - "DelegateSuffixOrder": 1 - }, "MixKhronosData": { "SpecPath": "eng/submodules/vulkan/xml/vk.xml", "Namespace": "Silk.NET.Vulkan", @@ -376,7 +406,7 @@ "VK_VENDOR_ID_VSI", "VK_VENDOR_ID_MESA" ], - "TrimEnumMemberImpliedVendors": true + "IdentifyEnumMemberImpliedVendors": true }, "InterceptNativeFunctions": { "NativeFunctionNames": [ @@ -391,8 +421,7 @@ }, "TransformHandles": { "AssumeMissingTypesOpaque": true, - "UseDSL": true, - "HandleSuffixOrder": 1 + "UseDSL": true }, "PrettifyNames": { "LongAcronymThreshold": 4, @@ -400,6 +429,23 @@ "PrefixOverrides": { "VkPipelineCreateFlags2": "VK_PIPELINE_CREATE_2", "VkMemoryDecompressionMethodFlagsEXT": "VK_MEMORY_DECOMPRESSION_METHOD" + }, + "Affixes": { + "HandleType": { + "Order": 1 + }, + "FunctionPointerDelegateType": { + "Order": 1 + }, + "KhronosVendor": { + "Order": -1 + }, + "KhronosImpliedVendor": { + "Remove": true + }, + "KhronosHandleType": { + "Remove": true + } } }, "TransformEnums": { diff --git a/global.json b/global.json index 899a4df6e1..0ad01216bd 100644 --- a/global.json +++ b/global.json @@ -2,5 +2,8 @@ "sdk": { "version": "10.0.100", "rollForward": "major" + }, + "test": { + "runner": "Microsoft.Testing.Platform" } } diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000000..d956be7da3 --- /dev/null +++ b/nuget.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/sources/Core/Core/Annotations/NameAffixAttribute.cs b/sources/Core/Core/Annotations/NameAffixAttribute.cs index 773c6f3722..d321570401 100644 --- a/sources/Core/Core/Annotations/NameAffixAttribute.cs +++ b/sources/Core/Core/Annotations/NameAffixAttribute.cs @@ -7,13 +7,13 @@ namespace Silk.NET.Core; /// [AttributeUsage( AttributeTargets.Class - | AttributeTargets.Delegate - | AttributeTargets.Enum - | AttributeTargets.Field - | AttributeTargets.Method - | AttributeTargets.Parameter - | AttributeTargets.Property - | AttributeTargets.Struct, + | AttributeTargets.Delegate + | AttributeTargets.Enum + | AttributeTargets.Field + | AttributeTargets.Method + | AttributeTargets.Parameter + | AttributeTargets.Property + | AttributeTargets.Struct, AllowMultiple = true, Inherited = true )] @@ -23,12 +23,11 @@ public sealed class NameAffixAttribute : Attribute /// /// Creates a new NameAffix attribute. /// - public NameAffixAttribute(string type, string affix, int order, int discriminatorPriority) + public NameAffixAttribute(string type, string category, string affix) { Type = type; + Category = category; Affix = affix; - Order = order; - DiscriminatorPriority = discriminatorPriority; } /// @@ -37,38 +36,15 @@ public NameAffixAttribute(string type, string affix, int order, int discriminato public string Type { get; } /// - /// The affix of the identifier. - /// - public string Affix { get; } - - /// - /// The order with which the affix is applied. - /// - /// Negative means the affix is not reapplied after trimming. - /// Higher means the affix is applied first. - /// - /// Affixes with the same order have ties broken using the order they are declared on the identifier. - /// First declared are applied first. + /// The category of the affix. /// /// - /// SilkTouch mods setting this property should use either -1, 0, or a value specified through the mod's configuration. - /// This is to reduce the hardcoding of values and to make the mods more applicable to different sets of bindings. + /// This is used to identify which name affix configuration is used to process this affix. /// - public int Order { get; } + public string Category { get; } /// - /// The priority with which the affix is used - /// to create secondary names in case of conflicts. - /// - /// Negative means the affix is required, but won't be used to create secondaries. - /// Non-negative means the affix is optional, but will be used to create secondaries. - /// Higher means the names created using the affix is tried first. - /// - /// Affixes with the same priority are applied together as a group. + /// The affix of the identifier. /// - /// - /// SilkTouch mods setting this property should use either -1, 0, or a value specified through the mod's configuration. - /// This is to reduce the hardcoding of values and to make the mods more applicable to different sets of bindings. - /// - public int DiscriminatorPriority { get; } + public string Affix { get; } } diff --git a/sources/Core/Core/Annotations/NativeNameAttribute.cs b/sources/Core/Core/Annotations/NativeNameAttribute.cs index 6cb2db2721..41cc1014c4 100644 --- a/sources/Core/Core/Annotations/NativeNameAttribute.cs +++ b/sources/Core/Core/Annotations/NativeNameAttribute.cs @@ -8,13 +8,13 @@ namespace Silk.NET.Core; /// [AttributeUsage( AttributeTargets.Class - | AttributeTargets.Delegate - | AttributeTargets.Enum - | AttributeTargets.Field - | AttributeTargets.Method - | AttributeTargets.Parameter - | AttributeTargets.Property - | AttributeTargets.Struct, + | AttributeTargets.Delegate + | AttributeTargets.Enum + | AttributeTargets.Field + | AttributeTargets.Method + | AttributeTargets.Parameter + | AttributeTargets.Property + | AttributeTargets.Struct, AllowMultiple = false, Inherited = true )] diff --git a/sources/Core/Core/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/sources/Core/Core/PublicAPI/net10.0/PublicAPI.Unshipped.txt index 938a5e97bc..4369029b38 100644 --- a/sources/Core/Core/PublicAPI/net10.0/PublicAPI.Unshipped.txt +++ b/sources/Core/Core/PublicAPI/net10.0/PublicAPI.Unshipped.txt @@ -155,9 +155,8 @@ Silk.NET.Core.MaybeBool.Value.get -> T Silk.NET.Core.MaybeBool.Value.init -> void Silk.NET.Core.NameAffixAttribute Silk.NET.Core.NameAffixAttribute.Affix.get -> string! -Silk.NET.Core.NameAffixAttribute.DiscriminatorPriority.get -> int -Silk.NET.Core.NameAffixAttribute.NameAffixAttribute(string! type, string! affix, int order, int discriminatorPriority) -> void -Silk.NET.Core.NameAffixAttribute.Order.get -> int +Silk.NET.Core.NameAffixAttribute.Category.get -> string! +Silk.NET.Core.NameAffixAttribute.NameAffixAttribute(string! type, string! category, string! affix) -> void Silk.NET.Core.NameAffixAttribute.Type.get -> string! Silk.NET.Core.NativeFunctionAttribute Silk.NET.Core.NativeFunctionAttribute.EntryPoint -> string? diff --git a/sources/Maths/Maths/Plane.cs b/sources/Maths/Maths/Plane.cs index 83b0fccaf1..1aaa6c388e 100644 --- a/sources/Maths/Maths/Plane.cs +++ b/sources/Maths/Maths/Plane.cs @@ -14,8 +14,8 @@ namespace Silk.NET.Maths /// The type used to store values. [Serializable] [DataContract] - public struct Plane - : IEquatable> where T : unmanaged, IFormattable, IEquatable, IComparable + public struct Plane : IEquatable> + where T : unmanaged, IFormattable, IEquatable, IComparable { /// The normal vector of the Plane. [DataMember] @@ -58,22 +58,21 @@ public Plane(Vector4D value) /// The first Plane to compare. /// The second Plane to compare. /// True if the Planes are equal; False otherwise. - [MethodImpl((MethodImplOptions) 768)] - public static bool operator ==(Plane value1, Plane value2) - => value1.Normal == value2.Normal && Scalar.Equal(value1.Distance, value2.Distance); + [MethodImpl((MethodImplOptions)768)] + public static bool operator ==(Plane value1, Plane value2) => + value1.Normal == value2.Normal && Scalar.Equal(value1.Distance, value2.Distance); /// Returns a boolean indicating whether the two given Planes are not equal. /// The first Plane to compare. /// The second Plane to compare. /// True if the Planes are not equal; False if they are equal. - [MethodImpl((MethodImplOptions) 768)] - public static bool operator !=(Plane value1, Plane value2) - => !(value1 == value2); + [MethodImpl((MethodImplOptions)768)] + public static bool operator !=(Plane value1, Plane value2) => !(value1 == value2); /// Returns a boolean indicating whether the given Object is equal to this Plane instance. /// The Object to compare against. /// True if the Object is equal to this Plane; False otherwise. - [MethodImpl((MethodImplOptions) 768)] + [MethodImpl((MethodImplOptions)768)] public override readonly bool Equals(object? obj) { return (obj is Plane other) && Equals(other); @@ -82,7 +81,7 @@ public override readonly bool Equals(object? obj) /// Returns a boolean indicating whether the given Plane is equal to this Plane instance. /// The Plane to compare this instance to. /// True if the other Plane is equal to this instance; False otherwise. - [MethodImpl((MethodImplOptions) 768)] + [MethodImpl((MethodImplOptions)768)] public readonly bool Equals(Plane other) { return Normal.Equals(other.Normal) && Scalar.Equal(Distance, other.Distance); @@ -92,7 +91,7 @@ public readonly bool Equals(Plane other) /// The hash code. public override readonly int GetHashCode() { - return Normal.GetHashCode() + Distance.GetHashCode(); + return HashCode.Combine(Normal.GetHashCode(), Distance.GetHashCode()); } /// Returns a String representing this Plane instance. @@ -100,7 +99,12 @@ public override readonly int GetHashCode() public override readonly string ToString() { CultureInfo ci = CultureInfo.CurrentCulture; - return string.Format(ci, "{{Normal:{0} D:{1}}}", Normal.ToString(), Distance.ToString("G", ci)); + return string.Format( + ci, + "{{Normal:{0} D:{1}}}", + Normal.ToString(), + Distance.ToString("G", ci) + ); } /// @@ -108,113 +112,114 @@ public override readonly string ToString() /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into /// /// The source matrix /// The matrix - public static explicit operator System.Numerics.Plane(Plane from) - => new((System.Numerics.Vector3) from.Normal, Scalar.As(from.Distance)); - + public static explicit operator System.Numerics.Plane(Plane from) => + new((System.Numerics.Vector3)from.Normal, Scalar.As(from.Distance)); + /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); /// /// Converts a into one with a of /// /// The source matrix /// The matrix - public static explicit operator Plane(Plane from) - => new((Vector3D) from.Normal, Scalar.As(from.Distance)); - + public static explicit operator Plane(Plane from) => + new((Vector3D)from.Normal, Scalar.As(from.Distance)); + /// /// Returns this plane casted to /// /// The type to cast to /// The casted plane - public Plane As() where TOther : unmanaged, IFormattable, IEquatable, IComparable + public Plane As() + where TOther : unmanaged, IFormattable, IEquatable, IComparable { return new(Normal.As(), Scalar.As(Distance)); } } -} \ No newline at end of file +} diff --git a/sources/Maths/Maths/PublicAPI/net10.0-android/PublicAPI.Shipped.txt b/sources/Maths/Maths/PublicAPI/net10.0-android/PublicAPI.Shipped.txt new file mode 100644 index 0000000000..7dc5c58110 --- /dev/null +++ b/sources/Maths/Maths/PublicAPI/net10.0-android/PublicAPI.Shipped.txt @@ -0,0 +1 @@ +#nullable enable diff --git a/sources/Maths/Maths/PublicAPI/net10.0-android/PublicAPI.Unshipped.txt b/sources/Maths/Maths/PublicAPI/net10.0-android/PublicAPI.Unshipped.txt new file mode 100644 index 0000000000..7dc5c58110 --- /dev/null +++ b/sources/Maths/Maths/PublicAPI/net10.0-android/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ +#nullable enable diff --git a/sources/Maths/Maths/Scalar.Bitwise/Scalar.Not.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.Not.cs index 4db3748511..2181bdb694 100644 --- a/sources/Maths/Maths/Scalar.Bitwise/Scalar.Not.cs +++ b/sources/Maths/Maths/Scalar.Bitwise/Scalar.Not.cs @@ -10,7 +10,8 @@ static partial class Scalar /// /// Performs Not on supported types /// - public static T Not(T value) where T : unmanaged + public static T Not(T value) + where T : unmanaged { return Byte(value); @@ -19,113 +20,113 @@ static T Byte(T value) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) (~ (byte) (object) value); + return (T)(object)(byte)(~((byte)(object)value) & byte.MaxValue); } return SByte(value); } - + [MethodImpl(MaxOpt)] static T SByte(T value) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) (~ (sbyte) (object) value); + return (T)(object)(sbyte)(~(sbyte)(object)value); } return UInt16(value); } - + [MethodImpl(MaxOpt)] static T UInt16(T value) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) (~ (ushort) (object) value); + return (T)(object)(ushort)(~(ushort)(object)value); } return Int16(value); } - + [MethodImpl(MaxOpt)] static T Int16(T value) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) (~ (short) (object) value); + return (T)(object)(short)(~(short)(object)value); } return UInt32(value); } - + [MethodImpl(MaxOpt)] static T UInt32(T value) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) (~ (uint) (object) value); + return (T)(object)(uint)(~(uint)(object)value); } return Int32(value); } - + [MethodImpl(MaxOpt)] static T Int32(T value) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) (~ (int) (object) value); + return (T)(object)(int)(~(int)(object)value); } return UInt64(value); } - + [MethodImpl(MaxOpt)] static T UInt64(T value) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) (~ (ulong) (object) value); + return (T)(object)(ulong)(~(ulong)(object)value); } return Int64(value); } - + [MethodImpl(MaxOpt)] static T Int64(T value) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) (~ (long) (object) value); + return (T)(object)(long)(~(long)(object)value); } return Single(value); } - + [MethodImpl(MaxOpt)] static T Single(T value) { if (typeof(T) == typeof(float)) { - var res = ~ Unsafe.As(ref value); + var res = ~Unsafe.As(ref value); return Unsafe.As(ref res); } return Double(value); } - + [MethodImpl(MaxOpt)] static T Double(T value) { if (typeof(T) == typeof(double)) { - var res = ~ Unsafe.As(ref value); + var res = ~Unsafe.As(ref value); return Unsafe.As(ref res); } return Other(value); } - + [MethodImpl(MaxOpt)] static T Other(T value) { @@ -134,4 +135,4 @@ static T Other(T value) } } } -} \ No newline at end of file +} diff --git a/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs index 979340447b..5918b586fe 100644 --- a/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs +++ b/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateLeft.cs @@ -11,106 +11,107 @@ static partial class Scalar /// Rotates a given value bitwise. /// Shifting float and double obeys unsigned integers' behaviour. /// - public static T RotateLeft(T value, int offset) where T : unmanaged + public static T RotateLeft(T value, int offset) + where T : unmanaged { return Byte(value, offset); - + [MethodImpl(MaxOpt)] static T Byte(T value, int offset) { if (typeof(T) == typeof(byte)) { - var v = (byte) (object) value; - return (T) (object) (byte) ((v << offset) | (v >> (8 - offset))); + var v = (byte)(object)value; + return (T)(object)(byte)(((v << offset) | (v >> (8 - offset))) & 0xFF); } - + return SByte(value, offset); } - + [MethodImpl(MaxOpt)] static T SByte(T value, int offset) { if (typeof(T) == typeof(sbyte)) { - var v = (sbyte) (object) value; - return (T) (object) (sbyte) ((v << offset) | (v >> (8 - offset))); + var v = (sbyte)(object)value; + return (T)(object)(sbyte)(((v << offset) | (v >> (8 - offset))) & 0xFF); } - + return UShort(value, offset); } - + [MethodImpl(MaxOpt)] static T UShort(T value, int offset) { if (typeof(T) == typeof(ushort)) { - var v = (ushort) (object) value; - return (T) (object) (ushort) ((v << offset) | (v >> (16 - offset))); + var v = (ushort)(object)value; + return (T)(object)(ushort)(((v << offset) | (v >> (16 - offset))) & 0xFFFF); } - + return Short(value, offset); } - + [MethodImpl(MaxOpt)] static T Short(T value, int offset) { if (typeof(T) == typeof(short)) { - var v = (short) (object) value; - return (T) (object) (short) ((v << offset) | (v >> (16 - offset))); + var v = (short)(object)value; + return (T)(object)(short)(((v << offset) | (v >> (16 - offset))) & 0xFFFF); } - + return UInt(value, offset); } - + [MethodImpl(MaxOpt)] static T UInt(T value, int offset) { if (typeof(T) == typeof(uint)) { - var v = (uint) (object) value; - return (T) (object) (uint) ((v << offset) | (v >> (32 - offset))); + var v = (uint)(object)value; + return (T)(object)(uint)((v << offset) | (v >> (32 - offset))); } - + return Int(value, offset); } - + [MethodImpl(MaxOpt)] static T Int(T value, int offset) { if (typeof(T) == typeof(int)) { - var v = (int) (object) value; - return (T) (object) (int) ((v << offset) | (v >> (32 - offset))); + var v = (int)(object)value; + return (T)(object)(int)((v << offset) | (v >> (32 - offset))); } - + return ULong(value, offset); } - + [MethodImpl(MaxOpt)] static T ULong(T value, int offset) { if (typeof(T) == typeof(ulong)) { - var v = (ulong) (object) value; - return (T) (object) (ulong) ((v << offset) | (v >> (64 - offset))); + var v = (ulong)(object)value; + return (T)(object)(ulong)((v << offset) | (v >> (64 - offset))); } - + return Long(value, offset); } - + [MethodImpl(MaxOpt)] static T Long(T value, int offset) { if (typeof(T) == typeof(long)) { - var v = (long) (object) value; - return (T) (object) (long) ((v << offset) | (v >> (64 - offset))); + var v = (long)(object)value; + return (T)(object)(long)((v << offset) | (v >> (64 - offset))); } - + return Float(value, offset); } - + [MethodImpl(MaxOpt)] static T Float(T value, int offset) { @@ -120,10 +121,10 @@ static T Float(T value, int offset) var res = (v << offset) | (v >> (32 - offset)); return Unsafe.As(ref res); } - + return Double(value, offset); } - + [MethodImpl(MaxOpt)] static T Double(T value, int offset) { @@ -133,10 +134,10 @@ static T Double(T value, int offset) var res = (v << offset) | (v >> (64 - offset)); return Unsafe.As(ref res); } - + return Other(value, offset); } - + [MethodImpl(MaxOpt)] static T Other(T _, int __) { @@ -145,4 +146,4 @@ static T Other(T _, int __) } } } -} \ No newline at end of file +} diff --git a/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateRight.cs b/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateRight.cs index 3324597f08..604ebf63eb 100644 --- a/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateRight.cs +++ b/sources/Maths/Maths/Scalar.Bitwise/Scalar.RotateRight.cs @@ -11,106 +11,107 @@ static partial class Scalar /// Rotates a given value bitwise. /// Shifting float and double obeys unsigned integers' behaviour. /// - public static T RotateRight(T value, int offset) where T : unmanaged + public static T RotateRight(T value, int offset) + where T : unmanaged { return Byte(value, offset); - + [MethodImpl(MaxOpt)] static T Byte(T value, int offset) { if (typeof(T) == typeof(byte)) { - var v = (byte) (object) value; - return (T) (object) (byte) ((v >> offset) | (v << (8 - offset))); + var v = (byte)(object)value; + return (T)(object)(byte)(((v >> offset) | (v << (8 - offset))) & 0xFF); } - + return SByte(value, offset); } - + [MethodImpl(MaxOpt)] static T SByte(T value, int offset) { if (typeof(T) == typeof(sbyte)) { - var v = (sbyte) (object) value; - return (T) (object) (sbyte) ((v >> offset) | (v << (8 - offset))); + var v = (sbyte)(object)value; + return (T)(object)(sbyte)(((v >> offset) | (v << (8 - offset))) & 0xFF); } - + return UShort(value, offset); } - + [MethodImpl(MaxOpt)] static T UShort(T value, int offset) { if (typeof(T) == typeof(ushort)) { - var v = (ushort) (object) value; - return (T) (object) (ushort) ((v >> offset) | (v << (16 - offset))); + var v = (ushort)(object)value; + return (T)(object)(ushort)(((v >> offset) | (v << (16 - offset))) & 0xFFFF); } - + return Short(value, offset); } - + [MethodImpl(MaxOpt)] static T Short(T value, int offset) { if (typeof(T) == typeof(short)) { - var v = (short) (object) value; - return (T) (object) (short) ((v >> offset) | (v << (16 - offset))); + var v = (short)(object)value; + return (T)(object)(short)(((v >> offset) | (v << (16 - offset))) & 0xFFFF); } - + return UInt(value, offset); } - + [MethodImpl(MaxOpt)] static T UInt(T value, int offset) { if (typeof(T) == typeof(uint)) { - var v = (uint) (object) value; - return (T) (object) (uint) ((v >> offset) | (v << (32 - offset))); + var v = (uint)(object)value; + return (T)(object)(uint)((v >> offset) | (v << (32 - offset))); } - + return Int(value, offset); } - + [MethodImpl(MaxOpt)] static T Int(T value, int offset) { if (typeof(T) == typeof(int)) { - var v = (int) (object) value; - return (T) (object) (int) ((v >> offset) | (v << (32 - offset))); + var v = (int)(object)value; + return (T)(object)(int)((v >> offset) | (v << (32 - offset))); } - + return ULong(value, offset); } - + [MethodImpl(MaxOpt)] static T ULong(T value, int offset) { if (typeof(T) == typeof(ulong)) { - var v = (ulong) (object) value; - return (T) (object) (ulong) ((v >> offset) | (v << (64 - offset))); + var v = (ulong)(object)value; + return (T)(object)(ulong)((v >> offset) | (v << (64 - offset))); } - + return Long(value, offset); } - + [MethodImpl(MaxOpt)] static T Long(T value, int offset) { if (typeof(T) == typeof(long)) { - var v = (long) (object) value; - return (T) (object) (long) ((v >> offset) | (v << (64 - offset))); + var v = (long)(object)value; + return (T)(object)(long)((v >> offset) | (v << (64 - offset))); } - + return Float(value, offset); } - + [MethodImpl(MaxOpt)] static T Float(T value, int offset) { @@ -120,10 +121,10 @@ static T Float(T value, int offset) var res = (v >> offset) | (v << (32 - offset)); return Unsafe.As(ref res); } - + return Double(value, offset); } - + [MethodImpl(MaxOpt)] static T Double(T value, int offset) { @@ -133,10 +134,10 @@ static T Double(T value, int offset) var res = (v >> offset) | (v << (64 - offset)); return Unsafe.As(ref res); } - + return Other(value, offset); } - + [MethodImpl(MaxOpt)] static T Other(T _, int __) { @@ -145,4 +146,4 @@ static T Other(T _, int __) } } } -} \ No newline at end of file +} diff --git a/sources/Maths/Maths/Scalar.Log.cs b/sources/Maths/Maths/Scalar.Log.cs deleted file mode 100644 index a286fda059..0000000000 --- a/sources/Maths/Maths/Scalar.Log.cs +++ /dev/null @@ -1,307 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -// ported / adopted from https://github.com/amd/aocl-libm-ose/tree/master/src/optmized - -/* - * Copyright (C) 2008-2020 Advanced Micro Devices, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -using System; -using System.Runtime.CompilerServices; -#if SSE -using System.Runtime.Intrinsics; -using System.Runtime.Intrinsics.X86; -#endif - -namespace Silk.NET.Maths -{ - public static partial class Scalar - { - private static uint[] InitLog() - { -#if POH - var logTblLookup = GC.AllocateUninitializedArray(771, true); -#else - var logTblLookup = new uint[771]; -#endif - int i = 0; - logTblLookup[i++] = 0x40000000; logTblLookup[i++] = 0x0; logTblLookup[i++] = 0x0; logTblLookup[i++] = 0x3fff00ff; logTblLookup[i++] = 0x3b7f8000; logTblLookup[i++] = 0x32aa2b11; logTblLookup[i++] = 0x3ffe03f8; logTblLookup[i++] = 0x3bff0000; logTblLookup[i++] = 0x3429ac42; logTblLookup[i++] = - 0x3ffd08e5; logTblLookup[i++] = 0x3c3ee000; logTblLookup[i++] = 0x350ebf02; logTblLookup[i++] = 0x3ffc0fc1; logTblLookup[i++] = 0x3c7e0000; logTblLookup[i++] = 0x35a8b0fc; logTblLookup[i++] = 0x3ffb1885; logTblLookup[i++] = 0x3c9e7000; logTblLookup[i++] = -0x36244347; logTblLookup[i++] = 0x3ffa232d; logTblLookup[i++] = 0x3cbdc000; logTblLookup[i++] = 0x368d83eb; logTblLookup[i++] = 0x3ff92fb2; logTblLookup[i++] = 0x3cdcf000; logTblLookup[i++] = 0x36e013d8; logTblLookup[i++] = 0x3ff83e10; logTblLookup[i++] = -0x3cfc1000; logTblLookup[i++] = 0x361b0e78; logTblLookup[i++] = 0x3ff74e40; logTblLookup[i++] = 0x3d0d8000; logTblLookup[i++] = 0x36d98924; logTblLookup[i++] = 0x3ff6603e; logTblLookup[i++] = 0x3d1cf000; logTblLookup[i++] = 0x3687b9ff; logTblLookup[i++] = -0x3ff57404; logTblLookup[i++] = 0x3d2c5000; logTblLookup[i++] = 0x36375f92; logTblLookup[i++] = 0x3ff4898d; logTblLookup[i++] = 0x3d3ba000; logTblLookup[i++] = 0x3631ec66; logTblLookup[i++] = 0x3ff3a0d5; logTblLookup[i++] = 0x3d4ae000; logTblLookup[i++] = -0x36830ec9; logTblLookup[i++] = 0x3ff2b9d6; logTblLookup[i++] = 0x3d5a1000; logTblLookup[i++] = 0x36dd7119; logTblLookup[i++] = 0x3ff1d48c; logTblLookup[i++] = 0x3d693000; logTblLookup[i++] = 0x3735c56e; logTblLookup[i++] = 0x3ff0f0f1; logTblLookup[i++] = -0x3d785000; logTblLookup[i++] = 0x35c30046; logTblLookup[i++] = 0x3ff00f01; logTblLookup[i++] = 0x3d83a000; logTblLookup[i++] = 0x37cc1acc; logTblLookup[i++] = 0x3fef2eb7; logTblLookup[i++] = 0x3d8b2000; logTblLookup[i++] = 0x379b7752; logTblLookup[i++] = -0x3fee500f; logTblLookup[i++] = 0x3d929000; logTblLookup[i++] = 0x37fb1785; logTblLookup[i++] = 0x3fed7304; logTblLookup[i++] = 0x3d9a0000; logTblLookup[i++] = 0x37ebcb0e; logTblLookup[i++] = 0x3fec9791; logTblLookup[i++] = 0x3da17000; logTblLookup[i++] = -0x375cbea6; logTblLookup[i++] = 0x3febbdb3; logTblLookup[i++] = 0x3da8d000; logTblLookup[i++] = 0x37839f83; logTblLookup[i++] = 0x3feae564; logTblLookup[i++] = 0x3db03000; logTblLookup[i++] = 0x36b1526f; logTblLookup[i++] = 0x3fea0ea1; logTblLookup[i++] = -0x3db78000; logTblLookup[i++] = 0x37528ae5; logTblLookup[i++] = 0x3fe93965; logTblLookup[i++] = 0x3dbed000; logTblLookup[i++] = 0x36ecdaf6; logTblLookup[i++] = 0x3fe865ac; logTblLookup[i++] = 0x3dc61000; logTblLookup[i++] = 0x37a2eb19; logTblLookup[i++] = -0x3fe79373; logTblLookup[i++] = 0x3dcd5000; logTblLookup[i++] = 0x37a12310; logTblLookup[i++] = 0x3fe6c2b4; logTblLookup[i++] = 0x3dd49000; logTblLookup[i++] = 0x36da7496; logTblLookup[i++] = 0x3fe5f36d; logTblLookup[i++] = 0x3ddbc000; logTblLookup[i++] = -0x37482bb1; logTblLookup[i++] = 0x3fe52598; logTblLookup[i++] = 0x3de2f000; logTblLookup[i++] = 0x36a91eb8; logTblLookup[i++] = 0x3fe45933; logTblLookup[i++] = 0x3dea1000; logTblLookup[i++] = 0x3789eb36; logTblLookup[i++] = 0x3fe38e39; logTblLookup[i++] = -0x3df13000; logTblLookup[i++] = 0x3783b715; logTblLookup[i++] = 0x3fe2c4a7; logTblLookup[i++] = 0x3df85000; logTblLookup[i++] = 0x36430046; logTblLookup[i++] = 0x3fe1fc78; logTblLookup[i++] = 0x3dff6000; logTblLookup[i++] = 0x371131dc; logTblLookup[i++] = -0x3fe135aa; logTblLookup[i++] = 0x3e033000; logTblLookup[i++] = 0x380a8965; logTblLookup[i++] = 0x3fe07038; logTblLookup[i++] = 0x3e06b000; logTblLookup[i++] = 0x383f3e68; logTblLookup[i++] = 0x3fdfac1f; logTblLookup[i++] = 0x3e0a3000; logTblLookup[i++] = -0x3842c234; logTblLookup[i++] = 0x3fdee95c; logTblLookup[i++] = 0x3e0db000; logTblLookup[i++] = 0x38156a98; logTblLookup[i++] = 0x3fde27eb; logTblLookup[i++] = 0x3e113000; logTblLookup[i++] = 0x375e3215; logTblLookup[i++] = 0x3fdd67c9; logTblLookup[i++] = -0x3e14a000; logTblLookup[i++] = 0x38297c10; logTblLookup[i++] = 0x3fdca8f1; logTblLookup[i++] = 0x3e181000; logTblLookup[i++] = 0x386b8c72; logTblLookup[i++] = 0x3fdbeb62; logTblLookup[i++] = 0x3e1b8000; logTblLookup[i++] = 0x387e100f; logTblLookup[i++] = -0x3fdb2f17; logTblLookup[i++] = 0x3e1ef000; logTblLookup[i++] = 0x38615876; logTblLookup[i++] = 0x3fda740e; logTblLookup[i++] = 0x3e226000; logTblLookup[i++] = 0x3815b666; logTblLookup[i++] = 0x3fd9ba42; logTblLookup[i++] = 0x3e25d000; logTblLookup[i++] = -0x36dbce69; logTblLookup[i++] = 0x3fd901b2; logTblLookup[i++] = 0x3e293000; logTblLookup[i++] = 0x37e5e3a2; logTblLookup[i++] = 0x3fd84a5a; logTblLookup[i++] = 0x3e2c9000; logTblLookup[i++] = 0x381c6ccc; logTblLookup[i++] = 0x3fd79436; logTblLookup[i++] = -0x3e2ff000; logTblLookup[i++] = 0x38183854; logTblLookup[i++] = 0x3fd6df44; logTblLookup[i++] = 0x3e335000; logTblLookup[i++] = 0x37cd4273; logTblLookup[i++] = 0x3fd62b81; logTblLookup[i++] = 0x3e36b000; logTblLookup[i++] = 0x35fe719d; logTblLookup[i++] = -0x3fd578e9; logTblLookup[i++] = 0x3e3a0000; logTblLookup[i++] = 0x37f8f540; logTblLookup[i++] = 0x3fd4c77b; logTblLookup[i++] = 0x3e3d5000; logTblLookup[i++] = 0x38448108; logTblLookup[i++] = 0x3fd41733; logTblLookup[i++] = 0x3e40a000; logTblLookup[i++] = -0x386050a2; logTblLookup[i++] = 0x3fd3680d; logTblLookup[i++] = 0x3e43f000; logTblLookup[i++] = 0x38503290; logTblLookup[i++] = 0x3fd2ba08; logTblLookup[i++] = 0x3e474000; logTblLookup[i++] = 0x38146f44; logTblLookup[i++] = 0x3fd20d21; logTblLookup[i++] = -0x3e4a9000; logTblLookup[i++] = 0x373539e9; logTblLookup[i++] = 0x3fd16154; logTblLookup[i++] = 0x3e4dd000; logTblLookup[i++] = 0x381b173f; logTblLookup[i++] = 0x3fd0b6a0; logTblLookup[i++] = 0x3e511000; logTblLookup[i++] = 0x385e0ff1; logTblLookup[i++] = -0x3fd00d01; logTblLookup[i++] = 0x3e545000; logTblLookup[i++] = 0x38767e44; logTblLookup[i++] = 0x3fcf6475; logTblLookup[i++] = 0x3e579000; logTblLookup[i++] = 0x3864a740; logTblLookup[i++] = 0x3fcebcf9; logTblLookup[i++] = 0x3e5ad000; logTblLookup[i++] = -0x3828cf48; logTblLookup[i++] = 0x3fce168a; logTblLookup[i++] = 0x3e5e1000; logTblLookup[i++] = 0x3786742e; logTblLookup[i++] = 0x3fcd7127; logTblLookup[i++] = 0x3e614000; logTblLookup[i++] = 0x38342ac6; logTblLookup[i++] = 0x3fcccccd; logTblLookup[i++] = -0x3e647000; logTblLookup[i++] = 0x387be3cd; logTblLookup[i++] = 0x3fcc2978; logTblLookup[i++] = 0x3e67b000; logTblLookup[i++] = 0x36d53827; logTblLookup[i++] = 0x3fcb8728; logTblLookup[i++] = 0x3e6ae000; logTblLookup[i++] = 0x3685ad3f; logTblLookup[i++] = -0x3fcae5d8; logTblLookup[i++] = 0x3e6e0000; logTblLookup[i++] = 0x385e5056; logTblLookup[i++] = 0x3fca4588; logTblLookup[i++] = 0x3e713000; logTblLookup[i++] = 0x3803b715; logTblLookup[i++] = 0x3fc9a634; logTblLookup[i++] = 0x3e746000; logTblLookup[i++] = -0x3494aa97; logTblLookup[i++] = 0x3fc907da; logTblLookup[i++] = 0x3e778000; logTblLookup[i++] = 0x37adcbdc; logTblLookup[i++] = 0x3fc86a79; logTblLookup[i++] = 0x3e7aa000; logTblLookup[i++] = 0x38052b26; logTblLookup[i++] = 0x3fc7ce0c; logTblLookup[i++] = -0x3e7dc000; logTblLookup[i++] = 0x380c36af; logTblLookup[i++] = 0x3fc73294; logTblLookup[i++] = 0x3e807000; logTblLookup[i++] = 0x37d88b5b; logTblLookup[i++] = 0x3fc6980c; logTblLookup[i++] = 0x3e820000; logTblLookup[i++] = 0x371652d3; logTblLookup[i++] = -0x3fc5fe74; logTblLookup[i++] = 0x3e838000; logTblLookup[i++] = 0x38dc2fe7; logTblLookup[i++] = 0x3fc565c8; logTblLookup[i++] = 0x3e851000; logTblLookup[i++] = 0x3892713a; logTblLookup[i++] = 0x3fc4ce08; logTblLookup[i++] = 0x3e86a000; logTblLookup[i++] = -0x37d6af35; logTblLookup[i++] = 0x3fc43730; logTblLookup[i++] = 0x3e882000; logTblLookup[i++] = 0x38c5fcd7; logTblLookup[i++] = 0x3fc3a13e; logTblLookup[i++] = 0x3e89b000; logTblLookup[i++] = 0x38070294; logTblLookup[i++] = 0x3fc30c31; logTblLookup[i++] = -0x3e8b3000; logTblLookup[i++] = 0x38ae55d6; logTblLookup[i++] = 0x3fc27806; logTblLookup[i++] = 0x3e8cc000; logTblLookup[i++] = 0x3652dd42; logTblLookup[i++] = 0x3fc1e4bc; logTblLookup[i++] = 0x3e8e4000; logTblLookup[i++] = 0x3818c16a; logTblLookup[i++] = -0x3fc15250; logTblLookup[i++] = 0x3e8fc000; logTblLookup[i++] = 0x387f9e49; logTblLookup[i++] = 0x3fc0c0c1; logTblLookup[i++] = 0x3e914000; logTblLookup[i++] = 0x38a0fde8; logTblLookup[i++] = 0x3fc0300c; logTblLookup[i++] = 0x3e92c000; logTblLookup[i++] = -0x38b00870; logTblLookup[i++] = 0x3fbfa030; logTblLookup[i++] = 0x3e944000; logTblLookup[i++] = 0x38ad09ef; logTblLookup[i++] = 0x3fbf112b; logTblLookup[i++] = 0x3e95c000; logTblLookup[i++] = 0x38981d5c; logTblLookup[i++] = 0x3fbe82fa; logTblLookup[i++] = -0x3e974000; logTblLookup[i++] = 0x3862bae1; logTblLookup[i++] = 0x3fbdf59d; logTblLookup[i++] = 0x3e98c000; logTblLookup[i++] = 0x37e392a9; logTblLookup[i++] = 0x3fbd6910; logTblLookup[i++] = 0x3e9a3000; logTblLookup[i++] = 0x38eecd4c; logTblLookup[i++] = -0x3fbcdd53; logTblLookup[i++] = 0x3e9bb000; logTblLookup[i++] = 0x38933160; logTblLookup[i++] = 0x3fbc5264; logTblLookup[i++] = 0x3e9d3000; logTblLookup[i++] = 0x3798aad3; logTblLookup[i++] = 0x3fbbc841; logTblLookup[i++] = 0x3e9ea000; logTblLookup[i++] = -0x38a7d2e1; logTblLookup[i++] = 0x3fbb3ee7; logTblLookup[i++] = 0x3ea02000; logTblLookup[i++] = 0x37421a1b; logTblLookup[i++] = 0x3fbab656; logTblLookup[i++] = 0x3ea19000; logTblLookup[i++] = 0x386f2a05; logTblLookup[i++] = 0x3fba2e8c; logTblLookup[i++] = -0x3ea30000; logTblLookup[i++] = 0x38c5e10e; logTblLookup[i++] = 0x3fb9a786; logTblLookup[i++] = 0x3ea48000; logTblLookup[i++] = 0x35d00801; logTblLookup[i++] = 0x3fb92144; logTblLookup[i++] = 0x3ea5f000; logTblLookup[i++] = 0x37bf2aef; logTblLookup[i++] = -0x3fb89bc3; logTblLookup[i++] = 0x3ea76000; logTblLookup[i++] = 0x38173260; logTblLookup[i++] = 0x3fb81703; logTblLookup[i++] = 0x3ea8d000; logTblLookup[i++] = 0x382d872e; logTblLookup[i++] = 0x3fb79301; logTblLookup[i++] = 0x3eaa4000; logTblLookup[i++] = -0x3822c3ae; logTblLookup[i++] = 0x3fb70fbb; logTblLookup[i++] = 0x3eabb000; logTblLookup[i++] = 0x37ee2e8b; logTblLookup[i++] = 0x3fb68d31; logTblLookup[i++] = 0x3ead2000; logTblLookup[i++] = 0x372ac3d3; logTblLookup[i++] = 0x3fb60b61; logTblLookup[i++] = -0x3eae8000; logTblLookup[i++] = 0x38dedfac; logTblLookup[i++] = 0x3fb58a48; logTblLookup[i++] = 0x3eaff000; logTblLookup[i++] = 0x38983854; logTblLookup[i++] = 0x3fb509e7; logTblLookup[i++] = 0x3eb16000; logTblLookup[i++] = 0x3802f2ba; logTblLookup[i++] = -0x3fb48a3a; logTblLookup[i++] = 0x3eb2c000; logTblLookup[i++] = 0x38dab982; logTblLookup[i++] = 0x3fb40b41; logTblLookup[i++] = 0x3eb43000; logTblLookup[i++] = 0x38481e9b; logTblLookup[i++] = 0x3fb38cfa; logTblLookup[i++] = 0x3eb59000; logTblLookup[i++] = -0x38dd911b; logTblLookup[i++] = 0x3fb30f63; logTblLookup[i++] = 0x3eb70000; logTblLookup[i++] = 0x380eaa2c; logTblLookup[i++] = 0x3fb2927c; logTblLookup[i++] = 0x3eb86000; logTblLookup[i++] = 0x38a1713c; logTblLookup[i++] = 0x3fb21643; logTblLookup[i++] = -0x3eb9c000; logTblLookup[i++] = 0x38ebfb5e; logTblLookup[i++] = 0x3fb19ab6; logTblLookup[i++] = 0x3ebb3000; logTblLookup[i++] = 0x379c2474; logTblLookup[i++] = 0x3fb11fd4; logTblLookup[i++] = 0x3ebc9000; logTblLookup[i++] = 0x38255fdd; logTblLookup[i++] = -0x3fb0a59b; logTblLookup[i++] = 0x3ebdf000; logTblLookup[i++] = 0x385e0a38; logTblLookup[i++] = 0x3fb02c0b; logTblLookup[i++] = 0x3ebf5000; logTblLookup[i++] = 0x38783b83; logTblLookup[i++] = 0x3fafb322; logTblLookup[i++] = 0x3ec0b000; logTblLookup[i++] = -0x38741da1; logTblLookup[i++] = 0x3faf3ade; logTblLookup[i++] = 0x3ec21000; logTblLookup[i++] = 0x3851da1f; logTblLookup[i++] = 0x3faec33e; logTblLookup[i++] = 0x3ec37000; logTblLookup[i++] = 0x38119a33; logTblLookup[i++] = 0x3fae4c41; logTblLookup[i++] = -0x3ec4d000; logTblLookup[i++] = 0x374e1b05; logTblLookup[i++] = 0x3fadd5e6; logTblLookup[i++] = 0x3ec62000; logTblLookup[i++] = 0x38dbe42c; logTblLookup[i++] = 0x3fad602b; logTblLookup[i++] = 0x3ec78000; logTblLookup[i++] = 0x388f439b; logTblLookup[i++] = -0x3faceb10; logTblLookup[i++] = 0x3ec8e000; logTblLookup[i++] = 0x37cfd68b; logTblLookup[i++] = 0x3fac7692; logTblLookup[i++] = 0x3eca3000; logTblLookup[i++] = 0x38ca0e11; logTblLookup[i++] = 0x3fac02b0; logTblLookup[i++] = 0x3ecb9000; logTblLookup[i++] = -0x38234113; logTblLookup[i++] = 0x3fab8f6a; logTblLookup[i++] = 0x3ecce000; logTblLookup[i++] = 0x38cac08c; logTblLookup[i++] = 0x3fab1cbe; logTblLookup[i++] = 0x3ece4000; logTblLookup[i++] = 0x37d605b8; logTblLookup[i++] = 0x3faaaaab; logTblLookup[i++] = -0x3ecf9000; logTblLookup[i++] = 0x3891f660; logTblLookup[i++] = 0x3faa392f; logTblLookup[i++] = 0x3ed0e000; logTblLookup[i++] = 0x38e0326b; logTblLookup[i++] = 0x3fa9c84a; logTblLookup[i++] = 0x3ed24000; logTblLookup[i++] = 0x378121cb; logTblLookup[i++] = -0x3fa957fb; logTblLookup[i++] = 0x3ed39000; logTblLookup[i++] = 0x3824966c; logTblLookup[i++] = 0x3fa8e83f; logTblLookup[i++] = 0x3ed4e000; logTblLookup[i++] = 0x386c9a9a; logTblLookup[i++] = 0x3fa87917; logTblLookup[i++] = 0x3ed63000; logTblLookup[i++] = -0x388c612c; logTblLookup[i++] = 0x3fa80a81; logTblLookup[i++] = 0x3ed78000; logTblLookup[i++] = 0x38949924; logTblLookup[i++] = 0x3fa79c7b; logTblLookup[i++] = 0x3ed8d000; logTblLookup[i++] = 0x388f075f; logTblLookup[i++] = 0x3fa72f05; logTblLookup[i++] = -0x3eda2000; logTblLookup[i++] = 0x38777bcd; logTblLookup[i++] = 0x3fa6c21e; logTblLookup[i++] = 0x3edb7000; logTblLookup[i++] = 0x38359d3d; logTblLookup[i++] = 0x3fa655c4; logTblLookup[i++] = 0x3edcc000; logTblLookup[i++] = 0x37b12d26; logTblLookup[i++] = -0x3fa5e9f7; logTblLookup[i++] = 0x3ede0000; logTblLookup[i++] = 0x38f04587; logTblLookup[i++] = 0x3fa57eb5; logTblLookup[i++] = 0x3edf5000; logTblLookup[i++] = 0x38a6ced4; logTblLookup[i++] = 0x3fa513fd; logTblLookup[i++] = 0x3ee0a000; logTblLookup[i++] = -0x381ff116; logTblLookup[i++] = 0x3fa4a9cf; logTblLookup[i++] = 0x3ee1e000; logTblLookup[i++] = 0x38ebd3e7; logTblLookup[i++] = 0x3fa44029; logTblLookup[i++] = 0x3ee33000; logTblLookup[i++] = 0x3874e3ff; logTblLookup[i++] = 0x3fa3d70a; logTblLookup[i++] = -0x3ee47000; logTblLookup[i++] = 0x38fbe3cd; logTblLookup[i++] = 0x3fa36e72; logTblLookup[i++] = 0x3ee5c000; logTblLookup[i++] = 0x3860744d; logTblLookup[i++] = 0x3fa3065e; logTblLookup[i++] = 0x3ee70000; logTblLookup[i++] = 0x38d785c3; logTblLookup[i++] = -0x3fa29ecf; logTblLookup[i++] = 0x3ee85000; logTblLookup[i++] = 0x37c75ce4; logTblLookup[i++] = 0x3fa237c3; logTblLookup[i++] = 0x3ee99000; logTblLookup[i++] = 0x387e7e01; logTblLookup[i++] = 0x3fa1d13a; logTblLookup[i++] = 0x3eead000; logTblLookup[i++] = -0x38bfcd71; logTblLookup[i++] = 0x3fa16b31; logTblLookup[i++] = 0x3eec1000; logTblLookup[i++] = 0x38f392c5; logTblLookup[i++] = 0x3fa105a9; logTblLookup[i++] = 0x3eed6000; logTblLookup[i++] = 0x3754f8b1; logTblLookup[i++] = 0x3fa0a0a1; logTblLookup[i++] = -0x3eeea000; logTblLookup[i++] = 0x37d40984; logTblLookup[i++] = 0x3fa03c17; logTblLookup[i++] = 0x3eefe000; logTblLookup[i++] = 0x38059907; logTblLookup[i++] = 0x3f9fd80a; logTblLookup[i++] = 0x3ef12000; logTblLookup[i++] = 0x38081a7c; logTblLookup[i++] = -0x3f9f747a; logTblLookup[i++] = 0x3ef26000; logTblLookup[i++] = 0x37e350d1; logTblLookup[i++] = 0x3f9f1166; logTblLookup[i++] = 0x3ef3a000; logTblLookup[i++] = 0x3784c3ad; logTblLookup[i++] = 0x3f9eaecd; logTblLookup[i++] = 0x3ef4d000; logTblLookup[i++] = -0x38fd32cc; logTblLookup[i++] = 0x3f9e4cad; logTblLookup[i++] = 0x3ef61000; logTblLookup[i++] = 0x38cce923; logTblLookup[i++] = 0x3f9deb07; logTblLookup[i++] = 0x3ef75000; logTblLookup[i++] = 0x38906320; logTblLookup[i++] = 0x3f9d89d9; logTblLookup[i++] = -0x3ef89000; logTblLookup[i++] = 0x380f5faf; logTblLookup[i++] = 0x3f9d2922; logTblLookup[i++] = 0x3ef9c000; logTblLookup[i++] = 0x38f2de41; logTblLookup[i++] = 0x3f9cc8e1; logTblLookup[i++] = 0x3efb0000; logTblLookup[i++] = 0x3891fd38; logTblLookup[i++] = -0x3f9c6917; logTblLookup[i++] = 0x3efc4000; logTblLookup[i++] = 0x37946dfd; logTblLookup[i++] = 0x3f9c09c1; logTblLookup[i++] = 0x3efd7000; logTblLookup[i++] = 0x38ac47bc; logTblLookup[i++] = 0x3f9baadf; logTblLookup[i++] = 0x3efeb000; logTblLookup[i++] = -0x379e41ec; logTblLookup[i++] = 0x3f9b4c70; logTblLookup[i++] = 0x3effe000; logTblLookup[i++] = 0x3897042c; logTblLookup[i++] = 0x3f9aee73; logTblLookup[i++] = 0x3f008000; logTblLookup[i++] = 0x397d5893; logTblLookup[i++] = 0x3f9a90e8; logTblLookup[i++] = -0x3f012000; logTblLookup[i++] = 0x392952d3; logTblLookup[i++] = 0x3f9a33cd; logTblLookup[i++] = 0x3f01c000; logTblLookup[i++] = 0x389eefce; logTblLookup[i++] = 0x3f99d723; logTblLookup[i++] = 0x3f025000; logTblLookup[i++] = 0x396fced5; logTblLookup[i++] = -0x3f997ae7; logTblLookup[i++] = 0x3f02f000; logTblLookup[i++] = 0x390a5e93; logTblLookup[i++] = 0x3f991f1a; logTblLookup[i++] = 0x3f039000; logTblLookup[i++] = 0x37f97073; logTblLookup[i++] = 0x3f98c3bb; logTblLookup[i++] = 0x3f042000; logTblLookup[i++] = -0x392e4426; logTblLookup[i++] = 0x3f9868c8; logTblLookup[i++] = 0x3f04c000; logTblLookup[i++] = 0x385e9eae; logTblLookup[i++] = 0x3f980e41; logTblLookup[i++] = 0x3f055000; logTblLookup[i++] = 0x393b5f67; logTblLookup[i++] = 0x3f97b426; logTblLookup[i++] = -0x3f05f000; logTblLookup[i++] = 0x3865c84a; logTblLookup[i++] = 0x3f975a75; logTblLookup[i++] = 0x3f068000; logTblLookup[i++] = 0x3931e65d; logTblLookup[i++] = 0x3f97012e; logTblLookup[i++] = 0x3f072000; logTblLookup[i++] = 0x38130ba4; logTblLookup[i++] = -0x3f96a850; logTblLookup[i++] = 0x3f07b000; logTblLookup[i++] = 0x39120e4e; logTblLookup[i++] = 0x3f964fda; logTblLookup[i++] = 0x3f084000; logTblLookup[i++] = 0x3979cf17; logTblLookup[i++] = 0x3f95f7cc; logTblLookup[i++] = 0x3f08e000; logTblLookup[i++] = -0x38b81788; logTblLookup[i++] = 0x3f95a025; logTblLookup[i++] = 0x3f097000; logTblLookup[i++] = 0x3938caca; logTblLookup[i++] = 0x3f9548e5; logTblLookup[i++] = 0x3f0a1000; logTblLookup[i++] = 0x37809491; logTblLookup[i++] = 0x3f94f209; logTblLookup[i++] = -0x3f0aa000; logTblLookup[i++] = 0x38c3d2f5; logTblLookup[i++] = 0x3f949b93; logTblLookup[i++] = 0x3f0b3000; logTblLookup[i++] = 0x392e55d6; logTblLookup[i++] = 0x3f944581; logTblLookup[i++] = 0x3f0bc000; logTblLookup[i++] = 0x39755dec; logTblLookup[i++] = -0x3f93efd2; logTblLookup[i++] = 0x3f0c6000; logTblLookup[i++] = 0x385c1fec; logTblLookup[i++] = 0x3f939a86; logTblLookup[i++] = 0x3f0cf000; logTblLookup[i++] = 0x38e6b468; logTblLookup[i++] = 0x3f93459c; logTblLookup[i++] = 0x3f0d8000; logTblLookup[i++] = -0x392a5abf; logTblLookup[i++] = 0x3f92f114; logTblLookup[i++] = 0x3f0e1000; logTblLookup[i++] = 0x395c0fb9; logTblLookup[i++] = 0x3f929cec; logTblLookup[i++] = 0x3f0eb000; logTblLookup[i++] = 0x3707f33c; logTblLookup[i++] = 0x3f924925; logTblLookup[i++] = -0x3f0f4000; logTblLookup[i++] = 0x383ebce1; logTblLookup[i++] = 0x3f91f5bd; logTblLookup[i++] = 0x3f0fd000; logTblLookup[i++] = 0x38a34b87; logTblLookup[i++] = 0x3f91a2b4; logTblLookup[i++] = 0x3f106000; logTblLookup[i++] = 0x38dcd193; logTblLookup[i++] = -0x3f915009; logTblLookup[i++] = 0x3f10f000; logTblLookup[i++] = 0x3905fe33; logTblLookup[i++] = 0x3f90fdbc; logTblLookup[i++] = 0x3f118000; logTblLookup[i++] = 0x39186bdf; logTblLookup[i++] = 0x3f90abcc; logTblLookup[i++] = 0x3f121000; logTblLookup[i++] = -0x3925b7a4; logTblLookup[i++] = 0x3f905a38; logTblLookup[i++] = 0x3f12a000; logTblLookup[i++] = 0x392de74c; logTblLookup[i++] = 0x3f900901; logTblLookup[i++] = 0x3f133000; logTblLookup[i++] = 0x3931009a; logTblLookup[i++] = 0x3f8fb824; logTblLookup[i++] = -0x3f13c000; logTblLookup[i++] = 0x392f0945; logTblLookup[i++] = 0x3f8f67a2; logTblLookup[i++] = 0x3f145000; logTblLookup[i++] = 0x392806fb; logTblLookup[i++] = 0x3f8f177a; logTblLookup[i++] = 0x3f14e000; logTblLookup[i++] = 0x391bff61; logTblLookup[i++] = -0x3f8ec7ab; logTblLookup[i++] = 0x3f157000; logTblLookup[i++] = 0x390af813; logTblLookup[i++] = 0x3f8e7835; logTblLookup[i++] = 0x3f160000; logTblLookup[i++] = 0x38e9ed45; logTblLookup[i++] = 0x3f8e2918; logTblLookup[i++] = 0x3f169000; logTblLookup[i++] = -0x38b4012f; logTblLookup[i++] = 0x3f8dda52; logTblLookup[i++] = 0x3f172000; logTblLookup[i++] = 0x38686dc8; logTblLookup[i++] = 0x3f8d8be3; logTblLookup[i++] = 0x3f17b000; logTblLookup[i++] = 0x37aa6542; logTblLookup[i++] = 0x3f8d3dcb; logTblLookup[i++] = -0x3f183000; logTblLookup[i++] = 0x396b99a8; logTblLookup[i++] = 0x3f8cf009; logTblLookup[i++] = 0x3f18c000; logTblLookup[i++] = 0x393d07d4; logTblLookup[i++] = 0x3f8ca29c; logTblLookup[i++] = 0x3f195000; logTblLookup[i++] = 0x39099c89; logTblLookup[i++] = -0x3f8c5584; logTblLookup[i++] = 0x3f19e000; logTblLookup[i++] = 0x38a2ba33; logTblLookup[i++] = 0x3f8c08c1; logTblLookup[i++] = 0x3f1a7000; logTblLookup[i++] = 0x37a27674; logTblLookup[i++] = 0x3f8bbc51; logTblLookup[i++] = 0x3f1af000; logTblLookup[i++] = -0x395276ea; logTblLookup[i++] = 0x3f8b7034; logTblLookup[i++] = 0x3f1b8000; logTblLookup[i++] = 0x390bdaa4; logTblLookup[i++] = 0x3f8b246b; logTblLookup[i++] = 0x3f1c1000; logTblLookup[i++] = 0x3880fe58; logTblLookup[i++] = 0x3f8ad8f3; logTblLookup[i++] = -0x3f1c9000; logTblLookup[i++] = 0x397069ab; logTblLookup[i++] = 0x3f8a8dcd; logTblLookup[i++] = 0x3f1d2000; logTblLookup[i++] = 0x391b9f3f; logTblLookup[i++] = 0x3f8a42f8; logTblLookup[i++] = 0x3f1db000; logTblLookup[i++] = 0x38844a00; logTblLookup[i++] = -0x3f89f874; logTblLookup[i++] = 0x3f1e3000; logTblLookup[i++] = 0x3963fffc; logTblLookup[i++] = 0x3f89ae41; logTblLookup[i++] = 0x3f1ec000; logTblLookup[i++] = 0x39013539; logTblLookup[i++] = 0x3f89645c; logTblLookup[i++] = 0x3f1f5000; logTblLookup[i++] = -0x37ce4dad; logTblLookup[i++] = 0x3f891ac7; logTblLookup[i++] = 0x3f1fd000; logTblLookup[i++] = 0x392dc269; logTblLookup[i++] = 0x3f88d181; logTblLookup[i++] = 0x3f206000; logTblLookup[i++] = 0x38749102; logTblLookup[i++] = 0x3f888889; logTblLookup[i++] = -0x3f20e000; logTblLookup[i++] = 0x3947f423; logTblLookup[i++] = 0x3f883fde; logTblLookup[i++] = 0x3f217000; logTblLookup[i++] = 0x389c6de0; logTblLookup[i++] = 0x3f87f781; logTblLookup[i++] = 0x3f21f000; logTblLookup[i++] = 0x394ff17d; logTblLookup[i++] = -0x3f87af70; logTblLookup[i++] = 0x3f228000; logTblLookup[i++] = 0x389a5134; logTblLookup[i++] = 0x3f8767ab; logTblLookup[i++] = 0x3f230000; logTblLookup[i++] = 0x3945e10e; logTblLookup[i++] = 0x3f872033; logTblLookup[i++] = 0x3f239000; logTblLookup[i++] = -0x38687e67; logTblLookup[i++] = 0x3f86d905; logTblLookup[i++] = 0x3f241000; logTblLookup[i++] = 0x3929e8f5; logTblLookup[i++] = 0x3f869223; logTblLookup[i++] = 0x3f24a000; logTblLookup[i++] = 0x37aa0e8c; logTblLookup[i++] = 0x3f864b8a; logTblLookup[i++] = -0x3f252000; logTblLookup[i++] = 0x38f85db0; logTblLookup[i++] = 0x3f86053c; logTblLookup[i++] = 0x3f25a000; logTblLookup[i++] = 0x395eb4ab; logTblLookup[i++] = 0x3f85bf37; logTblLookup[i++] = 0x3f263000; logTblLookup[i++] = 0x38735f9a; logTblLookup[i++] = -0x3f85797c; logTblLookup[i++] = 0x3f26b000; logTblLookup[i++] = 0x39169d1d; logTblLookup[i++] = 0x3f853408; logTblLookup[i++] = 0x3f273000; logTblLookup[i++] = 0x396c08dc; logTblLookup[i++] = 0x3f84eedd; logTblLookup[i++] = 0x3f27c000; logTblLookup[i++] = -0x38747ea0; logTblLookup[i++] = 0x3f84a9fa; logTblLookup[i++] = 0x3f284000; logTblLookup[i++] = 0x3909e601; logTblLookup[i++] = 0x3f84655e; logTblLookup[i++] = 0x3f28c000; logTblLookup[i++] = 0x3952605d; logTblLookup[i++] = 0x3f842108; logTblLookup[i++] = -0x3f295000; logTblLookup[i++] = 0x37b4996f; logTblLookup[i++] = 0x3f83dcf9; logTblLookup[i++] = 0x3f29d000; logTblLookup[i++] = 0x38ad05ba; logTblLookup[i++] = 0x3f839930; logTblLookup[i++] = 0x3f2a5000; logTblLookup[i++] = 0x391233cd; logTblLookup[i++] = -0x3f8355ad; logTblLookup[i++] = 0x3f2ad000; logTblLookup[i++] = 0x3949aa5a; logTblLookup[i++] = 0x3f83126f; logTblLookup[i++] = 0x3f2b5000; logTblLookup[i++] = 0x397ceada; logTblLookup[i++] = 0x3f82cf75; logTblLookup[i++] = 0x3f2be000; logTblLookup[i++] = -0x382fe66e; logTblLookup[i++] = 0x3f828cc0; logTblLookup[i++] = 0x3f2c6000; logTblLookup[i++] = 0x38adb5cd; logTblLookup[i++] = 0x3f824a4e; logTblLookup[i++] = 0x3f2ce000; logTblLookup[i++] = 0x38fb25fb; logTblLookup[i++] = 0x3f820821; logTblLookup[i++] = -0x3f2d6000; logTblLookup[i++] = 0x3920261b; logTblLookup[i++] = 0x3f81c636; logTblLookup[i++] = 0x3f2de000; logTblLookup[i++] = 0x393e9874; logTblLookup[i++] = 0x3f81848e; logTblLookup[i++] = 0x3f2e6000; logTblLookup[i++] = 0x3958ee36; logTblLookup[i++] = -0x3f814328; logTblLookup[i++] = 0x3f2ee000; logTblLookup[i++] = 0x396f2b8a; logTblLookup[i++] = 0x3f810204; logTblLookup[i++] = 0x3f2f7000; logTblLookup[i++] = 0x35aa4906; logTblLookup[i++] = 0x3f80c122; logTblLookup[i++] = 0x3f2ff000; logTblLookup[i++] = -0x3776d68c; logTblLookup[i++] = 0x3f808081; logTblLookup[i++] = 0x3f307000; logTblLookup[i++] = 0x37cbd11e; logTblLookup[i++] = 0x3f804020; logTblLookup[i++] = 0x3f30f000; logTblLookup[i++] = 0x37fbf692; logTblLookup[i++] = 0x3f800000; logTblLookup[i++] = -0x3f317000; logTblLookup[i++] = 0x3805fdf4; - - return logTblLookup; - } - - private static uint[] _logTblLookup = InitLog(); - - [MethodImpl(MaxOpt)] - private static unsafe float CoreFastLog(float x) - { - [MethodImpl(MaxOpt)] - static unsafe uint asuint(float x) - { -#if SSE - if (Sse.IsSupported) - return Vector128.CreateScalarUnsafe(x).AsUInt32().ToScalar(); // ToScalar "relies" on Sse (the fallback is garbage) - else -#endif - return *(uint*) &x; // this produces bad codegen on < net5 - } - - [MethodImpl(MaxOpt)] - static unsafe float asfloat(uint x) - { -#if SSE - if (Sse.IsSupported) - return Vector128.CreateScalarUnsafe(x).AsSingle().ToScalar(); // ToScalar "relies" on Sse (the fallback is garbage) - else -#endif - return *(float*) &x; // this produces bad codegen on < net5 - } - - uint ux = asuint(x); - - - if (ux - 0x00800000 < 0x7f800000 - 0x00800000) // inverted because likeliness - { - goto EndCheck; - } - else - { - /* x < 0x1p-126 or inf or nan. */ - if (ux * 2 == 0) /* log(0) = -inf */ - return float.NegativeInfinity; - if (ux == 0x7f800000) /* log(inf) = inf */ - return x; - if ((ux & 0x80000000) > 0 || ux * 2 >= 0xff000000) - return float.NaN; - - /* - * 'x' has to be denormal, Normalize it - * there is a possibility that only the last (23'rd) bit is set - * Hence multiply by 2^23 to bring to 1.xxxxx format. - */ - ux = asuint(x * 8388608); - ux -= 23 << 23; - } - - EndCheck: - const int EXPSHIFTBITS_SP32 = 23; // number of bits to shift left to get the exponent - // exponent bias, calculated as (2^(k-1)) - 1, were k = number of bits used to encode the exponent - const int EMAX_SP32 = 127; - const int MANTBITS_SP32 = 0x007fffff; // the bits the mantissa takes up - - int expo = (int) ((ux >> EXPSHIFTBITS_SP32) - EMAX_SP32); - float f_expo = (float) expo; - - const uint NEAR_ONE_LO = 0b111111011100000000000000000000; // BitConverter.SingleToInt32Bits(1 - 1 * 0.0625f); - const uint NEAR_ONE_HI = 0b111111110101010000000000000000; // BitConverter.SingleToInt32Bits(1 + 1.0625f * 0.0625f); - - // Values not very close to 1, !(e^(-1/16) <= x <= e^(1/16) - if (ux - NEAR_ONE_LO >= NEAR_ONE_HI - NEAR_ONE_LO) - { - /* - * Here onwards, 'x' is neither -ve, nor close to 1 - */ - uint mant, mant1, idx; - float y, f, finv, r, r2, q, w; - - const int MASK_MANT_ALL7 = 0b_1111111_10000000_00000000; - // const int MASK_MANT8 = 0x00008000; - mant = ux & MANTBITS_SP32; - mant1 = ux & MASK_MANT_ALL7; - /*This step is needed for more accuracy */ - /* mant1 += ((ux & MASK_MANT8) << 1); */ - - const int LOGF_N = 8; - idx = mant1 >> (EXPSHIFTBITS_SP32 - LOGF_N); - - const int HALFEXPBITS_SP32 = 0b_111111_00000000_00000000_00000000; - y = asfloat(mant | HALFEXPBITS_SP32); - f = asfloat(mant1 | HALFEXPBITS_SP32); - - float f_128_head; - float f_128_tail; -#if POH - var tbl = ((uint*)Unsafe.AsPointer(ref _logTblLookup[0])) + (idx * 3); - finv = asfloat(tbl[0]); - f_128_head = asfloat(tbl[1]); - f_128_tail = asfloat(tbl[2]); -#else - fixed (uint* tbl = _logTblLookup) - { - var p = tbl + (idx * 3); - finv = asfloat(p[0]); - f_128_head = asfloat(p[1]); - f_128_tail = asfloat(p[2]); - } -#endif - - r = (f - y) * finv; - const float C1 = .5f; - const float C2 = 3.333333432674407958984375E-1f; // 1/3 - - r2 = r * r; /* r^2 */ - q = r + (r2 * (C1 + r * C2)); - - const float LOG2_TAIL = 1.18725025653839111328f * 0.00000762939f; - q = (f_expo * LOG2_TAIL) - q; - - const float LOG2_HEAD = 1.3862762451171875f * 0.5f; - w = (LOG2_HEAD * f_expo) + f_128_head; - - q = f_128_tail + q + w; - - return q; - - } - else - { - [MethodImpl(MaxOpt)] - static float InlineLog1Pf(float x) - { - float r, r2, w; - - r = x - 1.0f; - - w = r / (2.0f + r); - - float correction = w * r; - - w += w; - - float w2 = w * w; - - const float A1 = 8.33333333333317923934e-02f; - const float A2 = 1.25000000037717509602e-02f; - - r2 = (w * w2 * (A1 + A2 * w2)) - correction; - - float f = r2 + r; - - return f; - } - - return InlineLog1Pf(x); - } - } - } -} \ No newline at end of file diff --git a/sources/Maths/Maths/Scalar.MathFPort.cs b/sources/Maths/Maths/Scalar.MathFPort.cs index f42d9d3897..81c9ceec68 100644 --- a/sources/Maths/Maths/Scalar.MathFPort.cs +++ b/sources/Maths/Maths/Scalar.MathFPort.cs @@ -43,31 +43,54 @@ public static partial class Scalar /// The type of /// The absolute of the given value [MethodImpl(MaxOpt)] - public static unsafe T Abs(T x) where T : unmanaged + public static unsafe T Abs(T x) + where T : unmanaged { if (typeof(T) == typeof(Half)) { #if NET5_0 && INTRINSICS if (Sse2.IsSupported) { - return (T)(object)(Half)Sse.And(Vector128.CreateScalarUnsafe((float) (Half) (object) x), Vector128.Create(-0.0f)).ToScalar(); - } + return (T) + (object) + (Half) + Sse.And( + Vector128.CreateScalarUnsafe((float)(Half)(object)x), + Vector128.Create(-0.0f) + ) + .ToScalar(); + } else if (AdvSimd.IsSupported) { - return (T)(object)(Half)AdvSimd.And(Vector128.CreateScalarUnsafe((float) (Half) (object) x), Vector128.Create(-0.0f)).ToScalar(); + return (T) + (object) + (Half) + AdvSimd + .And( + Vector128.CreateScalarUnsafe((float)(Half)(object)x), + Vector128.Create(-0.0f) + ) + .ToScalar(); } else #elif NETCOREAPP3_1 && INTRINSICS - if (Sse.IsSupported) - { - return (T)(object)(Half)Sse.And(Vector128.CreateScalarUnsafe((float) (Half) (object) x), Vector128.CreateScalarUnsafe(-0.0f)).ToScalar(); - } - else + if (Sse.IsSupported) + { + return (T) + (object) + (Half) + Sse.And( + Vector128.CreateScalarUnsafe((float)(Half)(object)x), + Vector128.CreateScalarUnsafe(-0.0f) + ) + .ToScalar(); + } + else #endif { - var v = *(ushort*) &x; + var v = *(ushort*)&x; v &= 0x7FFF; - return *(T*) &v; + return *(T*)&v; } } @@ -81,24 +104,45 @@ static T Float(T x) #if NET5_0 && INTRINSICS if (Sse.IsSupported) { - return (T)(object)(float)Sse.And(Vector128.CreateScalarUnsafe((float)(object)x), Vector128.Create((uint)0x7FFF_FFFF).AsSingle()).ToScalar(); + return (T) + (object) + (float) + Sse.And( + Vector128.CreateScalarUnsafe((float)(object)x), + Vector128.Create((uint)0x7FFF_FFFF).AsSingle() + ) + .ToScalar(); } else if (AdvSimd.IsSupported) { - return (T) (object) (float)AdvSimd.AbsScalar(Vector64.CreateScalarUnsafe((float) (object) x)).ToScalar(); + return (T) + (object) + (float) + AdvSimd + .AbsScalar(Vector64.CreateScalarUnsafe((float)(object)x)) + .ToScalar(); } else #elif NETCOREAPP3_1 && INTRINSICS if (Sse.IsSupported) { - return (T)(object)(float)Sse.And(Vector128.CreateScalarUnsafe((float)(object)x), Vector128.CreateScalarUnsafe((uint)0x7FFF_FFFF).AsSingle()).ToScalar(); + return (T) + (object) + (float) + Sse.And( + Vector128.CreateScalarUnsafe((float)(object)x), + Vector128 + .CreateScalarUnsafe((uint)0x7FFF_FFFF) + .AsSingle() + ) + .ToScalar(); } else #endif { - var v = *(uint*) &x; + var v = *(uint*)&x; v &= 0x7FFF_FFFF; - return *(T*) &v; + return *(T*)&v; } } @@ -113,24 +157,45 @@ static T Double(T x) #if NET5_0 && INTRINSICS if (Sse2.IsSupported) { - return (T)(object)(double)Sse2.And(Vector128.CreateScalarUnsafe((double)(object)x), Vector128.Create((ulong)0x7FFF_FFFF_FFFF_FFF).AsDouble()).ToScalar(); + return (T) + (object) + (double) + Sse2.And( + Vector128.CreateScalarUnsafe((double)(object)x), + Vector128.Create((ulong)0x7FFF_FFFF_FFFF_FFF).AsDouble() + ) + .ToScalar(); } else if (AdvSimd.IsSupported) { - return (T) (object) (double)AdvSimd.AbsScalar(Vector64.CreateScalar((double) (object) x)).ToScalar(); + return (T) + (object) + (double) + AdvSimd + .AbsScalar(Vector64.CreateScalar((double)(object)x)) + .ToScalar(); } else #elif NETCOREAPP3_1 && INTRINSICS if (Sse2.IsSupported) { - return (T)(object)(double)Sse2.And(Vector128.CreateScalarUnsafe((double)(object)x), Vector128.CreateScalarUnsafe((ulong)0x7FFF_FFFF_FFFF_FFF).AsDouble()).ToScalar(); + return (T) + (object) + (double) + Sse2.And( + Vector128.CreateScalarUnsafe((double)(object)x), + Vector128 + .CreateScalarUnsafe((ulong)0x7FFF_FFFF_FFFF_FFF) + .AsDouble() + ) + .ToScalar(); } else #endif { - var v = *(ulong*) &x; + var v = *(ulong*)&x; v &= 0x7FFF_FFFF_FFFF_FFFF; - return *(T*) &v; + return *(T*)&v; } } @@ -145,18 +210,24 @@ static T SByte(T x) #if SSE if (Ssse3.IsSupported) { - return (T)(object)(sbyte)Ssse3.Abs(Vector128.CreateScalar((sbyte) (object) x)).ToScalar(); + return (T) + (object) + (sbyte) + Ssse3.Abs(Vector128.CreateScalar((sbyte)(object)x)).ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T) (object) (sbyte)AdvSimd.Abs(Vector64.CreateScalar((sbyte) (object) x)).ToScalar(); + return (T) + (object) + (sbyte) + AdvSimd.Abs(Vector64.CreateScalar((sbyte)(object)x)).ToScalar(); } #endif - var px = (sbyte) (object) x; - sbyte mask = (sbyte) (px >> (sizeof(sbyte) - 1)); - return (T) (object) (sbyte) ((px + mask) ^ mask); + var px = (sbyte)(object)x; + sbyte mask = (sbyte)(px >> (sizeof(sbyte) - 1)); + return (T)(object)(sbyte)((px + mask) ^ mask); } return Byte(x); @@ -181,18 +252,22 @@ static T Int(T x) #if SSE if (Ssse3.IsSupported) { - return (T)(object)(int)Ssse3.Abs(Vector128.CreateScalar((int) (object) x)).ToScalar(); + return (T) + (object) + (int)Ssse3.Abs(Vector128.CreateScalar((int)(object)x)).ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T) (object)(int) AdvSimd.Abs(Vector64.CreateScalar((int) (object) x)).ToScalar(); + return (T) + (object) + (int)AdvSimd.Abs(Vector64.CreateScalar((int)(object)x)).ToScalar(); } #endif - var px = (int) (object) x; - int mask = (int) (px >> (sizeof(int) - 1)); - return (T) (object) (int) ((px + mask) ^ mask); + var px = (int)(object)x; + int mask = (int)(px >> (sizeof(int) - 1)); + return (T)(object)(int)((px + mask) ^ mask); } return UInt(x); @@ -214,9 +289,9 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - var px = (long) (object) x; - long mask = (long) (px >> (sizeof(long) - 1)); - return (T) (object) (long) ((px + mask) ^ mask); + var px = (long)(object)x; + long mask = (long)(px >> (sizeof(long) - 1)); + return (T)(object)(long)((px + mask) ^ mask); } return ULong(x); @@ -241,18 +316,24 @@ static T Short(T x) #if SSE if (Ssse3.IsSupported) { - return (T)(object)(short)Ssse3.Abs(Vector128.CreateScalar((short) (object) x)).ToScalar(); + return (T) + (object) + (short) + Ssse3.Abs(Vector128.CreateScalar((short)(object)x)).ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T) (object)(short)AdvSimd.Abs(Vector64.CreateScalar((short) (object) x)).ToScalar(); + return (T) + (object) + (short) + AdvSimd.Abs(Vector64.CreateScalar((short)(object)x)).ToScalar(); } #endif - var px = (short) (object) x; - short mask = (short) (px >> (sizeof(short) - 1)); - return (T) (object) (short) ((px + mask) ^ mask); + var px = (short)(object)x; + short mask = (short)(px >> (sizeof(short) - 1)); + return (T)(object)(short)((px + mask) ^ mask); } return UShort(x); @@ -273,8 +354,9 @@ static T UShort(T x) static T Complex(T x) { if (typeof(T) == typeof(Complex)) - return (T)(object) new Complex(System.Numerics.Complex.Abs((Complex)(object)x), 0); - + return (T) + (object)new Complex(System.Numerics.Complex.Abs((Complex)(object)x), 0); + return Decimal(x); } @@ -283,7 +365,7 @@ static T Decimal(T x) { if (typeof(T) == typeof(decimal)) { - return (T) (object) Math.Abs((decimal) (object) x); + return (T)(object)Math.Abs((decimal)(object)x); } ThrowUnsupportedType(); @@ -304,14 +386,15 @@ static T Decimal(T x) /// NaN if x < -1 or x > 1 or x equals NaN. /// [MethodImpl(MaxOpt)] - public static T Acos(T x) where T : notnull + public static T Acos(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Acos((float) (Half) (object) x); // KIPLING + return (T)(object)(Half)(float)Math.Acos((float)(Half)(object)x); // KIPLING #else - return (T) (object) (Half) MathF.Abs((float) (Half) (object) x); + return (T)(object)(Half)MathF.Abs((float)(Half)(object)x); #endif } @@ -323,9 +406,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Acos((float) (object) x); // KIPLING + return (T)(object)(float)Math.Acos((float)(object)x); // KIPLING #else - return (T) (object) MathF.Acos((float) (object) x); + return (T)(object)MathF.Acos((float)(object)x); #endif } @@ -337,7 +420,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Acos((double) (object) x); + return (T)(object)Math.Acos((double)(object)x); } return SByte(x); @@ -348,7 +431,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Acos((sbyte) (object) x); // KIPLING + return (T)(object)(sbyte)Math.Acos((sbyte)(object)x); // KIPLING } return Byte(x); @@ -359,7 +442,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Acos((byte) (object) x); // KIPLING + return (T)(object)(byte)Math.Acos((byte)(object)x); // KIPLING } return Int(x); @@ -370,7 +453,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Acos((int) (object) x); // KIPLING + return (T)(object)(int)Math.Acos((int)(object)x); // KIPLING } return UInt(x); @@ -381,7 +464,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Acos((uint) (object) x); // KIPLING + return (T)(object)(uint)Math.Acos((uint)(object)x); // KIPLING } return Long(x); @@ -392,7 +475,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Acos((long) (object) x); // KIPLING + return (T)(object)(long)Math.Acos((long)(object)x); // KIPLING } return ULong(x); @@ -403,7 +486,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Acos((ulong) (object) x); // KIPLING + return (T)(object)(ulong)Math.Acos((ulong)(object)x); // KIPLING } return Short(x); @@ -414,7 +497,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Acos((short) (object) x); // KIPLING + return (T)(object)(short)Math.Acos((short)(object)x); // KIPLING } return UShort(x); @@ -425,7 +508,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Acos((ushort) (object) x); // KIPLING + return (T)(object)(ushort)Math.Acos((ushort)(object)x); // KIPLING } return Complex(x); @@ -436,7 +519,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Acos((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Acos((Complex)(object)x); } return Decimal(x); @@ -463,17 +546,18 @@ static T Decimal(T x) /// The type of . /// /// An angle, θ, measured in radians, such that 0 ≤ θ ≤ ∞. - /// + /// /// -or- - /// + /// /// NaN if x < 1 or x equals NaN. /// [MethodImpl(MaxOpt)] - public static T Acosh(T x) where T : notnull + public static T Acosh(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) (float) CoreAcosh((float) (Half) (object) x); + return (T)(object)(Half)(float)CoreAcosh((float)(Half)(object)x); } return Float(x); @@ -483,7 +567,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) CoreAcosh((float) (object) x); + return (T)(object)CoreAcosh((float)(object)x); } return Double(x); @@ -494,7 +578,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) CoreAcosh((double) (object) x); + return (T)(object)CoreAcosh((double)(object)x); } return SByte(x); @@ -505,7 +589,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) CoreAcosh((sbyte) (object) x); + return (T)(object)CoreAcosh((sbyte)(object)x); } return Byte(x); @@ -516,7 +600,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) CoreAcosh((byte) (object) x); + return (T)(object)(byte)CoreAcosh((byte)(object)x); } return Int(x); @@ -527,7 +611,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) CoreAcosh((int) (object) x); + return (T)(object)CoreAcosh((int)(object)x); } return UInt(x); @@ -538,7 +622,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (byte) CoreAcosh((byte) (object) x); + return (T)(object)(byte)CoreAcosh((byte)(object)x); } return Long(x); @@ -549,7 +633,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) CoreAcosh((long) (object) x); + return (T)(object)CoreAcosh((long)(object)x); } return ULong(x); @@ -560,7 +644,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) CoreAcosh((ulong) (object) x); + return (T)(object)CoreAcosh((ulong)(object)x); } return Short(x); @@ -571,7 +655,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) CoreAcosh((short) (object) x); + return (T)(object)CoreAcosh((short)(object)x); } return UShort(x); @@ -582,12 +666,12 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) CoreAcosh((int) (object) x); + return (T)(object)CoreAcosh((int)(object)x); } return Decimal(x); } - + [MethodImpl(MaxOpt)] static T Decimal(T x) { @@ -608,20 +692,21 @@ static T Decimal(T x) /// A number representing a sine, where must be greater than or equal to -1, but less than or equal to 1. /// The type of /// An angle, θ, measured in radians, such that -π/2 ≤ θ ≤ π/2. - /// + /// /// -or- - /// + /// /// NaN if x < -1 or x > 1 or x equals NaN. /// [MethodImpl(MaxOpt)] - public static T Asin(T x) where T : notnull + public static T Asin(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Asin((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Asin((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Abs((float) (Half) (object) x); + return (T)(object)(Half)MathF.Abs((float)(Half)(object)x); #endif } @@ -633,9 +718,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Asin((float) (object) x); + return (T)(object)(float)Math.Asin((float)(object)x); #else - return (T) (object) MathF.Asin((float) (object) x); + return (T)(object)MathF.Asin((float)(object)x); #endif } @@ -647,7 +732,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Asin((double) (object) x); + return (T)(object)Math.Asin((double)(object)x); } return SByte(x); @@ -658,7 +743,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Asin((sbyte) (object) x); + return (T)(object)(sbyte)Math.Asin((sbyte)(object)x); } return Byte(x); @@ -669,7 +754,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Asin((byte) (object) x); + return (T)(object)(byte)Math.Asin((byte)(object)x); } return Int(x); @@ -680,7 +765,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Asin((int) (object) x); + return (T)(object)(int)Math.Asin((int)(object)x); } return UInt(x); @@ -691,7 +776,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Asin((uint) (object) x); + return (T)(object)(uint)Math.Asin((uint)(object)x); } return Long(x); @@ -702,7 +787,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Asin((long) (object) x); + return (T)(object)(long)Math.Asin((long)(object)x); } return ULong(x); @@ -713,7 +798,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Asin((ulong) (object) x); + return (T)(object)(ulong)Math.Asin((ulong)(object)x); } return Short(x); @@ -724,7 +809,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Asin((short) (object) x); + return (T)(object)(short)Math.Asin((short)(object)x); } return UShort(x); @@ -735,7 +820,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Asin((ushort) (object) x); + return (T)(object)(ushort)Math.Asin((ushort)(object)x); } return Complex(x); @@ -746,7 +831,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Asin((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Asin((Complex)(object)x); } return Decimal(x); @@ -773,11 +858,12 @@ static T Decimal(T x) /// /// [MethodImpl(MaxOpt)] - public static T Asinh(T x) where T : notnull + public static T Asinh(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) (float) CoreAsinh((float) (Half) (object) x); + return (T)(object)(Half)(float)CoreAsinh((float)(Half)(object)x); } return Float(x); @@ -787,7 +873,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) CoreAsinh((float) (object) x); + return (T)(object)CoreAsinh((float)(object)x); } return Double(x); @@ -798,7 +884,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) CoreAsinh((double) (object) x); + return (T)(object)CoreAsinh((double)(object)x); } return SByte(x); @@ -809,7 +895,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) CoreAsinh((sbyte) (object) x); + return (T)(object)CoreAsinh((sbyte)(object)x); } return Byte(x); @@ -820,7 +906,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) CoreAsinh((byte) (object) x); + return (T)(object)(byte)CoreAsinh((byte)(object)x); } return Int(x); @@ -831,7 +917,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) CoreAsinh((int) (object) x); + return (T)(object)CoreAsinh((int)(object)x); } return UInt(x); @@ -842,7 +928,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) CoreAsinh((uint) (object) x); + return (T)(object)CoreAsinh((uint)(object)x); } return Long(x); @@ -853,7 +939,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) CoreAsinh((long) (object) x); + return (T)(object)CoreAsinh((long)(object)x); } return ULong(x); @@ -864,7 +950,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) CoreAsinh((ulong) (object) x); + return (T)(object)CoreAsinh((ulong)(object)x); } return Short(x); @@ -875,7 +961,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) CoreAsinh((short) (object) x); + return (T)(object)CoreAsinh((short)(object)x); } return UShort(x); @@ -886,7 +972,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) CoreAsinh((ushort) (object) x); + return (T)(object)CoreAsinh((ushort)(object)x); } return Decimal(x); @@ -913,20 +999,21 @@ static T Decimal(T x) /// The type of . /// ///An angle, θ, measured in radians, such that -π/2 ≤ θ ≤ π/2. - /// + /// /// -or- - /// + /// /// NaN if equals , -π/2 rounded to double precision (-1.5707963267949) if equals , or π/2 rounded to double precision (1.5707963267949) if equals . /// [MethodImpl(MaxOpt)] - public static T Atan(T x) where T : notnull + public static T Atan(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Atan((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Atan((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Abs((float) (Half) (object) x); + return (T)(object)(Half)MathF.Abs((float)(Half)(object)x); #endif } @@ -938,9 +1025,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Atan((float) (object) x); + return (T)(object)(float)Math.Atan((float)(object)x); #else - return (T) (object) MathF.Atan((float) (object) x); + return (T)(object)MathF.Atan((float)(object)x); #endif } @@ -952,7 +1039,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Atan((double) (object) x); + return (T)(object)Math.Atan((double)(object)x); } return SByte(x); @@ -963,7 +1050,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Atan((sbyte) (object) x); + return (T)(object)(sbyte)Math.Atan((sbyte)(object)x); } return Byte(x); @@ -974,7 +1061,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Atan((byte) (object) x); + return (T)(object)(byte)Math.Atan((byte)(object)x); } return Int(x); @@ -985,7 +1072,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Atan((int) (object) x); + return (T)(object)(int)Math.Atan((int)(object)x); } return UInt(x); @@ -996,7 +1083,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Atan((uint) (object) x); + return (T)(object)(uint)Math.Atan((uint)(object)x); } return Long(x); @@ -1007,7 +1094,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Atan((long) (object) x); + return (T)(object)(long)Math.Atan((long)(object)x); } return ULong(x); @@ -1018,7 +1105,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Atan((ulong) (object) x); + return (T)(object)(ulong)Math.Atan((ulong)(object)x); } return Short(x); @@ -1029,7 +1116,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Atan((short) (object) x); + return (T)(object)(short)Math.Atan((short)(object)x); } return UShort(x); @@ -1040,7 +1127,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Atan((ushort) (object) x); + return (T)(object)(ushort)Math.Atan((ushort)(object)x); } return Complex(x); @@ -1051,7 +1138,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Atan((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Atan((Complex)(object)x); } return Decimal(x); @@ -1078,17 +1165,18 @@ static T Decimal(T x) /// The type of . /// /// An angle, θ, measured in radians, such that -∞ < θ < -1, or 1 < θ < ∞. - /// + /// /// -or- - /// + /// /// if x < -1 or x > 1 or x equals . /// [MethodImpl(MaxOpt)] - public static T Atanh(T x) where T : notnull + public static T Atanh(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) Atanh((float) (Half) (object) x); + return (T)(object)(Half)Atanh((float)(Half)(object)x); } return Float(x); @@ -1098,7 +1186,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) Atanh((float) (object) x); + return (T)(object)Atanh((float)(object)x); } return Double(x); @@ -1109,7 +1197,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) CoreAtanh((double) (object) x); + return (T)(object)CoreAtanh((double)(object)x); } return Decimal(x); @@ -1132,7 +1220,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) CoreAtanh((sbyte) (object) x); + return (T)(object)CoreAtanh((sbyte)(object)x); } return Byte(x); @@ -1143,7 +1231,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) CoreAtanh((byte) (object) x); + return (T)(object)CoreAtanh((byte)(object)x); } return Short(x); @@ -1154,7 +1242,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) CoreAtanh((short) (object) x); + return (T)(object)CoreAtanh((short)(object)x); } return UShort(x); @@ -1165,7 +1253,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) CoreAtanh((ushort) (object) x); + return (T)(object)CoreAtanh((ushort)(object)x); } return Int(x); @@ -1176,7 +1264,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) CoreAtanh((int) (object) x); + return (T)(object)CoreAtanh((int)(object)x); } return UInt(x); @@ -1187,7 +1275,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) CoreAtanh((uint) (object) x); + return (T)(object)CoreAtanh((uint)(object)x); } return Long(x); @@ -1198,7 +1286,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) CoreAtanh((long) (object) x); + return (T)(object)CoreAtanh((long)(object)x); } return ULong(x); @@ -1209,7 +1297,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) CoreAtanh((ulong) (object) x); + return (T)(object)CoreAtanh((ulong)(object)x); } ThrowUnsupportedType(); @@ -1224,17 +1312,18 @@ static T ULong(T x) /// The type of /// /// The cube root of . - /// + /// /// -or- - /// + /// /// if is equals . /// [MethodImpl(MaxOpt)] - public static T Cbrt(T x) where T : notnull + public static T Cbrt(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) CoreCbrt((float) (Half) (object) x); + return (T)(object)(Half)CoreCbrt((float)(Half)(object)x); } return Float(x); @@ -1244,7 +1333,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) CoreCbrt((float) (object) x); + return (T)(object)CoreCbrt((float)(object)x); } return Double(x); @@ -1255,7 +1344,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) CoreCbrt((double) (object) x); + return (T)(object)CoreCbrt((double)(object)x); } return Decimal(x); @@ -1278,7 +1367,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) CoreCbrt((sbyte) (object) x); + return (T)(object)CoreCbrt((sbyte)(object)x); } return Byte(x); @@ -1289,7 +1378,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) CoreCbrt((byte) (object) x); + return (T)(object)CoreCbrt((byte)(object)x); } return Short(x); @@ -1300,7 +1389,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) CoreCbrt((short) (object) x); + return (T)(object)CoreCbrt((short)(object)x); } return UShort(x); @@ -1311,7 +1400,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) CoreCbrt((ushort) (object) x); + return (T)(object)CoreCbrt((ushort)(object)x); } return Int(x); @@ -1322,7 +1411,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) CoreCbrt((int) (object) x); + return (T)(object)CoreCbrt((int)(object)x); } return UInt(x); @@ -1333,7 +1422,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) CoreCbrt((uint) (object) x); + return (T)(object)CoreCbrt((uint)(object)x); } return Long(x); @@ -1344,7 +1433,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) CoreCbrt((long) (object) x); + return (T)(object)CoreCbrt((long)(object)x); } return Complex(x); @@ -1355,7 +1444,8 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Pow((Complex) (object) x, 1.0/3); // TODO: find a more efficient impl? + return (T) + (object)(Complex)System.Numerics.Complex.Pow((Complex)(object)x, 1.0 / 3); // TODO: find a more efficient impl? } return ULong(x); @@ -1366,7 +1456,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) CoreCbrt((ulong) (object) x); + return (T)(object)CoreCbrt((ulong)(object)x); } ThrowUnsupportedType(); @@ -1381,14 +1471,15 @@ static T ULong(T x) /// The type of . /// The smallest integral value that is greater than or equal to . If is equal to , , or , that value is returned. Note that this method returns instead of an integral type. [MethodImpl(MaxOpt)] - public static T Ceiling(T x) where T : notnull + public static T Ceiling(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) Math.Ceiling((float) (Half) (object) x); + return (T)(object)(Half)Math.Ceiling((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Ceiling((float) (Half) (object) x); + return (T)(object)(Half)MathF.Ceiling((float)(Half)(object)x); #endif } @@ -1400,9 +1491,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Ceiling((float) (object) x); + return (T)(object)(float)Math.Ceiling((float)(object)x); #else - return (T) (object) MathF.Ceiling((float) (object) x); + return (T)(object)MathF.Ceiling((float)(object)x); #endif } @@ -1414,7 +1505,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Ceiling((double) (object) x); + return (T)(object)Math.Ceiling((double)(object)x); } return Decimal(x); @@ -1425,7 +1516,7 @@ static T Decimal(T x) { if (typeof(T) == typeof(decimal)) { - return (T) (object) Math.Ceiling((decimal) (object) x); + return (T)(object)Math.Ceiling((decimal)(object)x); } return SByte(x); @@ -1528,14 +1619,15 @@ static T ULong(T x) /// The type of . /// The cosine of . If is equal to , , or , this method returns . [MethodImpl(MaxOpt)] - public static T Cos(T x) where T : notnull + public static T Cos(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) Math.Cos((float) (Half) (object) x); + return (T)(object)(Half)Math.Cos((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Cos((float) (Half) (object) x); + return (T)(object)(Half)MathF.Cos((float)(Half)(object)x); #endif } @@ -1547,9 +1639,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Cos((float) (object) x); + return (T)(object)(float)Math.Cos((float)(object)x); #else - return (T) (object) MathF.Cos((float) (object) x); + return (T)(object)MathF.Cos((float)(object)x); #endif } @@ -1561,7 +1653,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Cos((double) (object) x); + return (T)(object)Math.Cos((double)(object)x); } return Decimal(x); @@ -1584,7 +1676,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Cos((sbyte) (object) x); + return (T)(object)(sbyte)Math.Cos((sbyte)(object)x); } return Byte(x); @@ -1595,7 +1687,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Cos((byte) (object) x); + return (T)(object)(byte)Math.Cos((byte)(object)x); } return Short(x); @@ -1606,7 +1698,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Cos((short) (object) x); + return (T)(object)(short)Math.Cos((short)(object)x); } return UShort(x); @@ -1617,7 +1709,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Cos((ushort) (object) x); + return (T)(object)(ushort)Math.Cos((ushort)(object)x); } return Int(x); @@ -1628,7 +1720,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Cos((int) (object) x); + return (T)(object)(int)Math.Cos((int)(object)x); } return UInt(x); @@ -1639,7 +1731,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Cos((uint) (object) x); + return (T)(object)(uint)Math.Cos((uint)(object)x); } return Long(x); @@ -1650,7 +1742,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Cos((long) (object) x); + return (T)(object)(long)Math.Cos((long)(object)x); } return Complex(x); @@ -1661,7 +1753,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Cos((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Cos((Complex)(object)x); } return ULong(x); @@ -1672,7 +1764,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Cos((ulong) (object) x); + return (T)(object)(ulong)Math.Cos((ulong)(object)x); } ThrowUnsupportedType(); @@ -1687,14 +1779,15 @@ static T ULong(T x) /// The type of . /// The hyperbolic cosine of . If equal to or , is returned. If is equal to , is returned. [MethodImpl(MaxOpt)] - public static T Cosh(T x) where T : notnull + public static T Cosh(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) Math.Cosh((float) (Half) (object) x); + return (T)(object)(Half)Math.Cosh((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Cosh((float) (Half) (object) x); + return (T)(object)(Half)MathF.Cosh((float)(Half)(object)x); #endif } @@ -1706,9 +1799,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Cosh((float) (object) x); + return (T)(object)(float)Math.Cosh((float)(object)x); #else - return (T) (object) MathF.Cosh((float) (object) x); + return (T)(object)MathF.Cosh((float)(object)x); #endif } @@ -1720,7 +1813,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Cosh((double) (object) x); + return (T)(object)Math.Cosh((double)(object)x); } return Decimal(x); @@ -1743,7 +1836,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Cosh((sbyte) (object) x); + return (T)(object)(sbyte)Math.Cosh((sbyte)(object)x); } return Byte(x); @@ -1754,7 +1847,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Cosh((byte) (object) x); + return (T)(object)(byte)Math.Cosh((byte)(object)x); } return Short(x); @@ -1765,7 +1858,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Cosh((short) (object) x); + return (T)(object)(short)Math.Cosh((short)(object)x); } return UShort(x); @@ -1776,7 +1869,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Cosh((ushort) (object) x); + return (T)(object)(ushort)Math.Cosh((ushort)(object)x); } return Int(x); @@ -1787,7 +1880,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Cosh((int) (object) x); + return (T)(object)(int)Math.Cosh((int)(object)x); } return UInt(x); @@ -1798,7 +1891,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Cosh((uint) (object) x); + return (T)(object)(uint)Math.Cosh((uint)(object)x); } return Long(x); @@ -1809,7 +1902,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Cosh((long) (object) x); + return (T)(object)(long)Math.Cosh((long)(object)x); } return Complex(x); @@ -1820,7 +1913,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Cosh((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Cosh((Complex)(object)x); } return ULong(x); @@ -1831,7 +1924,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Cosh((ulong) (object) x); + return (T)(object)(ulong)Math.Cosh((ulong)(object)x); } ThrowUnsupportedType(); @@ -1846,11 +1939,12 @@ static T ULong(T x) /// The type of . /// The number e raised to the power . If equals or , that value is returned. If equals , 0 is returned. [MethodImpl(MaxOpt)] - public static T Exp(T x) where T : notnull + public static T Exp(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) CoreFastExp((float) (Half) (object) x); + return (T)(object)(Half)CoreFastExp((float)(Half)(object)x); } return Float(x); @@ -1860,7 +1954,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) CoreFastExp((float) (object) x); + return (T)(object)CoreFastExp((float)(object)x); } return Double(x); @@ -1871,7 +1965,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Exp((double) (object) x); + return (T)(object)Math.Exp((double)(object)x); } return Decimal(x); @@ -1894,7 +1988,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Exp((sbyte) (object) x); + return (T)(object)(sbyte)Math.Exp((sbyte)(object)x); } return Byte(x); @@ -1905,7 +1999,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Exp((byte) (object) x); + return (T)(object)(byte)Math.Exp((byte)(object)x); } return Short(x); @@ -1916,7 +2010,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Exp((short) (object) x); + return (T)(object)(short)Math.Exp((short)(object)x); } return UShort(x); @@ -1927,7 +2021,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Exp((ushort) (object) x); + return (T)(object)(ushort)Math.Exp((ushort)(object)x); } return Int(x); @@ -1938,7 +2032,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Exp((int) (object) x); + return (T)(object)(int)Math.Exp((int)(object)x); } return UInt(x); @@ -1949,7 +2043,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Exp((uint) (object) x); + return (T)(object)(uint)Math.Exp((uint)(object)x); } return Long(x); @@ -1960,7 +2054,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Exp((long) (object) x); + return (T)(object)(long)Math.Exp((long)(object)x); } return Complex(x); @@ -1971,7 +2065,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Exp((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Exp((Complex)(object)x); } return ULong(x); @@ -1982,7 +2076,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Exp((ulong) (object) x); + return (T)(object)(ulong)Math.Exp((ulong)(object)x); } ThrowUnsupportedType(); @@ -1997,26 +2091,41 @@ static T ULong(T x) /// The type of . /// The largest integral value less than or equal to . If is equal to , , or , that value is returned. [MethodImpl(MaxOpt)] - public static T Floor(T x) where T : notnull + public static T Floor(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if SSE if (Sse41.IsSupported) { - return (T)(object)(Half)Sse41.FloorScalar(Vector128.CreateScalarUnsafe((float) (Half) (object) x)).ToScalar(); + return (T) + (object) + (Half) + Sse41 + .FloorScalar( + Vector128.CreateScalarUnsafe((float)(Half)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(Half)AdvSimd.FloorScalar(Vector64.CreateScalarUnsafe((float) (Half) (object) x)).ToScalar(); + return (T) + (object) + (Half) + AdvSimd + .FloorScalar( + Vector64.CreateScalarUnsafe((float)(Half)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (Half) Math.Floor((float) (Half) (object) x); + return (T)(object)(Half)Math.Floor((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Floor((float) (Half) (object) x); + return (T)(object)(Half)MathF.Floor((float)(Half)(object)x); #endif } @@ -2030,19 +2139,27 @@ static T Float(T x) #if SSE if (Sse41.IsSupported) { - return (T)(object)Sse41.FloorScalar(Vector128.CreateScalarUnsafe((float) (object) x)).ToScalar(); + return (T) + (object) + Sse41 + .FloorScalar(Vector128.CreateScalarUnsafe((float)(object)x)) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)AdvSimd.FloorScalar(Vector64.CreateScalarUnsafe((float) (object) x)).ToScalar(); + return (T) + (object) + AdvSimd + .FloorScalar(Vector64.CreateScalarUnsafe((float)(object)x)) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (float) Math.Floor((float) (object) x); + return (T)(object)(float)Math.Floor((float)(object)x); #else - return (T) (object) MathF.Floor((float) (object) x); + return (T)(object)MathF.Floor((float)(object)x); #endif } @@ -2057,16 +2174,24 @@ static T Double(T x) #if SSE if (Sse41.IsSupported) { - return (T)(object)Sse41.FloorScalar(Vector128.CreateScalarUnsafe((double) (object) x)).ToScalar(); + return (T) + (object) + Sse41 + .FloorScalar(Vector128.CreateScalarUnsafe((double)(object)x)) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)AdvSimd.FloorScalar(Vector64.CreateScalar((double) (object) x)).ToScalar(); + return (T) + (object) + AdvSimd + .FloorScalar(Vector64.CreateScalar((double)(object)x)) + .ToScalar(); } #endif - return (T) (object) Math.Floor((double) (object) x); + return (T)(object)Math.Floor((double)(object)x); } return Decimal(x); @@ -2080,16 +2205,30 @@ static T Decimal(T x) #if SSE if (Sse41.IsSupported) { - return (T)(object)(decimal)Sse41.FloorScalar(Vector128.CreateScalarUnsafe((double)(decimal) (object) x)).ToScalar(); + return (T) + (object) + (decimal) + Sse41 + .FloorScalar( + Vector128.CreateScalarUnsafe((double)(decimal)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(decimal)AdvSimd.FloorScalar(Vector64.CreateScalar((double)(decimal) (object) x)).ToScalar(); + return (T) + (object) + (decimal) + AdvSimd + .FloorScalar( + Vector64.CreateScalar((double)(decimal)(object)x) + ) + .ToScalar(); } -#endif - return (T) (object) Math.Floor((decimal) (object) x); +#endif + return (T)(object)Math.Floor((decimal)(object)x); } return SByte(x); @@ -2216,14 +2355,15 @@ static T ULong(T x) /// /// is equal to [MethodImpl(MaxOpt)] - public static int Sign(T x) where T : notnull + public static int Sign(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return Math.Sign((float) (Half) (object) x); + return Math.Sign((float)(Half)(object)x); #else - return MathF.Sign((float) (Half) (object) x); + return MathF.Sign((float)(Half)(object)x); #endif } @@ -2235,9 +2375,9 @@ static int Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return Math.Sign((float) (object) x); + return Math.Sign((float)(object)x); #else - return MathF.Sign((float) (object) x); + return MathF.Sign((float)(object)x); #endif } @@ -2249,7 +2389,7 @@ static int Double(T x) { if (typeof(T) == typeof(double)) { - return Math.Sign((double) (object) x); + return Math.Sign((double)(object)x); } return Decimal(x); @@ -2260,7 +2400,7 @@ static int Decimal(T x) { if (typeof(T) == typeof(decimal)) { - return Math.Sign((decimal) (object) x); + return Math.Sign((decimal)(object)x); } return SByte(x); @@ -2271,7 +2411,7 @@ static int SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return Math.Sign((sbyte) (object) x); + return Math.Sign((sbyte)(object)x); } return Byte(x); @@ -2282,7 +2422,7 @@ static int Byte(T x) { if (typeof(T) == typeof(byte)) { - return ((byte) (object) x) > 0 ? 1 : 0; + return ((byte)(object)x) > 0 ? 1 : 0; } return Short(x); @@ -2293,7 +2433,7 @@ static int Short(T x) { if (typeof(T) == typeof(short)) { - return Math.Sign((short) (object) x); + return Math.Sign((short)(object)x); } return UShort(x); @@ -2304,7 +2444,7 @@ static int UShort(T x) { if (typeof(T) == typeof(ushort)) { - return ((ushort) (object) x) > 0 ? 1 : 0; + return ((ushort)(object)x) > 0 ? 1 : 0; } return Int(x); @@ -2315,7 +2455,7 @@ static int Int(T x) { if (typeof(T) == typeof(int)) { - return Math.Sign((int) (object) x); + return Math.Sign((int)(object)x); } return UInt(x); @@ -2326,7 +2466,7 @@ static int UInt(T x) { if (typeof(T) == typeof(uint)) { - return ((uint) (object) x) > 0 ? 1 : 0; + return ((uint)(object)x) > 0 ? 1 : 0; } return Long(x); @@ -2337,7 +2477,7 @@ static int Long(T x) { if (typeof(T) == typeof(long)) { - return Math.Sign((long) (object) x); + return Math.Sign((long)(object)x); } return ULong(x); @@ -2348,7 +2488,7 @@ static int ULong(T x) { if (typeof(T) == typeof(ulong)) { - return ((ulong) (object) x) > 0 ? 1 : 0; + return ((ulong)(object)x) > 0 ? 1 : 0; } ThrowUnsupportedType(); @@ -2363,11 +2503,12 @@ static int ULong(T x) /// The type of . /// The sine of . If is equal to , , or , this method returns . [MethodImpl(MaxOpt)] - public static T Sin(T x) where T : notnull + public static T Sin(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) (float) Sin_Ported((float) (Half) (object) x); + return (T)(object)(Half)(float)Sin_Ported((float)(Half)(object)x); } return Float(x); @@ -2377,7 +2518,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) (float) Sin_Ported((float) (object) x); + return (T)(object)(float)Sin_Ported((float)(object)x); } return Double(x); @@ -2388,7 +2529,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Sin((double) (object) x); + return (T)(object)(double)Math.Sin((double)(object)x); } return Decimal(x); @@ -2411,7 +2552,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Sin((sbyte) (object) x); + return (T)(object)(sbyte)Math.Sin((sbyte)(object)x); } return Byte(x); @@ -2422,7 +2563,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Sin((byte) (object) x); + return (T)(object)(byte)Math.Sin((byte)(object)x); } return Short(x); @@ -2433,7 +2574,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Sin((short) (object) x); + return (T)(object)(short)Math.Sin((short)(object)x); } return UShort(x); @@ -2444,7 +2585,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Sin((ushort) (object) x); + return (T)(object)(ushort)Math.Sin((ushort)(object)x); } return Int(x); @@ -2455,7 +2596,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Sin((int) (object) x); + return (T)(object)(int)Math.Sin((int)(object)x); } return UInt(x); @@ -2466,7 +2607,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Sin((uint) (object) x); + return (T)(object)(uint)Math.Sin((uint)(object)x); } return Long(x); @@ -2477,7 +2618,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Sin((long) (object) x); + return (T)(object)(long)Math.Sin((long)(object)x); } return Complex(x); @@ -2488,7 +2629,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Sin((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Sin((Complex)(object)x); } return ULong(x); @@ -2499,7 +2640,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Sin((ulong) (object) x); + return (T)(object)(ulong)Math.Sin((ulong)(object)x); } ThrowUnsupportedType(); @@ -2514,14 +2655,15 @@ static T ULong(T x) /// Type of . /// The hyperbolic sine of . If is equal to , , or this method returns . [MethodImpl(MaxOpt)] - public static T Sinh(T x) where T : notnull + public static T Sinh(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Sinh((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Sinh((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Sinh((float) (Half) (object) x); + return (T)(object)(Half)MathF.Sinh((float)(Half)(object)x); #endif } @@ -2533,9 +2675,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Sinh((float) (object) x); + return (T)(object)(float)Math.Sinh((float)(object)x); #else - return (T) (object) MathF.Sinh((float) (object) x); + return (T)(object)MathF.Sinh((float)(object)x); #endif } @@ -2547,7 +2689,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Sinh((double) (object) x); + return (T)(object)(double)Math.Sinh((double)(object)x); } return Decimal(x); @@ -2570,7 +2712,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Sinh((sbyte) (object) x); + return (T)(object)(sbyte)Math.Sinh((sbyte)(object)x); } return Byte(x); @@ -2581,7 +2723,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Sinh((byte) (object) x); + return (T)(object)(byte)Math.Sinh((byte)(object)x); } return Short(x); @@ -2592,7 +2734,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Sinh((short) (object) x); + return (T)(object)(short)Math.Sinh((short)(object)x); } return UShort(x); @@ -2603,7 +2745,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Sinh((ushort) (object) x); + return (T)(object)(ushort)Math.Sinh((ushort)(object)x); } return Int(x); @@ -2614,7 +2756,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Sinh((int) (object) x); + return (T)(object)(int)Math.Sinh((int)(object)x); } return UInt(x); @@ -2625,7 +2767,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Sinh((uint) (object) x); + return (T)(object)(uint)Math.Sinh((uint)(object)x); } return Long(x); @@ -2636,7 +2778,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Sinh((long) (object) x); + return (T)(object)(long)Math.Sinh((long)(object)x); } return Complex(x); @@ -2647,7 +2789,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Sinh((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Sinh((Complex)(object)x); } return ULong(x); @@ -2658,7 +2800,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Sinh((ulong) (object) x); + return (T)(object)(ulong)Math.Sinh((ulong)(object)x); } ThrowUnsupportedType(); @@ -2697,26 +2839,42 @@ static T ULong(T x) /// /// [MethodImpl(MaxOpt)] - public static T Sqrt(T x) where T : notnull + public static T Sqrt(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if SSE if (Sse42.IsSupported) { - return (T)(object)(Half)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(Half)(object)x)).ToScalar(); + return (T) + (object) + (Half) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe((float)(Half)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(Half)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(Half)(object)x)).ToScalar(); + return (T) + (object) + (Half) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(Half)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (Half) (float) Math.Sqrt((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Sqrt((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Sqrt((float) (Half) (object) x); + return (T)(object)(Half)MathF.Sqrt((float)(Half)(object)x); #endif } @@ -2730,19 +2888,28 @@ static T Float(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(object)x)).ToScalar(); + return (T) + (object) + (float) + Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(object)x)) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(object)x)).ToScalar(); + return (T) + (object) + (float) + AdvSimd + .SqrtScalar(Vector64.CreateScalarUnsafe((float)(object)x)) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (float) Math.Sqrt((float) (object) x); + return (T)(object)(float)Math.Sqrt((float)(object)x); #else - return (T) (object) MathF.Sqrt((float) (object) x); + return (T)(object)MathF.Sqrt((float)(object)x); #endif } @@ -2757,16 +2924,25 @@ static T Double(T x) #if SSE if (Sse2.IsSupported) { - return (T)(object)(double)Sse2.SqrtScalar(Vector128.CreateScalarUnsafe((double)(object)x)).ToScalar(); + return (T) + (object) + (double) + Sse2.SqrtScalar(Vector128.CreateScalarUnsafe((double)(object)x)) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(double)AdvSimd.SqrtScalar(Vector64.CreateScalar((double)(object)x)).ToScalar(); + return (T) + (object) + (double) + AdvSimd + .SqrtScalar(Vector64.CreateScalar((double)(object)x)) + .ToScalar(); } -#endif - return (T) (object) (double) Math.Sqrt((double) (object) x); +#endif + return (T)(object)(double)Math.Sqrt((double)(object)x); } return Decimal(x); @@ -2792,19 +2968,36 @@ static T SByte(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(sbyte)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(sbyte)(object)x)).ToScalar(); + return (T) + (object) + (sbyte) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe( + (float)(sbyte)(object)x + ) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(sbyte)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(sbyte)(object)x)).ToScalar(); + return (T) + (object) + (sbyte) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(sbyte)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (sbyte) (float) Math.Sqrt((float) (sbyte) (object) x); + return (T)(object)(sbyte)(float)Math.Sqrt((float)(sbyte)(object)x); #else - return (T) (object) (sbyte)(float)MathF.Sqrt((float) (sbyte)(object) x); + return (T)(object)(sbyte)(float)MathF.Sqrt((float)(sbyte)(object)x); #endif } @@ -2819,19 +3012,34 @@ static T Byte(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(byte)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(byte)(object)x)).ToScalar(); + return (T) + (object) + (byte) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe((float)(byte)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(byte)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(byte)(object)x)).ToScalar(); + return (T) + (object) + (byte) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(byte)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (byte) (float) Math.Sqrt((float) (byte) (object) x); + return (T)(object)(byte)(float)Math.Sqrt((float)(byte)(object)x); #else - return (T) (object) (byte)(float)MathF.Sqrt((float) (byte)(object) x); + return (T)(object)(byte)(float)MathF.Sqrt((float)(byte)(object)x); #endif } @@ -2846,19 +3054,36 @@ static T Short(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(short)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(short)(object)x)).ToScalar(); + return (T) + (object) + (short) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe( + (float)(short)(object)x + ) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(short)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(short)(object)x)).ToScalar(); + return (T) + (object) + (short) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(short)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (short) (float) Math.Sqrt((float) (short) (object) x); + return (T)(object)(short)(float)Math.Sqrt((float)(short)(object)x); #else - return (T) (object) (short)(float)MathF.Sqrt((float) (short)(object) x); + return (T)(object)(short)(float)MathF.Sqrt((float)(short)(object)x); #endif } @@ -2873,19 +3098,38 @@ static T UShort(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(ushort)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(ushort)(object)x)).ToScalar(); + return (T) + (object) + (ushort) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe( + (float)(ushort)(object)x + ) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(ushort)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(ushort)(object)x)).ToScalar(); + return (T) + (object) + (ushort) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe( + (float)(ushort)(object)x + ) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (ushort) (float) Math.Sqrt((float) (ushort) (object) x); + return (T)(object)(ushort)(float)Math.Sqrt((float)(ushort)(object)x); #else - return (T) (object) (ushort)(float)MathF.Sqrt((float) (ushort)(object) x); + return (T)(object)(ushort)(float)MathF.Sqrt((float)(ushort)(object)x); #endif } @@ -2900,19 +3144,34 @@ static T Int(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(int)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(int)(object)x)).ToScalar(); + return (T) + (object) + (int) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe((float)(int)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(int)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(int)(object)x)).ToScalar(); + return (T) + (object) + (int) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(int)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (int) (float) Math.Sqrt((float) (int) (object) x); + return (T)(object)(int)(float)Math.Sqrt((float)(int)(object)x); #else - return (T) (object) (int)(float)MathF.Sqrt((float) (int)(object) x); + return (T)(object)(int)(float)MathF.Sqrt((float)(int)(object)x); #endif } @@ -2927,19 +3186,34 @@ static T UInt(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(uint)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(uint)(object)x)).ToScalar(); + return (T) + (object) + (uint) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe((float)(uint)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(uint)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(uint)(object)x)).ToScalar(); + return (T) + (object) + (uint) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(uint)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (uint) (float) Math.Sqrt((float) (uint) (object) x); + return (T)(object)(uint)(float)Math.Sqrt((float)(uint)(object)x); #else - return (T) (object) (uint)(float)MathF.Sqrt((float) (uint)(object) x); + return (T)(object)(uint)(float)MathF.Sqrt((float)(uint)(object)x); #endif } @@ -2954,19 +3228,34 @@ static T Long(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(long)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(long)(object)x)).ToScalar(); + return (T) + (object) + (long) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe((float)(long)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(long)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(long)(object)x)).ToScalar(); + return (T) + (object) + (long) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(long)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (long) (float) Math.Sqrt((float) (long) (object) x); + return (T)(object)(long)(float)Math.Sqrt((float)(long)(object)x); #else - return (T) (object) (long)(float)MathF.Sqrt((float) (long)(object) x); + return (T)(object)(long)(float)MathF.Sqrt((float)(long)(object)x); #endif } @@ -2979,7 +3268,7 @@ static T Complex(T x) // TODO: vectorized implementation? if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Sqrt((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Sqrt((Complex)(object)x); } return ULong(x); @@ -2993,19 +3282,36 @@ static T ULong(T x) #if SSE if (Sse.IsSupported) { - return (T)(object)(ulong)(float)Sse.SqrtScalar(Vector128.CreateScalarUnsafe((float)(ulong)(object)x)).ToScalar(); + return (T) + (object) + (ulong) + (float) + Sse.SqrtScalar( + Vector128.CreateScalarUnsafe( + (float)(ulong)(object)x + ) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(ulong)(float)AdvSimd.SqrtScalar(Vector64.CreateScalarUnsafe((float)(ulong)(object)x)).ToScalar(); + return (T) + (object) + (ulong) + (float) + AdvSimd + .SqrtScalar( + Vector64.CreateScalarUnsafe((float)(ulong)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (ulong) (float) Math.Sqrt((float) (ulong) (object) x); + return (T)(object)(ulong)(float)Math.Sqrt((float)(ulong)(object)x); #else - return (T) (object) (ulong)(float)MathF.Sqrt((float) (ulong)(object) x); + return (T)(object)(ulong)(float)MathF.Sqrt((float)(ulong)(object)x); #endif } @@ -3021,14 +3327,15 @@ static T ULong(T x) /// The type of . /// The tangent of . If is equal to , , or , this method returns . [MethodImpl(MaxOpt)] - public static T Tan(T x) where T : notnull + public static T Tan(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Tan((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Tan((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Tan((float) (Half) (object) x); + return (T)(object)(Half)MathF.Tan((float)(Half)(object)x); #endif } @@ -3040,9 +3347,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Tan((float) (object) x); + return (T)(object)(float)Math.Tan((float)(object)x); #else - return (T) (object) MathF.Tan((float) (object) x); + return (T)(object)MathF.Tan((float)(object)x); #endif } @@ -3054,7 +3361,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Tan((double) (object) x); + return (T)(object)(double)Math.Tan((double)(object)x); } return Decimal(x); @@ -3077,7 +3384,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Tan((sbyte) (object) x); + return (T)(object)(sbyte)Math.Tan((sbyte)(object)x); } return Byte(x); @@ -3088,7 +3395,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Tan((byte) (object) x); + return (T)(object)(byte)Math.Tan((byte)(object)x); } return Short(x); @@ -3099,7 +3406,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Tan((short) (object) x); + return (T)(object)(short)Math.Tan((short)(object)x); } return UShort(x); @@ -3110,7 +3417,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Tan((ushort) (object) x); + return (T)(object)(ushort)Math.Tan((ushort)(object)x); } return Int(x); @@ -3121,7 +3428,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Tan((int) (object) x); + return (T)(object)(int)Math.Tan((int)(object)x); } return UInt(x); @@ -3132,7 +3439,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Tan((uint) (object) x); + return (T)(object)(uint)Math.Tan((uint)(object)x); } return Long(x); @@ -3143,7 +3450,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Tan((long) (object) x); + return (T)(object)(long)Math.Tan((long)(object)x); } return Complex(x); @@ -3154,7 +3461,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Tan((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Tan((Complex)(object)x); } return ULong(x); @@ -3165,7 +3472,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Tan((ulong) (object) x); + return (T)(object)(ulong)Math.Tan((ulong)(object)x); } ThrowUnsupportedType(); @@ -3180,14 +3487,15 @@ static T ULong(T x) /// The type of . /// The hyperbolic tangent of . If is equal to , this method returns -1. If is equal to , this method returns 1. If is equal to , this method returns . [MethodImpl(MaxOpt)] - public static T Tanh(T x) where T : notnull + public static T Tanh(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Tanh((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Tanh((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Tanh((float) (Half) (object) x); + return (T)(object)(Half)MathF.Tanh((float)(Half)(object)x); #endif } @@ -3199,9 +3507,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Tanh((float) (object) x); + return (T)(object)(float)Math.Tanh((float)(object)x); #else - return (T) (object) MathF.Tanh((float) (object) x); + return (T)(object)MathF.Tanh((float)(object)x); #endif } @@ -3213,7 +3521,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Tanh((double) (object) x); + return (T)(object)(double)Math.Tanh((double)(object)x); } return Decimal(x); @@ -3236,7 +3544,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Tanh((sbyte) (object) x); + return (T)(object)(sbyte)Math.Tanh((sbyte)(object)x); } return Byte(x); @@ -3247,7 +3555,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Tanh((byte) (object) x); + return (T)(object)(byte)Math.Tanh((byte)(object)x); } return Short(x); @@ -3258,7 +3566,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Tanh((short) (object) x); + return (T)(object)(short)Math.Tanh((short)(object)x); } return UShort(x); @@ -3269,7 +3577,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Tanh((ushort) (object) x); + return (T)(object)(ushort)Math.Tanh((ushort)(object)x); } return Int(x); @@ -3280,7 +3588,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Tanh((int) (object) x); + return (T)(object)(int)Math.Tanh((int)(object)x); } return UInt(x); @@ -3291,7 +3599,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Tanh((uint) (object) x); + return (T)(object)(uint)Math.Tanh((uint)(object)x); } return Long(x); @@ -3302,7 +3610,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Tanh((long) (object) x); + return (T)(object)(long)Math.Tanh((long)(object)x); } return Complex(x); @@ -3313,7 +3621,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Tanh((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Tanh((Complex)(object)x); } return ULong(x); @@ -3324,7 +3632,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Tanh((ulong) (object) x); + return (T)(object)(ulong)Math.Tanh((ulong)(object)x); } ThrowUnsupportedType(); @@ -3359,14 +3667,15 @@ static T ULong(T x) /// /// [MethodImpl(MaxOpt)] - public static T Truncate(T x) where T : notnull + public static T Truncate(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Truncate((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Truncate((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Truncate((float) (Half) (object) x); + return (T)(object)(Half)MathF.Truncate((float)(Half)(object)x); #endif } @@ -3378,9 +3687,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Truncate((float) (object) x); + return (T)(object)(float)Math.Truncate((float)(object)x); #else - return (T) (object) MathF.Truncate((float) (object) x); + return (T)(object)MathF.Truncate((float)(object)x); #endif } @@ -3392,7 +3701,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Truncate((double) (object) x); + return (T)(object)(double)Math.Truncate((double)(object)x); } return Decimal(x); @@ -3403,7 +3712,7 @@ static T Decimal(T x) { if (typeof(T) == typeof(decimal)) { - return (T) (object) (decimal) Math.Truncate((decimal) (object) x); + return (T)(object)(decimal)Math.Truncate((decimal)(object)x); } return SByte(x); @@ -3534,11 +3843,12 @@ static T ULong(T x) /// /// [MethodImpl(MaxOpt)] - public static T Log(T x) where T : notnull + public static T Log(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) CoreFastLog((float) (Half) (object) x); + return (T)(object)(Half)MathF.Log((float)(Half)(object)x); } return Float(x); @@ -3548,7 +3858,7 @@ static T Float(T x) { if (typeof(T) == typeof(float)) { - return (T) (object) CoreFastLog((float) (object) x); + return (T)(object)MathF.Log((float)(object)x); } return Double(x); @@ -3559,7 +3869,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Log((double) (object) x); + return (T)(object)(double)Math.Log((double)(object)x); } return Decimal(x); @@ -3582,7 +3892,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Log((sbyte) (object) x); + return (T)(object)(sbyte)Math.Log((sbyte)(object)x); } return Byte(x); @@ -3593,7 +3903,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Log((byte) (object) x); + return (T)(object)(byte)Math.Log((byte)(object)x); } return Short(x); @@ -3604,7 +3914,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Log((short) (object) x); + return (T)(object)(short)Math.Log((short)(object)x); } return UShort(x); @@ -3615,7 +3925,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Log((ushort) (object) x); + return (T)(object)(ushort)Math.Log((ushort)(object)x); } return Int(x); @@ -3626,7 +3936,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Log((int) (object) x); + return (T)(object)(int)Math.Log((int)(object)x); } return UInt(x); @@ -3637,7 +3947,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Log((uint) (object) x); + return (T)(object)(uint)Math.Log((uint)(object)x); } return Long(x); @@ -3648,7 +3958,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Log((long) (object) x); + return (T)(object)(long)Math.Log((long)(object)x); } return Complex(x); @@ -3659,7 +3969,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Log((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Log((Complex)(object)x); } return ULong(x); @@ -3670,7 +3980,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Log((ulong) (object) x); + return (T)(object)(ulong)Math.Log((ulong)(object)x); } ThrowUnsupportedType(); @@ -3713,14 +4023,15 @@ static T ULong(T x) /// /// [MethodImpl(MaxOpt)] - public static T Log10(T x) where T : notnull + public static T Log10(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Log10((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Log10((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Log10((float) (Half) (object) x); + return (T)(object)(Half)MathF.Log10((float)(Half)(object)x); #endif } @@ -3732,9 +4043,9 @@ static T Float(T x) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Log10((float) (object) x); + return (T)(object)(float)Math.Log10((float)(object)x); #else - return (T) (object) MathF.Log10((float) (object) x); + return (T)(object)MathF.Log10((float)(object)x); #endif } @@ -3746,7 +4057,7 @@ static T Double(T x) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Log10((double) (object) x); + return (T)(object)(double)Math.Log10((double)(object)x); } return Decimal(x); @@ -3769,7 +4080,7 @@ static T SByte(T x) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Log10((sbyte) (object) x); + return (T)(object)(sbyte)Math.Log10((sbyte)(object)x); } return Byte(x); @@ -3780,7 +4091,7 @@ static T Byte(T x) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Log10((byte) (object) x); + return (T)(object)(byte)Math.Log10((byte)(object)x); } return Short(x); @@ -3791,7 +4102,7 @@ static T Short(T x) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Log10((short) (object) x); + return (T)(object)(short)Math.Log10((short)(object)x); } return UShort(x); @@ -3802,7 +4113,7 @@ static T UShort(T x) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Log10((ushort) (object) x); + return (T)(object)(ushort)Math.Log10((ushort)(object)x); } return Int(x); @@ -3813,7 +4124,7 @@ static T Int(T x) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Log10((int) (object) x); + return (T)(object)(int)Math.Log10((int)(object)x); } return UInt(x); @@ -3824,7 +4135,7 @@ static T UInt(T x) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Log10((uint) (object) x); + return (T)(object)(uint)Math.Log10((uint)(object)x); } return Long(x); @@ -3835,7 +4146,7 @@ static T Long(T x) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Log10((long) (object) x); + return (T)(object)(long)Math.Log10((long)(object)x); } return Complex(x); @@ -3846,7 +4157,7 @@ static T Complex(T x) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Log10((Complex) (object) x); + return (T)(object)(Complex)System.Numerics.Complex.Log10((Complex)(object)x); } return ULong(x); @@ -3857,7 +4168,7 @@ static T ULong(T x) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Log10((ulong) (object) x); + return (T)(object)(ulong)Math.Log10((ulong)(object)x); } ThrowUnsupportedType(); @@ -3877,14 +4188,15 @@ static T ULong(T x) /// This method uses the default rounding convention of . /// [MethodImpl(MaxOpt)] - public static T Round(T x) where T : notnull + public static T Round(T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Round((float) (Half) (object) x); + return (T)(object)(Half)(float)Math.Round((float)(Half)(object)x); #else - return (T) (object) (Half) MathF.Round((float) (Half) (object) x); + return (T)(object)(Half)MathF.Round((float)(Half)(object)x); #endif } @@ -3898,19 +4210,33 @@ static T Float(T x) #if SSE if (Sse42.IsSupported) { - return (T)(object)(float)Sse41.RoundToNearestIntegerScalar(Vector128.CreateScalarUnsafe((float)(object)x)).ToScalar(); + return (T) + (object) + (float) + Sse41 + .RoundToNearestIntegerScalar( + Vector128.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(float)AdvSimd.RoundToNearestScalar(Vector64.CreateScalar((float)(object)x)).ToScalar(); + return (T) + (object) + (float) + AdvSimd + .RoundToNearestScalar( + Vector64.CreateScalar((float)(object)x) + ) + .ToScalar(); } -#endif +#endif #if !MATHF - return (T) (object) (float) Math.Round((float) (object) x); + return (T)(object)(float)Math.Round((float)(object)x); #else - return (T) (object) MathF.Round((float) (object) x); + return (T)(object)MathF.Round((float)(object)x); #endif } @@ -3925,16 +4251,30 @@ static T Double(T x) #if SSE if (Sse42.IsSupported) { - return (T)(object)(double)Sse41.RoundToNearestIntegerScalar(Vector128.CreateScalarUnsafe((double)(object)x)).ToScalar(); + return (T) + (object) + (double) + Sse41 + .RoundToNearestIntegerScalar( + Vector128.CreateScalarUnsafe((double)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { - return (T)(object)(double)AdvSimd.RoundToNearestScalar(Vector64.CreateScalar((double)(object)x)).ToScalar(); + return (T) + (object) + (double) + AdvSimd + .RoundToNearestScalar( + Vector64.CreateScalar((double)(object)x) + ) + .ToScalar(); } -#endif - return (T) (object) (double) Math.Round((double) (object) x); +#endif + return (T)(object)(double)Math.Round((double)(object)x); } return Decimal(x); @@ -3945,7 +4285,7 @@ static T Decimal(T x) { if (typeof(T) == typeof(decimal)) { - return (T) (object) (decimal) Math.Round((decimal) (object) x); + return (T)(object)(decimal)Math.Round((decimal)(object)x); } return SByte(x); @@ -4049,21 +4389,27 @@ static T ULong(T x) /// The type of and . /// /// A number equal to - ( Q), where Q is the quotient of / rounded to the nearest integer (if / falls halfway between two integers, the even integer is returned). - /// + /// /// If - ( Q) is zero, the value +0 is returned if is positive, or -0 if is negative. - /// + /// /// If = 0, NaN is returned. /// [MethodImpl(MaxOpt)] - public static T IEEERemainder(T x, T y) where T : notnull + public static T IEEERemainder(T x, T y) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.IEEERemainder - ((float) (Half) (object) x, (float) (Half) (object) y); + return (T) + (object) + (Half) + (float) + Math.IEEERemainder((float)(Half)(object)x, (float)(Half)(object)y); #else - return (T) (object) (Half) MathF.IEEERemainder((float) (Half) (object) x, (float) (Half) (object) y); + return (T) + (object) + (Half)MathF.IEEERemainder((float)(Half)(object)x, (float)(Half)(object)y); #endif } @@ -4075,9 +4421,9 @@ static T Float(T x, T y) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.IEEERemainder((float) (object) x, (float) (object) y); + return (T)(object)(float)Math.IEEERemainder((float)(object)x, (float)(object)y); #else - return (T) (object) MathF.IEEERemainder((float) (object) x, (float) (object) y); + return (T)(object)MathF.IEEERemainder((float)(object)x, (float)(object)y); #endif } @@ -4089,7 +4435,7 @@ static T Double(T x, T y) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.IEEERemainder((double) (object) x, (double) (object) y); + return (T)(object)Math.IEEERemainder((double)(object)x, (double)(object)y); } return Decimal(x, y); @@ -4112,7 +4458,7 @@ static T SByte(T x, T y) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.IEEERemainder((sbyte) (object) x, (sbyte) (object) y); + return (T)(object)(sbyte)Math.IEEERemainder((sbyte)(object)x, (sbyte)(object)y); } return Byte(x, y); @@ -4123,7 +4469,7 @@ static T Byte(T x, T y) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.IEEERemainder((byte) (object) x, (byte) (object) y); + return (T)(object)(byte)Math.IEEERemainder((byte)(object)x, (byte)(object)y); } return Short(x, y); @@ -4134,7 +4480,7 @@ static T Short(T x, T y) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.IEEERemainder((short) (object) x, (short) (object) y); + return (T)(object)(short)Math.IEEERemainder((short)(object)x, (short)(object)y); } return UShort(x, y); @@ -4145,7 +4491,8 @@ static T UShort(T x, T y) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.IEEERemainder((ushort) (object) x, (ushort) (object) y); + return (T) + (object)(ushort)Math.IEEERemainder((ushort)(object)x, (ushort)(object)y); } return Int(x, y); @@ -4156,7 +4503,7 @@ static T Int(T x, T y) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.IEEERemainder((int) (object) x, (int) (object) y); + return (T)(object)(int)Math.IEEERemainder((int)(object)x, (int)(object)y); } return UInt(x, y); @@ -4167,7 +4514,7 @@ static T UInt(T x, T y) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.IEEERemainder((uint) (object) x, (uint) (object) y); + return (T)(object)(uint)Math.IEEERemainder((uint)(object)x, (uint)(object)y); } return Long(x, y); @@ -4178,7 +4525,7 @@ static T Long(T x, T y) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.IEEERemainder((long) (object) x, (long) (object) y); + return (T)(object)(long)Math.IEEERemainder((long)(object)x, (long)(object)y); } return ULong(x, y); @@ -4189,7 +4536,7 @@ static T ULong(T x, T y) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.IEEERemainder((ulong) (object) x, (ulong) (object) y); + return (T)(object)(ulong)Math.IEEERemainder((ulong)(object)x, (ulong)(object)y); } ThrowUnsupportedType(); @@ -4284,14 +4631,16 @@ static T ULong(T x, T y) /// /// [MethodImpl(MaxOpt)] - public static T Log(T x, T y) where T : notnull + public static T Log(T x, T y) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Log((float) (Half) (object) x, (float) (Half) (object) y); + return (T) + (object)(Half)(float)Math.Log((float)(Half)(object)x, (float)(Half)(object)y); #else - return (T) (object) (Half) MathF.Log((float) (Half) (object) x, (float) (Half) (object) y); + return (T)(object)(Half)MathF.Log((float)(Half)(object)x, (float)(Half)(object)y); #endif } @@ -4303,9 +4652,9 @@ static T Float(T x, T y) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Log((float) (object) x, (float) (object) y); + return (T)(object)(float)Math.Log((float)(object)x, (float)(object)y); #else - return (T) (object) MathF.Log((float) (object) x, (float) (object) y); + return (T)(object)MathF.Log((float)(object)x, (float)(object)y); #endif } @@ -4317,7 +4666,7 @@ static T Double(T x, T y) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Log((double) (object) x, (double) (object) y); + return (T)(object)Math.Log((double)(object)x, (double)(object)y); } return Decimal(x, y); @@ -4340,7 +4689,7 @@ static T SByte(T x, T y) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Log((sbyte) (object) x, (sbyte) (object) y); + return (T)(object)(sbyte)Math.Log((sbyte)(object)x, (sbyte)(object)y); } return Byte(x, y); @@ -4351,7 +4700,7 @@ static T Byte(T x, T y) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Log((byte) (object) x, (byte) (object) y); + return (T)(object)(byte)Math.Log((byte)(object)x, (byte)(object)y); } return Short(x, y); @@ -4362,7 +4711,7 @@ static T Short(T x, T y) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Log((short) (object) x, (short) (object) y); + return (T)(object)(short)Math.Log((short)(object)x, (short)(object)y); } return UShort(x, y); @@ -4373,7 +4722,7 @@ static T UShort(T x, T y) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Log((ushort) (object) x, (ushort) (object) y); + return (T)(object)(ushort)Math.Log((ushort)(object)x, (ushort)(object)y); } return Int(x, y); @@ -4384,7 +4733,7 @@ static T Int(T x, T y) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Log((int) (object) x, (int) (object) y); + return (T)(object)(int)Math.Log((int)(object)x, (int)(object)y); } return UInt(x, y); @@ -4395,7 +4744,7 @@ static T UInt(T x, T y) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Log((uint) (object) x, (uint) (object) y); + return (T)(object)(uint)Math.Log((uint)(object)x, (uint)(object)y); } return Long(x, y); @@ -4406,7 +4755,7 @@ static T Long(T x, T y) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Log((long) (object) x, (long) (object) y); + return (T)(object)(long)Math.Log((long)(object)x, (long)(object)y); } return Complex(x, y); @@ -4418,11 +4767,18 @@ static T Complex(T x, T y) if (typeof(T) == typeof(Complex)) { // Complex.Log is not defined on two complex numbers - var baseValue = (Complex) (object) y; + var baseValue = (Complex)(object)y; if (baseValue.Imaginary is 0) - return (T) (object) (Complex) System.Numerics.Complex.Log((Complex) (object) x, baseValue.Real); + return (T) + (object) + (Complex) + System.Numerics.Complex.Log((Complex)(object)x, baseValue.Real); // log(x, y) = log(x) / log(y) - return (T) (object) (System.Numerics.Complex.Log((Complex) (object) x) / System.Numerics.Complex.Log(baseValue)); + return (T) + (object)( + System.Numerics.Complex.Log((Complex)(object)x) + / System.Numerics.Complex.Log(baseValue) + ); } return ULong(x, y); @@ -4433,7 +4789,7 @@ static T ULong(T x, T y) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Log((ulong) (object) x, (ulong) (object) y); + return (T)(object)(ulong)Math.Log((ulong)(object)x, (ulong)(object)y); } ThrowUnsupportedType(); @@ -4449,14 +4805,16 @@ static T ULong(T x, T y) /// The type of and . /// Parameter or , whichever is larger. If , or , or both and are equal to , is returned. [MethodImpl(MaxOpt)] - public static T Max(T x, T y) where T : notnull + public static T Max(T x, T y) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Max((float) (Half) (object) x, (float) (Half) (object) y); + return (T) + (object)(Half)(float)Math.Max((float)(Half)(object)x, (float)(Half)(object)y); #else - return (T) (object) (Half) MathF.Max((float) (Half) (object) x, (float) (Half) (object) y); + return (T)(object)(Half)MathF.Max((float)(Half)(object)x, (float)(Half)(object)y); #endif } @@ -4468,9 +4826,9 @@ static T Float(T x, T y) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Max((float) (object) x, (float) (object) y); + return (T)(object)(float)Math.Max((float)(object)x, (float)(object)y); #else - return (T) (object) MathF.Max((float) (object) x, (float) (object) y); + return (T)(object)MathF.Max((float)(object)x, (float)(object)y); #endif } @@ -4482,7 +4840,7 @@ static T Double(T x, T y) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Max((double) (object) x, (double) (object) y); + return (T)(object)Math.Max((double)(object)x, (double)(object)y); } return Decimal(x, y); @@ -4493,7 +4851,7 @@ static T Decimal(T x, T y) { if (typeof(T) == typeof(decimal)) { - return (T) (object) (decimal) Math.Max((decimal) (object) x, (decimal) (object) y); + return (T)(object)(decimal)Math.Max((decimal)(object)x, (decimal)(object)y); } return SByte(x, y); @@ -4504,7 +4862,7 @@ static T SByte(T x, T y) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Max((sbyte) (object) x, (sbyte) (object) y); + return (T)(object)(sbyte)Math.Max((sbyte)(object)x, (sbyte)(object)y); } return Byte(x, y); @@ -4515,7 +4873,7 @@ static T Byte(T x, T y) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Max((byte) (object) x, (byte) (object) y); + return (T)(object)(byte)Math.Max((byte)(object)x, (byte)(object)y); } return Short(x, y); @@ -4526,7 +4884,7 @@ static T Short(T x, T y) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Max((short) (object) x, (short) (object) y); + return (T)(object)(short)Math.Max((short)(object)x, (short)(object)y); } return UShort(x, y); @@ -4537,7 +4895,7 @@ static T UShort(T x, T y) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Max((ushort) (object) x, (ushort) (object) y); + return (T)(object)(ushort)Math.Max((ushort)(object)x, (ushort)(object)y); } return Int(x, y); @@ -4548,7 +4906,7 @@ static T Int(T x, T y) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Max((int) (object) x, (int) (object) y); + return (T)(object)(int)Math.Max((int)(object)x, (int)(object)y); } return UInt(x, y); @@ -4559,7 +4917,7 @@ static T UInt(T x, T y) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Max((uint) (object) x, (uint) (object) y); + return (T)(object)(uint)Math.Max((uint)(object)x, (uint)(object)y); } return Long(x, y); @@ -4570,7 +4928,7 @@ static T Long(T x, T y) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Max((long) (object) x, (long) (object) y); + return (T)(object)(long)Math.Max((long)(object)x, (long)(object)y); } return ULong(x, y); @@ -4581,7 +4939,7 @@ static T ULong(T x, T y) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Max((ulong) (object) x, (ulong) (object) y); + return (T)(object)(ulong)Math.Max((ulong)(object)x, (ulong)(object)y); } ThrowUnsupportedType(); @@ -4597,14 +4955,16 @@ static T ULong(T x, T y) /// The type of and . /// Parameter or , whichever is smaller. If , or , or both and are equal to , is returned. [MethodImpl(MaxOpt)] - public static T Min(T x, T y) where T : notnull + public static T Min(T x, T y) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Min((float) (Half) (object) x, (float) (Half) (object) y); + return (T) + (object)(Half)(float)Math.Min((float)(Half)(object)x, (float)(Half)(object)y); #else - return (T) (object) (Half) MathF.Min((float) (Half) (object) x, (float) (Half) (object) y); + return (T)(object)(Half)MathF.Min((float)(Half)(object)x, (float)(Half)(object)y); #endif } @@ -4616,9 +4976,9 @@ static T Float(T x, T y) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Min((float) (object) x, (float) (object) y); + return (T)(object)(float)Math.Min((float)(object)x, (float)(object)y); #else - return (T) (object) MathF.Min((float) (object) x, (float) (object) y); + return (T)(object)MathF.Min((float)(object)x, (float)(object)y); #endif } @@ -4630,7 +4990,7 @@ static T Double(T x, T y) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Min((double) (object) x, (double) (object) y); + return (T)(object)Math.Min((double)(object)x, (double)(object)y); } return Decimal(x, y); @@ -4641,7 +5001,7 @@ static T Decimal(T x, T y) { if (typeof(T) == typeof(decimal)) { - return (T) (object) (decimal) Math.Min((decimal) (object) x, (decimal) (object) y); + return (T)(object)(decimal)Math.Min((decimal)(object)x, (decimal)(object)y); } return SByte(x, y); @@ -4652,7 +5012,7 @@ static T SByte(T x, T y) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Min((sbyte) (object) x, (sbyte) (object) y); + return (T)(object)(sbyte)Math.Min((sbyte)(object)x, (sbyte)(object)y); } return Byte(x, y); @@ -4663,7 +5023,7 @@ static T Byte(T x, T y) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Min((byte) (object) x, (byte) (object) y); + return (T)(object)(byte)Math.Min((byte)(object)x, (byte)(object)y); } return Short(x, y); @@ -4674,7 +5034,7 @@ static T Short(T x, T y) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Min((short) (object) x, (short) (object) y); + return (T)(object)(short)Math.Min((short)(object)x, (short)(object)y); } return UShort(x, y); @@ -4685,7 +5045,7 @@ static T UShort(T x, T y) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Min((ushort) (object) x, (ushort) (object) y); + return (T)(object)(ushort)Math.Min((ushort)(object)x, (ushort)(object)y); } return Int(x, y); @@ -4696,7 +5056,7 @@ static T Int(T x, T y) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Min((int) (object) x, (int) (object) y); + return (T)(object)(int)Math.Min((int)(object)x, (int)(object)y); } return UInt(x, y); @@ -4707,7 +5067,7 @@ static T UInt(T x, T y) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Min((uint) (object) x, (uint) (object) y); + return (T)(object)(uint)Math.Min((uint)(object)x, (uint)(object)y); } return Long(x, y); @@ -4718,7 +5078,7 @@ static T Long(T x, T y) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Min((long) (object) x, (long) (object) y); + return (T)(object)(long)Math.Min((long)(object)x, (long)(object)y); } return ULong(x, y); @@ -4729,7 +5089,7 @@ static T ULong(T x, T y) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Min((ulong) (object) x, (ulong) (object) y); + return (T)(object)(ulong)Math.Min((ulong)(object)x, (ulong)(object)y); } ThrowUnsupportedType(); @@ -4745,38 +5105,39 @@ static T ULong(T x, T y) /// The type of and . /// The number raised to the power . /// - /// , , and . - /// - /// |Parameters|Return value| - /// |----------------|------------------| - /// |`x` or `y` = `NaN`.|`NaN`| - /// |`x` = Any value except `NaN`; `y` = 0.|1| - /// |`x` = `NegativeInfinity`; `y` < 0.|0| - /// |`x` = `NegativeInfinity`; `y` is a positive odd integer.|`NegativeInfinity`| - /// |`x` = `NegativeInfinity`; `y` is positive but not an odd integer.|`PositiveInfinity`| - /// |`x` < 0 but not `NegativeInfinity`; `y` is not an integer, `NegativeInfinity`, or `PositiveInfinity`.|`NaN`| - /// |`x` = -1; `y` = `NegativeInfinity` or `PositiveInfinity`.|`NaN`| - /// |-1 < `x` < 1; `y` = `NegativeInfinity`.|`PositiveInfinity`| - /// |-1 < `x` < 1; `y` = `PositiveInfinity`.|0| - /// |`x` < -1 or `x` > 1; `y` = `NegativeInfinity`.|0| - /// |`x` < -1 or `x` > 1; `y` = `PositiveInfinity`.|`PositiveInfinity`| - /// |`x` = 0; `y` < 0.|`PositiveInfinity`| - /// |`x` = 0; `y` > 0.|0| - /// |`x` = 1; `y` is any value except `NaN`.|1| - /// |`x` = `PositiveInfinity`; `y` < 0.|0| - /// |`x` = `PositiveInfinity`; `y` > 0.|`PositiveInfinity`| - /// + /// , , and . + /// + /// |Parameters|Return value| + /// |----------------|------------------| + /// |`x` or `y` = `NaN`.|`NaN`| + /// |`x` = Any value except `NaN`; `y` = 0.|1| + /// |`x` = `NegativeInfinity`; `y` < 0.|0| + /// |`x` = `NegativeInfinity`; `y` is a positive odd integer.|`NegativeInfinity`| + /// |`x` = `NegativeInfinity`; `y` is positive but not an odd integer.|`PositiveInfinity`| + /// |`x` < 0 but not `NegativeInfinity`; `y` is not an integer, `NegativeInfinity`, or `PositiveInfinity`.|`NaN`| + /// |`x` = -1; `y` = `NegativeInfinity` or `PositiveInfinity`.|`NaN`| + /// |-1 < `x` < 1; `y` = `NegativeInfinity`.|`PositiveInfinity`| + /// |-1 < `x` < 1; `y` = `PositiveInfinity`.|0| + /// |`x` < -1 or `x` > 1; `y` = `NegativeInfinity`.|0| + /// |`x` < -1 or `x` > 1; `y` = `PositiveInfinity`.|`PositiveInfinity`| + /// |`x` = 0; `y` < 0.|`PositiveInfinity`| + /// |`x` = 0; `y` > 0.|0| + /// |`x` = 1; `y` is any value except `NaN`.|1| + /// |`x` = `PositiveInfinity`; `y` < 0.|0| + /// |`x` = `PositiveInfinity`; `y` > 0.|`PositiveInfinity`| + /// /// ]]> /// [MethodImpl(MaxOpt)] - public static T Pow(T x, T y) where T : notnull + public static T Pow(T x, T y) + where T : notnull { if (typeof(T) == typeof(Half)) { - return (T) (object) (Half) CoreFastPow((float) (Half) (object) x, (float) (Half) (object) y); + return (T)(object)(Half)CoreFastPow((float)(Half)(object)x, (float)(Half)(object)y); } return Float(x, y); @@ -4786,7 +5147,7 @@ static T Float(T x, T y) { if (typeof(T) == typeof(float)) { - return (T) (object) CoreFastPow((float) (object) x, (float) (object) y); + return (T)(object)CoreFastPow((float)(object)x, (float)(object)y); } return Double(x, y); @@ -4797,7 +5158,7 @@ static T Double(T x, T y) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Pow((double) (object) x, (double) (object) y); + return (T)(object)Math.Pow((double)(object)x, (double)(object)y); } return Decimal(x, y); @@ -4820,8 +5181,8 @@ static T SByte(T x, T y) { if (typeof(T) == typeof(sbyte)) { - var py = (sbyte) (object) y; - var px = (sbyte) (object) x; + var py = (sbyte)(object)y; + var px = (sbyte)(object)x; if (py != 0) { var oabsy = Abs(py); @@ -4838,13 +5199,15 @@ static T SByte(T x, T y) } if (oabsy == py) - return (T) (object) result; - return (T) (object) (sbyte) Scalar.Reciprocal(result); + return (T)(object)result; + return (T)(object)(sbyte)Scalar.Reciprocal(result); } else { - if (px != 0) return (T) (object) (sbyte) 1; - else return (T) (object) (sbyte) 0; + if (px != 0) + return (T)(object)(sbyte)1; + else + return (T)(object)(sbyte)0; } } @@ -4856,8 +5219,8 @@ static T Byte(T x, T y) { if (typeof(T) == typeof(byte)) { - var py = (byte) (object) y; - var px = (byte) (object) x; + var py = (byte)(object)y; + var px = (byte)(object)x; if (py != 0) { var oabsy = py; @@ -4873,12 +5236,14 @@ static T Byte(T x, T y) px *= px; } - return (T) (object) result; + return (T)(object)result; } else { - if (px != 0) return (T) (object) (byte) 1; - else return (T) (object) (byte) 0; + if (px != 0) + return (T)(object)(byte)1; + else + return (T)(object)(byte)0; } } @@ -4890,8 +5255,8 @@ static T Short(T x, T y) { if (typeof(T) == typeof(short)) { - var py = (short) (object) y; - var px = (short) (object) x; + var py = (short)(object)y; + var px = (short)(object)x; if (py != 0) { var oabsy = Abs(py); @@ -4908,13 +5273,15 @@ static T Short(T x, T y) } if (oabsy == py) - return (T) (object) result; - return (T) (object) (short) Scalar.Reciprocal(result); + return (T)(object)result; + return (T)(object)(short)Scalar.Reciprocal(result); } else { - if (px != 0) return (T) (object) (short) 1; - else return (T) (object) (short) 0; + if (px != 0) + return (T)(object)(short)1; + else + return (T)(object)(short)0; } } @@ -4926,8 +5293,8 @@ static T UShort(T x, T y) { if (typeof(T) == typeof(ushort)) { - var py = (ushort) (object) y; - var px = (ushort) (object) x; + var py = (ushort)(object)y; + var px = (ushort)(object)x; if (py != 0) { var oabsy = py; @@ -4943,12 +5310,14 @@ static T UShort(T x, T y) px *= px; } - return (T) (object) result; + return (T)(object)result; } else { - if (px != 0) return (T) (object) (ushort) 1; - else return (T) (object) (ushort) 0; + if (px != 0) + return (T)(object)(ushort)1; + else + return (T)(object)(ushort)0; } } @@ -4960,8 +5329,8 @@ static T Int(T x, T y) { if (typeof(T) == typeof(int)) { - var py = (int) (object) y; - var px = (int) (object) x; + var py = (int)(object)y; + var px = (int)(object)x; if (py != 0) { var oabsy = Abs(py); @@ -4978,13 +5347,15 @@ static T Int(T x, T y) } if (oabsy == py) - return (T) (object) result; - return (T) (object) (int) Scalar.Reciprocal(result); + return (T)(object)result; + return (T)(object)(int)Scalar.Reciprocal(result); } else { - if (px != 0) return (T) (object) (int) 1; - else return (T) (object) (int) 0; + if (px != 0) + return (T)(object)(int)1; + else + return (T)(object)(int)0; } } @@ -4996,8 +5367,8 @@ static T UInt(T x, T y) { if (typeof(T) == typeof(uint)) { - var py = (uint) (object) y; - var px = (uint) (object) x; + var py = (uint)(object)y; + var px = (uint)(object)x; if (py != 0) { var oabsy = py; @@ -5013,12 +5384,14 @@ static T UInt(T x, T y) px *= px; } - return (T) (object) result; + return (T)(object)result; } else { - if (px != 0) return (T) (object) (uint) 1; - else return (T) (object) (uint) 0; + if (px != 0) + return (T)(object)(uint)1; + else + return (T)(object)(uint)0; } } @@ -5030,8 +5403,8 @@ static T Long(T x, T y) { if (typeof(T) == typeof(long)) { - var py = (long) (object) y; - var px = (long) (object) x; + var py = (long)(object)y; + var px = (long)(object)x; if (py != 0) { var oabsy = Abs(py); @@ -5048,13 +5421,15 @@ static T Long(T x, T y) } if (oabsy == py) - return (T) (object) result; - return (T) (object) (long) Scalar.Reciprocal(result); + return (T)(object)result; + return (T)(object)(long)Scalar.Reciprocal(result); } else { - if (px != 0) return (T) (object) (long) 1; - else return (T) (object) (long) 0; + if (px != 0) + return (T)(object)(long)1; + else + return (T)(object)(long)0; } } @@ -5066,7 +5441,10 @@ static T Complex(T x, T y) { if (typeof(T) == typeof(Complex)) { - return (T) (object) (Complex) System.Numerics.Complex.Pow((Complex) (object) x, (Complex) (object) y); + return (T) + (object) + (Complex) + System.Numerics.Complex.Pow((Complex)(object)x, (Complex)(object)y); } return ULong(x, y); @@ -5077,8 +5455,8 @@ static T ULong(T x, T y) { if (typeof(T) == typeof(ulong)) { - var py = (ulong) (object) y; - var px = (ulong) (object) x; + var py = (ulong)(object)y; + var px = (ulong)(object)x; if (py != 0) { var oabsy = py; @@ -5094,12 +5472,14 @@ static T ULong(T x, T y) px *= px; } - return (T) (object) result; + return (T)(object)result; } else { - if (px != 0) return (T) (object) (ulong) 1; - else return (T) (object) (ulong) 0; + if (px != 0) + return (T)(object)(ulong)1; + else + return (T)(object)(ulong)0; } } @@ -5134,14 +5514,16 @@ static T ULong(T x, T y) /// The return value is the angle in the Cartesian plane formed by the x-axis, and a vector starting from the origin, (0,0), and terminating at the point, (x,y). /// [MethodImpl(MaxOpt)] - public static T Atan2(T y, T x) where T : notnull + public static T Atan2(T y, T x) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Atan2((float) (Half) (object) x, (float) (Half) (object) y); + return (T) + (object)(Half)(float)Math.Atan2((float)(Half)(object)x, (float)(Half)(object)y); #else - return (T) (object) (Half) MathF.Atan2((float) (Half) (object) x, (float) (Half) (object) y); + return (T)(object)(Half)MathF.Atan2((float)(Half)(object)x, (float)(Half)(object)y); #endif } @@ -5153,9 +5535,9 @@ static T Float(T x, T y) if (typeof(T) == typeof(float)) { #if !MATHF - return (T) (object) (float) Math.Atan2((float) (object) x, (float) (object) y); + return (T)(object)(float)Math.Atan2((float)(object)x, (float)(object)y); #else - return (T) (object) MathF.Atan2((float) (object) x, (float) (object) y); + return (T)(object)MathF.Atan2((float)(object)x, (float)(object)y); #endif } @@ -5167,7 +5549,7 @@ static T Double(T x, T y) { if (typeof(T) == typeof(double)) { - return (T) (object) Math.Atan2((double) (object) x, (double) (object) y); + return (T)(object)Math.Atan2((double)(object)x, (double)(object)y); } return Decimal(x, y); @@ -5190,7 +5572,7 @@ static T SByte(T x, T y) { if (typeof(T) == typeof(sbyte)) { - return (T) (object) (sbyte) Math.Atan2((sbyte) (object) x, (sbyte) (object) y); + return (T)(object)(sbyte)Math.Atan2((sbyte)(object)x, (sbyte)(object)y); } return Byte(x, y); @@ -5201,7 +5583,7 @@ static T Byte(T x, T y) { if (typeof(T) == typeof(byte)) { - return (T) (object) (byte) Math.Atan2((byte) (object) x, (byte) (object) y); + return (T)(object)(byte)Math.Atan2((byte)(object)x, (byte)(object)y); } return Short(x, y); @@ -5212,7 +5594,7 @@ static T Short(T x, T y) { if (typeof(T) == typeof(short)) { - return (T) (object) (short) Math.Atan2((short) (object) x, (short) (object) y); + return (T)(object)(short)Math.Atan2((short)(object)x, (short)(object)y); } return UShort(x, y); @@ -5223,7 +5605,7 @@ static T UShort(T x, T y) { if (typeof(T) == typeof(ushort)) { - return (T) (object) (ushort) Math.Atan2((ushort) (object) x, (ushort) (object) y); + return (T)(object)(ushort)Math.Atan2((ushort)(object)x, (ushort)(object)y); } return Int(x, y); @@ -5234,7 +5616,7 @@ static T Int(T x, T y) { if (typeof(T) == typeof(int)) { - return (T) (object) (int) Math.Atan2((int) (object) x, (int) (object) y); + return (T)(object)(int)Math.Atan2((int)(object)x, (int)(object)y); } return UInt(x, y); @@ -5245,7 +5627,7 @@ static T UInt(T x, T y) { if (typeof(T) == typeof(uint)) { - return (T) (object) (uint) Math.Atan2((uint) (object) x, (uint) (object) y); + return (T)(object)(uint)Math.Atan2((uint)(object)x, (uint)(object)y); } return Long(x, y); @@ -5256,7 +5638,7 @@ static T Long(T x, T y) { if (typeof(T) == typeof(long)) { - return (T) (object) (long) Math.Atan2((long) (object) x, (long) (object) y); + return (T)(object)(long)Math.Atan2((long)(object)x, (long)(object)y); } return ULong(x, y); @@ -5267,7 +5649,7 @@ static T ULong(T x, T y) { if (typeof(T) == typeof(ulong)) { - return (T) (object) (ulong) Math.Atan2((ulong) (object) x, (ulong) (object) y); + return (T)(object)(ulong)Math.Atan2((ulong)(object)x, (ulong)(object)y); } ThrowUnsupportedType(); @@ -5289,14 +5671,15 @@ static T ULong(T x, T y) /// If is or , the method returns or , respectively. /// [MethodImpl(MaxOpt)] - public static T Round(T x, int digits) where T : notnull + public static T Round(T x, int digits) + where T : notnull { if (typeof(T) == typeof(Half)) { #if MATHF - return (T) (object) (Half) (float) MathF.Round((float)(Half) (object) x, digits); + return (T)(object)(Half)(float)MathF.Round((float)(Half)(object)x, digits); #else - return (T) (object) (Half) (float) Math.Round((float) (Half) (object) x, digits); + return (T)(object)(Half)(float)Math.Round((float)(Half)(object)x, digits); #endif } @@ -5308,9 +5691,9 @@ static T Float(T x, int digits) if (typeof(T) == typeof(float)) { #if MATHF - return (T) (object) (float) MathF.Round((float)(object) x, digits); + return (T)(object)(float)MathF.Round((float)(object)x, digits); #else - return (T) (object) (float) Math.Round((float) (object) x, digits); + return (T)(object)(float)Math.Round((float)(object)x, digits); #endif } @@ -5322,7 +5705,7 @@ static T Double(T x, int digits) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Round((double) (object) x, digits); + return (T)(object)(double)Math.Round((double)(object)x, digits); } return Decimal(x, digits); @@ -5340,14 +5723,15 @@ static T Decimal(T x, int digits) [MethodImpl(MaxOpt)] static T Other(T x, int digits) { - if (typeof(T) == typeof(sbyte) - || typeof(T) == typeof(byte) - || typeof(T) == typeof(ushort) - || typeof(T) == typeof(short) - || typeof(T) == typeof(uint) - || typeof(T) == typeof(int) - || typeof(T) == typeof(ulong) - || typeof(T) == typeof(long) + if ( + typeof(T) == typeof(sbyte) + || typeof(T) == typeof(byte) + || typeof(T) == typeof(ushort) + || typeof(T) == typeof(short) + || typeof(T) == typeof(uint) + || typeof(T) == typeof(int) + || typeof(T) == typeof(ulong) + || typeof(T) == typeof(long) ) return x; @@ -5370,14 +5754,15 @@ static T Other(T x, int digits) /// If is or , the method returns or , respectively. /// [MethodImpl(MaxOpt)] - public static T Round(T x, int digits, System.MidpointRounding mode) where T : notnull + public static T Round(T x, int digits, System.MidpointRounding mode) + where T : notnull { if (typeof(T) == typeof(Half)) { #if MATHF - return (T) (object) (Half) (float) MathF.Round((float)(Half) (object) x, digits, mode); + return (T)(object)(Half)(float)MathF.Round((float)(Half)(object)x, digits, mode); #else - return (T) (object) (Half) (float) Math.Round((float) (Half) (object) x, digits, mode); + return (T)(object)(Half)(float)Math.Round((float)(Half)(object)x, digits, mode); #endif } @@ -5389,9 +5774,9 @@ static T Float(T x, int digits, MidpointRounding mode) if (typeof(T) == typeof(float)) { #if MATHF - return (T) (object) (float) MathF.Round((float)(object) x, digits, mode); + return (T)(object)(float)MathF.Round((float)(object)x, digits, mode); #else - return (T) (object) (float) Math.Round((float) (object) x, digits, mode); + return (T)(object)(float)Math.Round((float)(object)x, digits, mode); #endif } @@ -5403,7 +5788,7 @@ static T Double(T x, int digits, MidpointRounding mode) { if (typeof(T) == typeof(double)) { - return (T) (object) (double) Math.Round((double) (object) x, digits, mode); + return (T)(object)(double)Math.Round((double)(object)x, digits, mode); } return Decimal(x, digits, mode); @@ -5421,15 +5806,15 @@ static T Decimal(T x, int digits, MidpointRounding mode) [MethodImpl(MaxOpt)] static T Other(T x, int digits, MidpointRounding mode) { - if (typeof(T) == typeof(sbyte) - || typeof(T) == typeof(byte) - || typeof(T) == typeof(ushort) - || typeof(T) == typeof(short) - || typeof(T) == typeof(uint) - || typeof(T) == typeof(int) - || typeof(T) == typeof(ulong) - || typeof(T) == typeof(long) - + if ( + typeof(T) == typeof(sbyte) + || typeof(T) == typeof(byte) + || typeof(T) == typeof(ushort) + || typeof(T) == typeof(short) + || typeof(T) == typeof(uint) + || typeof(T) == typeof(int) + || typeof(T) == typeof(ulong) + || typeof(T) == typeof(long) ) return x; @@ -5451,14 +5836,15 @@ static T Other(T x, int digits, MidpointRounding mode) /// If is or , the method returns or , respectively. /// \ [MethodImpl(MaxOpt)] - public static T Round(T x, System.MidpointRounding mode) where T : notnull + public static T Round(T x, System.MidpointRounding mode) + where T : notnull { if (typeof(T) == typeof(Half)) { #if !MATHF - return (T) (object) (Half) (float) Math.Round((float) (Half) (object) x, mode); + return (T)(object)(Half)(float)Math.Round((float)(Half)(object)x, mode); #else - return (T) (object) (Half) MathF.Round((float) (Half) (object) x, mode); + return (T)(object)(Half)MathF.Round((float)(Half)(object)x, mode); #endif } @@ -5473,38 +5859,94 @@ static T Float(T x, MidpointRounding mode) if (Sse42.IsSupported) { if (mode == MidpointRounding.ToZero) - return (T)(object)(float)Sse41.RoundToZeroScalar(Vector128.CreateScalarUnsafe((float)(object)x)).ToScalar(); - + return (T) + (object) + (float) + Sse41 + .RoundToZeroScalar( + Vector128.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToPositiveInfinity) - return (T)(object)(float)Sse41.RoundToPositiveInfinityScalar(Vector128.CreateScalarUnsafe((float)(object)x)).ToScalar(); - + return (T) + (object) + (float) + Sse41 + .RoundToPositiveInfinityScalar( + Vector128.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToNegativeInfinity) - return (T)(object)(float)Sse41.RoundToNegativeInfinityScalar(Vector128.CreateScalarUnsafe((float)(object)x)).ToScalar(); - + return (T) + (object) + (float) + Sse41 + .RoundToNegativeInfinityScalar( + Vector128.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToEven) - return (T)(object)(float)Sse41.RoundToNearestIntegerScalar(Vector128.CreateScalarUnsafe((float)(object)x)).ToScalar(); + return (T) + (object) + (float) + Sse41 + .RoundToNearestIntegerScalar( + Vector128.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { if (mode == MidpointRounding.ToZero) - return (T)(object)(float)AdvSimd.RoundToZeroScalar(Vector64.CreateScalarUnsafe((float)(object)x)).ToScalar(); - + return (T) + (object) + (float) + AdvSimd + .RoundToZeroScalar( + Vector64.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToPositiveInfinity) - return (T)(object)(float)AdvSimd.RoundToPositiveInfinityScalar(Vector64.CreateScalarUnsafe((float)(object)x)).ToScalar(); - + return (T) + (object) + (float) + AdvSimd + .RoundToPositiveInfinityScalar( + Vector64.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToNegativeInfinity) - return (T)(object)(float)AdvSimd.RoundToNegativeInfinityScalar(Vector64.CreateScalarUnsafe((float)(object)x)).ToScalar(); - + return (T) + (object) + (float) + AdvSimd + .RoundToNegativeInfinityScalar( + Vector64.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToEven) - return (T)(object)(float)AdvSimd.RoundToNearestScalar(Vector64.CreateScalarUnsafe((float)(object)x)).ToScalar(); + return (T) + (object) + (float) + AdvSimd + .RoundToNearestScalar( + Vector64.CreateScalarUnsafe((float)(object)x) + ) + .ToScalar(); } #endif #if !MATHF - return (T) (object) (float) Math.Round((float) (object) x, mode); + return (T)(object)(float)Math.Round((float)(object)x, mode); #else - return (T) (object) MathF.Round((float) (object) x, mode); + return (T)(object)MathF.Round((float)(object)x, mode); #endif } @@ -5520,35 +5962,91 @@ static T Double(T x, MidpointRounding mode) if (Sse42.IsSupported) { if (mode == MidpointRounding.ToZero) - return (T)(object)(double)Sse41.RoundToZeroScalar(Vector128.CreateScalarUnsafe((double)(object)x)).ToScalar(); - + return (T) + (object) + (double) + Sse41 + .RoundToZeroScalar( + Vector128.CreateScalarUnsafe((double)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToPositiveInfinity) - return (T)(object)(double)Sse41.RoundToPositiveInfinityScalar(Vector128.CreateScalarUnsafe((double)(object)x)).ToScalar(); - + return (T) + (object) + (double) + Sse41 + .RoundToPositiveInfinityScalar( + Vector128.CreateScalarUnsafe((double)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToNegativeInfinity) - return (T)(object)(double)Sse41.RoundToNegativeInfinityScalar(Vector128.CreateScalarUnsafe((double)(object)x)).ToScalar(); - + return (T) + (object) + (double) + Sse41 + .RoundToNegativeInfinityScalar( + Vector128.CreateScalarUnsafe((double)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToEven) - return (T)(object)(double)Sse41.RoundToNearestIntegerScalar(Vector128.CreateScalarUnsafe((double)(object)x)).ToScalar(); + return (T) + (object) + (double) + Sse41 + .RoundToNearestIntegerScalar( + Vector128.CreateScalarUnsafe((double)(object)x) + ) + .ToScalar(); } #endif #if AdvSIMD if (AdvSimd.IsSupported) { if (mode == MidpointRounding.ToZero) - return (T)(object)(double)AdvSimd.RoundToZeroScalar(Vector64.CreateScalar((double)(object)x)).ToScalar(); - + return (T) + (object) + (double) + AdvSimd + .RoundToZeroScalar( + Vector64.CreateScalar((double)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToPositiveInfinity) - return (T)(object)(double)AdvSimd.RoundToPositiveInfinityScalar(Vector64.CreateScalar((double)(object)x)).ToScalar(); - + return (T) + (object) + (double) + AdvSimd + .RoundToPositiveInfinityScalar( + Vector64.CreateScalar((double)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToNegativeInfinity) - return (T)(object)(double)AdvSimd.RoundToNegativeInfinityScalar(Vector64.CreateScalar((double)(object)x)).ToScalar(); - + return (T) + (object) + (double) + AdvSimd + .RoundToNegativeInfinityScalar( + Vector64.CreateScalar((double)(object)x) + ) + .ToScalar(); + if (mode == MidpointRounding.ToEven) - return (T)(object)(double)AdvSimd.RoundToNearestScalar(Vector64.CreateScalar((double)(object)x)).ToScalar(); + return (T) + (object) + (double) + AdvSimd + .RoundToNearestScalar( + Vector64.CreateScalar((double)(object)x) + ) + .ToScalar(); } #endif - return (T) (object) (double) Math.Round((double) (object) x, mode); + return (T)(object)(double)Math.Round((double)(object)x, mode); } return Decimal(x, mode); @@ -5559,7 +6057,7 @@ static T Decimal(T x, MidpointRounding mode) { if (typeof(T) == typeof(decimal)) { - return (T) (object) (decimal) Math.Round((decimal) (object) x, mode); + return (T)(object)(decimal)Math.Round((decimal)(object)x, mode); } return SByte(x); @@ -5655,4 +6153,4 @@ static T ULong(T x) } } } -} \ No newline at end of file +} diff --git a/sources/OpenAL/OpenAL/al/AL.gen.cs b/sources/OpenAL/OpenAL/al/AL.gen.cs index 4f9ca54ab7..2ab679e02d 100644 --- a/sources/OpenAL/OpenAL/al/AL.gen.cs +++ b/sources/OpenAL/OpenAL/al/AL.gen.cs @@ -4116,7 +4116,7 @@ public static Constant GetError() => ] [NativeFunction("openal", EntryPoint = "alGetErrorDirect")] public static Constant GetErrorDirect(ContextHandle context) => - (Constant)(int)GetErrorDirectRawDirect(context); + (Constant)(int)GetErrorDirectRaw(context); [NativeName("alGetErrorDirect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alGetErrorDirect")] @@ -4124,7 +4124,7 @@ public static Constant GetErrorDirect(ContextHandle cont SupportedApiProfile("al", ["AL_EXT_direct_context"]), SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] - public static extern int GetErrorDirectRawDirect(ContextHandle context); + public static extern int GetErrorDirectRaw(ContextHandle context); [NativeName("alGetError")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alGetError")] @@ -6252,7 +6252,7 @@ public static MaybeBool IsAuxiliaryEffectSlot(uint effectslot) => public static MaybeBool IsAuxiliaryEffectSlotDirect( ContextHandle context, uint effectslot - ) => (MaybeBool)(sbyte)IsAuxiliaryEffectSlotDirectRawDirect(context, effectslot); + ) => (MaybeBool)(sbyte)IsAuxiliaryEffectSlotDirectRaw(context, effectslot); [NativeName("alIsAuxiliaryEffectSlotDirect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsAuxiliaryEffectSlotDirect")] @@ -6260,7 +6260,7 @@ uint effectslot SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true), SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] - public static extern sbyte IsAuxiliaryEffectSlotDirectRawDirect( + public static extern sbyte IsAuxiliaryEffectSlotDirectRaw( ContextHandle context, uint effectslot ); @@ -6283,7 +6283,7 @@ public static MaybeBool IsBuffer(uint buffer) => ] [NativeFunction("openal", EntryPoint = "alIsBufferDirect")] public static MaybeBool IsBufferDirect(ContextHandle context, uint buffer) => - (MaybeBool)(sbyte)IsBufferDirectRawDirect(context, buffer); + (MaybeBool)(sbyte)IsBufferDirectRaw(context, buffer); [NativeName("alIsBufferDirect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsBufferDirect")] @@ -6291,18 +6291,18 @@ public static MaybeBool IsBufferDirect(ContextHandle context, uint buffer SupportedApiProfile("al", ["AL_EXT_direct_context"]), SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] - public static extern sbyte IsBufferDirectRawDirect(ContextHandle context, uint buffer); + public static extern sbyte IsBufferDirectRaw(ContextHandle context, uint buffer); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] [NativeFunction("openal", EntryPoint = "alIsBufferFormatSupportedSOFT")] public static MaybeBool IsBufferFormatSupportedSOFT(int format) => - (MaybeBool)(sbyte)IsBufferFormatSupportedSOFTRawSOFT(format); + (MaybeBool)(sbyte)IsBufferFormatSupportedRawSOFT(format); [NativeName("alIsBufferFormatSupportedSOFT")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] - public static extern sbyte IsBufferFormatSupportedSOFTRawSOFT(int format); + public static extern sbyte IsBufferFormatSupportedRawSOFT(int format); [NativeName("alIsBuffer")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsBuffer")] @@ -6322,7 +6322,7 @@ public static MaybeBool IsEffect(uint effect) => ] [NativeFunction("openal", EntryPoint = "alIsEffectDirect")] public static MaybeBool IsEffectDirect(ContextHandle context, uint effect) => - (MaybeBool)(sbyte)IsEffectDirectRawDirect(context, effect); + (MaybeBool)(sbyte)IsEffectDirectRaw(context, effect); [NativeName("alIsEffectDirect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsEffectDirect")] @@ -6330,7 +6330,7 @@ public static MaybeBool IsEffectDirect(ContextHandle context, uint effect SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true), SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] - public static extern sbyte IsEffectDirectRawDirect(ContextHandle context, uint effect); + public static extern sbyte IsEffectDirectRaw(ContextHandle context, uint effect); [NativeName("alIsEffect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsEffect")] @@ -6427,7 +6427,7 @@ public static MaybeBool IsFilter(uint filter) => ] [NativeFunction("openal", EntryPoint = "alIsFilterDirect")] public static MaybeBool IsFilterDirect(ContextHandle context, uint filter) => - (MaybeBool)(sbyte)IsFilterDirectRawDirect(context, filter); + (MaybeBool)(sbyte)IsFilterDirectRaw(context, filter); [NativeName("alIsFilterDirect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsFilterDirect")] @@ -6435,7 +6435,7 @@ public static MaybeBool IsFilterDirect(ContextHandle context, uint filter SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true), SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] - public static extern sbyte IsFilterDirectRawDirect(ContextHandle context, uint filter); + public static extern sbyte IsFilterDirectRaw(ContextHandle context, uint filter); [NativeName("alIsFilter")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsFilter")] @@ -6455,7 +6455,7 @@ public static MaybeBool IsSource(uint source) => ] [NativeFunction("openal", EntryPoint = "alIsSourceDirect")] public static MaybeBool IsSourceDirect(ContextHandle context, uint source) => - (MaybeBool)(sbyte)IsSourceDirectRawDirect(context, source); + (MaybeBool)(sbyte)IsSourceDirectRaw(context, source); [NativeName("alIsSourceDirect")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsSourceDirect")] @@ -6463,7 +6463,7 @@ public static MaybeBool IsSourceDirect(ContextHandle context, uint source SupportedApiProfile("al", ["AL_EXT_direct_context"]), SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] - public static extern sbyte IsSourceDirectRawDirect(ContextHandle context, uint source); + public static extern sbyte IsSourceDirectRaw(ContextHandle context, uint source); [NativeName("alIsSource")] [DllImport("openal", ExactSpelling = true, EntryPoint = "alIsSource")] @@ -12224,8 +12224,7 @@ public Constant GetErrorDirect(ContextHandle context) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public int GetErrorDirectRawDirect(ContextHandle context) => - T.GetErrorDirectRawDirect(context); + public int GetErrorDirectRaw(ContextHandle context) => T.GetErrorDirectRaw(context); [NativeName("alGetError")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -14155,8 +14154,8 @@ uint effectslot [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public sbyte IsAuxiliaryEffectSlotDirectRawDirect(ContextHandle context, uint effectslot) => - T.IsAuxiliaryEffectSlotDirectRawDirect(context, effectslot); + public sbyte IsAuxiliaryEffectSlotDirectRaw(ContextHandle context, uint effectslot) => + T.IsAuxiliaryEffectSlotDirectRaw(context, effectslot); [NativeName("alIsAuxiliaryEffectSlot")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -14196,8 +14195,8 @@ public MaybeBool IsBufferDirect(ContextHandle context, uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public sbyte IsBufferDirectRawDirect(ContextHandle context, uint buffer) => - T.IsBufferDirectRawDirect(context, buffer); + public sbyte IsBufferDirectRaw(ContextHandle context, uint buffer) => + T.IsBufferDirectRaw(context, buffer); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] @@ -14214,8 +14213,8 @@ public MaybeBool IsBufferFormatSupportedSOFT(int format) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public sbyte IsBufferFormatSupportedSOFTRawSOFT(int format) => - T.IsBufferFormatSupportedSOFTRawSOFT(format); + public sbyte IsBufferFormatSupportedRawSOFT(int format) => + T.IsBufferFormatSupportedRawSOFT(format); [NativeName("alIsBuffer")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -14254,8 +14253,8 @@ public MaybeBool IsEffectDirect(ContextHandle context, uint effect) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public sbyte IsEffectDirectRawDirect(ContextHandle context, uint effect) => - T.IsEffectDirectRawDirect(context, effect); + public sbyte IsEffectDirectRaw(ContextHandle context, uint effect) => + T.IsEffectDirectRaw(context, effect); [NativeName("alIsEffect")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -14380,8 +14379,8 @@ public MaybeBool IsFilterDirect(ContextHandle context, uint filter) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public sbyte IsFilterDirectRawDirect(ContextHandle context, uint filter) => - T.IsFilterDirectRawDirect(context, filter); + public sbyte IsFilterDirectRaw(ContextHandle context, uint filter) => + T.IsFilterDirectRaw(context, filter); [NativeName("alIsFilter")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -14420,8 +14419,8 @@ public MaybeBool IsSourceDirect(ContextHandle context, uint source) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public sbyte IsSourceDirectRawDirect(ContextHandle context, uint source) => - T.IsSourceDirectRawDirect(context, source); + public sbyte IsSourceDirectRaw(ContextHandle context, uint source) => + T.IsSourceDirectRaw(context, source); [NativeName("alIsSource")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -21174,8 +21173,8 @@ public static Constant GetErrorDirect(ContextHandle cont [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static int GetErrorDirectRawDirect(ContextHandle context) => - Underlying.Value!.GetErrorDirectRawDirect(context); + public static int GetErrorDirectRaw(ContextHandle context) => + Underlying.Value!.GetErrorDirectRaw(context); [NativeName("alGetError")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -23564,10 +23563,10 @@ uint effectslot [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static sbyte IsAuxiliaryEffectSlotDirectRawDirect( + public static sbyte IsAuxiliaryEffectSlotDirectRaw( ContextHandle context, uint effectslot - ) => Underlying.Value!.IsAuxiliaryEffectSlotDirectRawDirect(context, effectslot); + ) => Underlying.Value!.IsAuxiliaryEffectSlotDirectRaw(context, effectslot); [NativeName("alIsAuxiliaryEffectSlot")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -23607,8 +23606,8 @@ public static MaybeBool IsBufferDirect(ContextHandle context, uint buffer [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static sbyte IsBufferDirectRawDirect(ContextHandle context, uint buffer) => - Underlying.Value!.IsBufferDirectRawDirect(context, buffer); + public static sbyte IsBufferDirectRaw(ContextHandle context, uint buffer) => + Underlying.Value!.IsBufferDirectRaw(context, buffer); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] @@ -23625,8 +23624,8 @@ public static MaybeBool IsBufferFormatSupportedSOFT(int format) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static sbyte IsBufferFormatSupportedSOFTRawSOFT(int format) => - Underlying.Value!.IsBufferFormatSupportedSOFTRawSOFT(format); + public static sbyte IsBufferFormatSupportedRawSOFT(int format) => + Underlying.Value!.IsBufferFormatSupportedRawSOFT(format); [NativeName("alIsBuffer")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -23665,8 +23664,8 @@ public static MaybeBool IsEffectDirect(ContextHandle context, uint effect [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static sbyte IsEffectDirectRawDirect(ContextHandle context, uint effect) => - Underlying.Value!.IsEffectDirectRawDirect(context, effect); + public static sbyte IsEffectDirectRaw(ContextHandle context, uint effect) => + Underlying.Value!.IsEffectDirectRaw(context, effect); [NativeName("alIsEffect")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -23803,8 +23802,8 @@ public static MaybeBool IsFilterDirect(ContextHandle context, uint filter [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static sbyte IsFilterDirectRawDirect(ContextHandle context, uint filter) => - Underlying.Value!.IsFilterDirectRawDirect(context, filter); + public static sbyte IsFilterDirectRaw(ContextHandle context, uint filter) => + Underlying.Value!.IsFilterDirectRaw(context, filter); [NativeName("alIsFilter")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -23843,8 +23842,8 @@ public static MaybeBool IsSourceDirect(ContextHandle context, uint source [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static sbyte IsSourceDirectRawDirect(ContextHandle context, uint source) => - Underlying.Value!.IsSourceDirectRawDirect(context, source); + public static sbyte IsSourceDirectRaw(ContextHandle context, uint source) => + Underlying.Value!.IsSourceDirectRaw(context, source); [NativeName("alIsSource")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -34316,7 +34315,7 @@ Constant IAL.GetError() => [NativeFunction("openal", EntryPoint = "alGetErrorDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] Constant IAL.GetErrorDirect(ContextHandle context) => - (Constant)(int)((IAL)this).GetErrorDirectRawDirect(context); + (Constant)(int)((IAL)this).GetErrorDirectRaw(context); [NativeName("alGetErrorDirect")] [ @@ -34335,7 +34334,7 @@ public static Constant GetErrorDirect(ContextHandle cont ] [NativeFunction("openal", EntryPoint = "alGetErrorDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - int IAL.GetErrorDirectRawDirect(ContextHandle context) => + int IAL.GetErrorDirectRaw(ContextHandle context) => ( (delegate* unmanaged)( _slots[135] is not null and var loadedFnPtr @@ -34351,8 +34350,8 @@ _slots[135] is not null and var loadedFnPtr ] [NativeFunction("openal", EntryPoint = "alGetErrorDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static int GetErrorDirectRawDirect(ContextHandle context) => - ThisThread.GetErrorDirectRawDirect(context); + public static int GetErrorDirectRaw(ContextHandle context) => + ThisThread.GetErrorDirectRaw(context); [NativeName("alGetError")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -38374,8 +38373,7 @@ public static MaybeBool IsAuxiliaryEffectSlot(uint effectslot) => [NativeFunction("openal", EntryPoint = "alIsAuxiliaryEffectSlotDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IAL.IsAuxiliaryEffectSlotDirect(ContextHandle context, uint effectslot) => - (MaybeBool) - (sbyte)((IAL)this).IsAuxiliaryEffectSlotDirectRawDirect(context, effectslot); + (MaybeBool)(sbyte)((IAL)this).IsAuxiliaryEffectSlotDirectRaw(context, effectslot); [NativeName("alIsAuxiliaryEffectSlotDirect")] [ @@ -38396,7 +38394,7 @@ uint effectslot ] [NativeFunction("openal", EntryPoint = "alIsAuxiliaryEffectSlotDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - sbyte IAL.IsAuxiliaryEffectSlotDirectRawDirect(ContextHandle context, uint effectslot) => + sbyte IAL.IsAuxiliaryEffectSlotDirectRaw(ContextHandle context, uint effectslot) => ( (delegate* unmanaged)( _slots[205] is not null and var loadedFnPtr @@ -38415,10 +38413,8 @@ _slots[205] is not null and var loadedFnPtr ] [NativeFunction("openal", EntryPoint = "alIsAuxiliaryEffectSlotDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static sbyte IsAuxiliaryEffectSlotDirectRawDirect( - ContextHandle context, - uint effectslot - ) => ThisThread.IsAuxiliaryEffectSlotDirectRawDirect(context, effectslot); + public static sbyte IsAuxiliaryEffectSlotDirectRaw(ContextHandle context, uint effectslot) => + ThisThread.IsAuxiliaryEffectSlotDirectRaw(context, effectslot); [NativeName("alIsAuxiliaryEffectSlot")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -38461,7 +38457,7 @@ MaybeBool IAL.IsBuffer(uint buffer) => [NativeFunction("openal", EntryPoint = "alIsBufferDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IAL.IsBufferDirect(ContextHandle context, uint buffer) => - (MaybeBool)(sbyte)((IAL)this).IsBufferDirectRawDirect(context, buffer); + (MaybeBool)(sbyte)((IAL)this).IsBufferDirectRaw(context, buffer); [NativeName("alIsBufferDirect")] [ @@ -38480,7 +38476,7 @@ public static MaybeBool IsBufferDirect(ContextHandle context, uint buffer ] [NativeFunction("openal", EntryPoint = "alIsBufferDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - sbyte IAL.IsBufferDirectRawDirect(ContextHandle context, uint buffer) => + sbyte IAL.IsBufferDirectRaw(ContextHandle context, uint buffer) => ( (delegate* unmanaged)( _slots[207] is not null and var loadedFnPtr @@ -38496,15 +38492,15 @@ _slots[207] is not null and var loadedFnPtr ] [NativeFunction("openal", EntryPoint = "alIsBufferDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static sbyte IsBufferDirectRawDirect(ContextHandle context, uint buffer) => - ThisThread.IsBufferDirectRawDirect(context, buffer); + public static sbyte IsBufferDirectRaw(ContextHandle context, uint buffer) => + ThisThread.IsBufferDirectRaw(context, buffer); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] [NativeFunction("openal", EntryPoint = "alIsBufferFormatSupportedSOFT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IAL.IsBufferFormatSupportedSOFT(int format) => - (MaybeBool)(sbyte)((IAL)this).IsBufferFormatSupportedSOFTRawSOFT(format); + (MaybeBool)(sbyte)((IAL)this).IsBufferFormatSupportedRawSOFT(format); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] @@ -38517,7 +38513,7 @@ public static MaybeBool IsBufferFormatSupportedSOFT(int format) => [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] [NativeFunction("openal", EntryPoint = "alIsBufferFormatSupportedSOFT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - sbyte IAL.IsBufferFormatSupportedSOFTRawSOFT(int format) => + sbyte IAL.IsBufferFormatSupportedRawSOFT(int format) => ( (delegate* unmanaged)( _slots[208] is not null and var loadedFnPtr @@ -38533,8 +38529,8 @@ _slots[208] is not null and var loadedFnPtr [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] [NativeFunction("openal", EntryPoint = "alIsBufferFormatSupportedSOFT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static sbyte IsBufferFormatSupportedSOFTRawSOFT(int format) => - ThisThread.IsBufferFormatSupportedSOFTRawSOFT(format); + public static sbyte IsBufferFormatSupportedRawSOFT(int format) => + ThisThread.IsBufferFormatSupportedRawSOFT(format); [NativeName("alIsBuffer")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -38576,7 +38572,7 @@ MaybeBool IAL.IsEffect(uint effect) => [NativeFunction("openal", EntryPoint = "alIsEffectDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IAL.IsEffectDirect(ContextHandle context, uint effect) => - (MaybeBool)(sbyte)((IAL)this).IsEffectDirectRawDirect(context, effect); + (MaybeBool)(sbyte)((IAL)this).IsEffectDirectRaw(context, effect); [NativeName("alIsEffectDirect")] [ @@ -38595,7 +38591,7 @@ public static MaybeBool IsEffectDirect(ContextHandle context, uint effect ] [NativeFunction("openal", EntryPoint = "alIsEffectDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - sbyte IAL.IsEffectDirectRawDirect(ContextHandle context, uint effect) => + sbyte IAL.IsEffectDirectRaw(ContextHandle context, uint effect) => ( (delegate* unmanaged)( _slots[210] is not null and var loadedFnPtr @@ -38611,8 +38607,8 @@ _slots[210] is not null and var loadedFnPtr ] [NativeFunction("openal", EntryPoint = "alIsEffectDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static sbyte IsEffectDirectRawDirect(ContextHandle context, uint effect) => - ThisThread.IsEffectDirectRawDirect(context, effect); + public static sbyte IsEffectDirectRaw(ContextHandle context, uint effect) => + ThisThread.IsEffectDirectRaw(context, effect); [NativeName("alIsEffect")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -38833,7 +38829,7 @@ MaybeBool IAL.IsFilter(uint filter) => [NativeFunction("openal", EntryPoint = "alIsFilterDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IAL.IsFilterDirect(ContextHandle context, uint filter) => - (MaybeBool)(sbyte)((IAL)this).IsFilterDirectRawDirect(context, filter); + (MaybeBool)(sbyte)((IAL)this).IsFilterDirectRaw(context, filter); [NativeName("alIsFilterDirect")] [ @@ -38852,7 +38848,7 @@ public static MaybeBool IsFilterDirect(ContextHandle context, uint filter ] [NativeFunction("openal", EntryPoint = "alIsFilterDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - sbyte IAL.IsFilterDirectRawDirect(ContextHandle context, uint filter) => + sbyte IAL.IsFilterDirectRaw(ContextHandle context, uint filter) => ( (delegate* unmanaged)( _slots[216] is not null and var loadedFnPtr @@ -38868,8 +38864,8 @@ _slots[216] is not null and var loadedFnPtr ] [NativeFunction("openal", EntryPoint = "alIsFilterDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static sbyte IsFilterDirectRawDirect(ContextHandle context, uint filter) => - ThisThread.IsFilterDirectRawDirect(context, filter); + public static sbyte IsFilterDirectRaw(ContextHandle context, uint filter) => + ThisThread.IsFilterDirectRaw(context, filter); [NativeName("alIsFilter")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -38911,7 +38907,7 @@ MaybeBool IAL.IsSource(uint source) => [NativeFunction("openal", EntryPoint = "alIsSourceDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IAL.IsSourceDirect(ContextHandle context, uint source) => - (MaybeBool)(sbyte)((IAL)this).IsSourceDirectRawDirect(context, source); + (MaybeBool)(sbyte)((IAL)this).IsSourceDirectRaw(context, source); [NativeName("alIsSourceDirect")] [ @@ -38930,7 +38926,7 @@ public static MaybeBool IsSourceDirect(ContextHandle context, uint source ] [NativeFunction("openal", EntryPoint = "alIsSourceDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - sbyte IAL.IsSourceDirectRawDirect(ContextHandle context, uint source) => + sbyte IAL.IsSourceDirectRaw(ContextHandle context, uint source) => ( (delegate* unmanaged)( _slots[218] is not null and var loadedFnPtr @@ -38946,8 +38942,8 @@ _slots[218] is not null and var loadedFnPtr ] [NativeFunction("openal", EntryPoint = "alIsSourceDirect")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static sbyte IsSourceDirectRawDirect(ContextHandle context, uint source) => - ThisThread.IsSourceDirectRawDirect(context, source); + public static sbyte IsSourceDirectRaw(ContextHandle context, uint source) => + ThisThread.IsSourceDirectRaw(context, source); [NativeName("alIsSource")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] diff --git a/sources/OpenAL/OpenAL/al/IAL.gen.cs b/sources/OpenAL/OpenAL/al/IAL.gen.cs index b138929cb5..3b8e3e9179 100644 --- a/sources/OpenAL/OpenAL/al/IAL.gen.cs +++ b/sources/OpenAL/OpenAL/al/IAL.gen.cs @@ -2936,7 +2936,7 @@ Ref piValues SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] [NativeFunction("openal", EntryPoint = "alGetErrorDirect")] - static abstract int GetErrorDirectRawDirect(ContextHandle context); + static abstract int GetErrorDirectRaw(ContextHandle context); [NativeName("alGetError")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -4419,7 +4419,7 @@ uint effectslot SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] [NativeFunction("openal", EntryPoint = "alIsAuxiliaryEffectSlotDirect")] - static abstract sbyte IsAuxiliaryEffectSlotDirectRawDirect( + static abstract sbyte IsAuxiliaryEffectSlotDirectRaw( ContextHandle context, uint effectslot ); @@ -4448,7 +4448,7 @@ uint effectslot SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] [NativeFunction("openal", EntryPoint = "alIsBufferDirect")] - static abstract sbyte IsBufferDirectRawDirect(ContextHandle context, uint buffer); + static abstract sbyte IsBufferDirectRaw(ContextHandle context, uint buffer); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] @@ -4458,7 +4458,7 @@ uint effectslot [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] [NativeFunction("openal", EntryPoint = "alIsBufferFormatSupportedSOFT")] - static abstract sbyte IsBufferFormatSupportedSOFTRawSOFT(int format); + static abstract sbyte IsBufferFormatSupportedRawSOFT(int format); [NativeName("alIsBuffer")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -4484,7 +4484,7 @@ uint effectslot SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] [NativeFunction("openal", EntryPoint = "alIsEffectDirect")] - static abstract sbyte IsEffectDirectRawDirect(ContextHandle context, uint effect); + static abstract sbyte IsEffectDirectRaw(ContextHandle context, uint effect); [NativeName("alIsEffect")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -4568,7 +4568,7 @@ Ref extname SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] [NativeFunction("openal", EntryPoint = "alIsFilterDirect")] - static abstract sbyte IsFilterDirectRawDirect(ContextHandle context, uint filter); + static abstract sbyte IsFilterDirectRaw(ContextHandle context, uint filter); [NativeName("alIsFilter")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -4594,7 +4594,7 @@ Ref extname SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] [NativeFunction("openal", EntryPoint = "alIsSourceDirect")] - static abstract sbyte IsSourceDirectRawDirect(ContextHandle context, uint source); + static abstract sbyte IsSourceDirectRaw(ContextHandle context, uint source); [NativeName("alIsSource")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -8707,7 +8707,7 @@ Ref piValues SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] [NativeFunction("openal", EntryPoint = "alGetErrorDirect")] - int GetErrorDirectRawDirect(ContextHandle context); + int GetErrorDirectRaw(ContextHandle context); [NativeName("alGetError")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -9995,7 +9995,7 @@ int index SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] [NativeFunction("openal", EntryPoint = "alIsAuxiliaryEffectSlotDirect")] - sbyte IsAuxiliaryEffectSlotDirectRawDirect(ContextHandle context, uint effectslot); + sbyte IsAuxiliaryEffectSlotDirectRaw(ContextHandle context, uint effectslot); [NativeName("alIsAuxiliaryEffectSlot")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -10021,7 +10021,7 @@ int index SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] [NativeFunction("openal", EntryPoint = "alIsBufferDirect")] - sbyte IsBufferDirectRawDirect(ContextHandle context, uint buffer); + sbyte IsBufferDirectRaw(ContextHandle context, uint buffer); [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] @@ -10031,7 +10031,7 @@ int index [NativeName("alIsBufferFormatSupportedSOFT")] [SupportedApiProfile("al", ["AL_SOFT_buffer_samples"])] [NativeFunction("openal", EntryPoint = "alIsBufferFormatSupportedSOFT")] - sbyte IsBufferFormatSupportedSOFTRawSOFT(int format); + sbyte IsBufferFormatSupportedRawSOFT(int format); [NativeName("alIsBuffer")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] @@ -10057,7 +10057,7 @@ int index SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] [NativeFunction("openal", EntryPoint = "alIsEffectDirect")] - sbyte IsEffectDirectRawDirect(ContextHandle context, uint effect); + sbyte IsEffectDirectRaw(ContextHandle context, uint effect); [NativeName("alIsEffect")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -10138,7 +10138,7 @@ Constant capability SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true) ] [NativeFunction("openal", EntryPoint = "alIsFilterDirect")] - sbyte IsFilterDirectRawDirect(ContextHandle context, uint filter); + sbyte IsFilterDirectRaw(ContextHandle context, uint filter); [NativeName("alIsFilter")] [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])] @@ -10164,7 +10164,7 @@ Constant capability SupportedApiProfile("alc", ["AL_EXT_direct_context"]) ] [NativeFunction("openal", EntryPoint = "alIsSourceDirect")] - sbyte IsSourceDirectRawDirect(ContextHandle context, uint source); + sbyte IsSourceDirectRaw(ContextHandle context, uint source); [NativeName("alIsSource")] [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")] diff --git a/sources/OpenGL/OpenGL/gl/GL.gen.cs b/sources/OpenGL/OpenGL/gl/GL.gen.cs index 3200dc3d47..7a6078df6b 100644 --- a/sources/OpenGL/OpenGL/gl/GL.gen.cs +++ b/sources/OpenGL/OpenGL/gl/GL.gen.cs @@ -87,13 +87,13 @@ public static MaybeBool AcquireKeyedMutexWin32EXT( uint memory, ulong key, uint timeout - ) => (MaybeBool)(uint)AcquireKeyedMutexWin32EXTRawEXT(memory, key, timeout); + ) => (MaybeBool)(uint)AcquireKeyedMutexWin32RawEXT(memory, key, timeout); [NativeName("glAcquireKeyedMutexWin32EXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glAcquireKeyedMutexWin32EXT")] [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] - public static extern uint AcquireKeyedMutexWin32EXTRawEXT( + public static extern uint AcquireKeyedMutexWin32RawEXT( uint memory, ulong key, uint timeout @@ -3594,18 +3594,6 @@ public static void Bitmap( byte bitmap ) => Bitmap(1, height, xorig, yorig, xmove, ymove, (byte*)&bitmap); - [NativeName("glBitmapxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] - public static void BitmapxOOES( - uint height, - int xorig, - int yorig, - int xmove, - int ymove, - byte bitmap - ) => BitmapxOES(1, height, xorig, yorig, xmove, ymove, (byte*)&bitmap); - [NativeName("glBitmapxOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -3641,6 +3629,18 @@ Ref bitmap } } + [NativeName("glBitmapxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] + public static void BitmapxOES( + uint height, + int xorig, + int yorig, + int xmove, + int ymove, + byte bitmap + ) => BitmapxOES(1, height, xorig, yorig, xmove, ymove, (byte*)&bitmap); + [NativeName("glBlendBarrierKHR")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glBlendBarrierKHR")] [SupportedApiProfile("gl", ["GL_KHR_blend_equation_advanced"])] @@ -18048,12 +18048,6 @@ public static void DeleteFramebuffersEXT(uint n, Ref framebuffers) public static void DeleteFramebuffersEXT(uint framebuffers) => DeleteFramebuffersEXT(1, (uint*)&framebuffers); - [NativeName("glDeleteFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - public static void DeleteFramebuffersOOES(uint framebuffers) => - DeleteFramebuffersOES(1, (uint*)&framebuffers); - [NativeName("glDeleteFramebuffersOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -18073,6 +18067,12 @@ public static void DeleteFramebuffersOES(uint n, Ref framebuffers) } } + [NativeName("glDeleteFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] + public static void DeleteFramebuffersOES(uint framebuffers) => + DeleteFramebuffersOES(1, (uint*)&framebuffers); + [NativeName("glDeleteLists")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteLists")] [SupportedApiProfile( @@ -18875,12 +18875,6 @@ public static void DeleteRenderbuffersEXT(uint n, Ref renderbuffers) public static void DeleteRenderbuffersEXT(uint renderbuffers) => DeleteRenderbuffersEXT(1, (uint*)&renderbuffers); - [NativeName("glDeleteRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - public static void DeleteRenderbuffersOOES(uint renderbuffers) => - DeleteRenderbuffersOES(1, (uint*)&renderbuffers); - [NativeName("glDeleteRenderbuffersOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -18900,6 +18894,12 @@ public static void DeleteRenderbuffersOES(uint n, Ref renderbuffers) } } + [NativeName("glDeleteRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] + public static void DeleteRenderbuffersOES(uint renderbuffers) => + DeleteRenderbuffersOES(1, (uint*)&renderbuffers); + [NativeName("glDeleteSamplers")] [SupportedApiProfile( "gl", @@ -19738,13 +19738,6 @@ public static void DeleteVertexArraysAPPLE(uint n, Ref arrays) public static void DeleteVertexArraysAPPLE(uint arrays) => DeleteVertexArraysAPPLE(1, (uint*)&arrays); - [NativeName("glDeleteVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - public static void DeleteVertexArraysOOES(uint arrays) => - DeleteVertexArraysOES(1, (uint*)&arrays); - [NativeName("glDeleteVertexArraysOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -19766,6 +19759,13 @@ public static void DeleteVertexArraysOES(uint n, Ref arrays) } } + [NativeName("glDeleteVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] + public static void DeleteVertexArraysOES(uint arrays) => + DeleteVertexArraysOES(1, (uint*)&arrays); + [NativeName("glDeleteVertexShaderEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteVertexShaderEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -25779,15 +25779,10 @@ public static void EvalCoord1fv(Ref u) [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] public static extern void EvalCoord1XOES(int u); - [NativeName("glEvalCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - public static void EvalCoord1XvOOES(int coords) => EvalCoord1XOES((int*)&coords); - [NativeName("glEvalCoord1xvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - public static extern void EvalCoord1XOES(int* coords); + public static extern void EvalCoord1XvOES(int* coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -25795,14 +25790,19 @@ public static void EvalCoord1fv(Ref u) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void EvalCoord1XOES(Ref coords) + public static void EvalCoord1XvOES(Ref coords) { fixed (int* __dsl_coords = coords) { - EvalCoord1XOES(__dsl_coords); + EvalCoord1XvOES(__dsl_coords); } } + [NativeName("glEvalCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] + public static void EvalCoord1XvOES(int coords) => EvalCoord1XvOES((int*)&coords); + [NativeName("glEvalCoord2d")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glEvalCoord2d")] [SupportedApiProfile( @@ -26648,13 +26648,13 @@ Ref numTextures [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])] [NativeFunction("opengl", EntryPoint = "glExtIsProgramBinaryQCOM")] public static MaybeBool ExtIsProgramBinaryQCOM(uint program) => - (MaybeBool)(uint)ExtIsProgramBinaryQCOMRawQCOM(program); + (MaybeBool)(uint)ExtIsProgramBinaryRawQCOM(program); [NativeName("glExtIsProgramBinaryQCOM")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glExtIsProgramBinaryQCOM")] [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])] [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])] - public static extern uint ExtIsProgramBinaryQCOMRawQCOM(uint program); + public static extern uint ExtIsProgramBinaryRawQCOM(uint program); [NativeName("glExtractComponentEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glExtractComponentEXT")] @@ -26786,12 +26786,6 @@ public static float FeedbackBuffer(Constant type) return buffer; } - [NativeName("glFeedbackBufferxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - public static void FeedbackBufferxOOES(uint type, int buffer) => - FeedbackBufferxOES(1, type, (int*)&buffer); - [NativeName("glFeedbackBufferxOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -26811,6 +26805,12 @@ public static void FeedbackBufferxOES(uint n, uint type, Ref buffer) } } + [NativeName("glFeedbackBufferxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] + public static void FeedbackBufferxOES(uint type, int buffer) => + FeedbackBufferxOES(1, type, (int*)&buffer); + [NativeName("glFenceSync")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glFenceSync")] [SupportedApiProfile( @@ -30648,16 +30648,6 @@ public static uint GenFramebuffersEXT() return framebuffers; } - [NativeName("glGenFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - public static uint GenFramebuffersOOES() - { - uint framebuffers = default; - GenFramebuffersOES(1, (uint*)&framebuffers); - return framebuffers; - } - [NativeName("glGenFramebuffersOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -30677,6 +30667,16 @@ public static void GenFramebuffersOES(uint n, Ref framebuffers) } } + [NativeName("glGenFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] + public static uint GenFramebuffersOES() + { + uint framebuffers = default; + GenFramebuffersOES(1, (uint*)&framebuffers); + return framebuffers; + } + [NativeName("glGenLists")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenLists")] [SupportedApiProfile( @@ -31417,16 +31417,6 @@ public static uint GenRenderbuffersEXT() return renderbuffers; } - [NativeName("glGenRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - public static uint GenRenderbuffersOOES() - { - uint renderbuffers = default; - GenRenderbuffersOES(1, (uint*)&renderbuffers); - return renderbuffers; - } - [NativeName("glGenRenderbuffersOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -31446,6 +31436,16 @@ public static void GenRenderbuffersOES(uint n, Ref renderbuffers) } } + [NativeName("glGenRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] + public static uint GenRenderbuffersOES() + { + uint renderbuffers = default; + GenRenderbuffersOES(1, (uint*)&renderbuffers); + return renderbuffers; + } + [NativeName("glGenSamplers")] [SupportedApiProfile( "gl", @@ -32163,17 +32163,6 @@ public static uint GenVertexArraysAPPLE() return arrays; } - [NativeName("glGenVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - public static uint GenVertexArraysOOES() - { - uint arrays = default; - GenVertexArraysOES(1, (uint*)&arrays); - return arrays; - } - [NativeName("glGenVertexArraysOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -32195,6 +32184,17 @@ public static void GenVertexArraysOES(uint n, Ref arrays) } } + [NativeName("glGenVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] + public static uint GenVertexArraysOES() + { + uint arrays = default; + GenVertexArraysOES(1, (uint*)&arrays); + return arrays; + } + [NativeName("glGenVertexShadersEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenVertexShadersEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -36942,16 +36942,6 @@ Ref @params } } - [NativeName("glGetConvolutionParameterxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - public static int GetConvolutionParameterxvOOES(uint target) - { - int @params = default; - GetConvolutionParameterxOES(target, 1, (int*)&@params); - return @params; - } - [NativeName("glGetConvolutionParameterxvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -36975,6 +36965,16 @@ public static void GetConvolutionParameterxOES(uint target, uint pname, Ref } } + [NativeName("glGetConvolutionParameterxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] + public static int GetConvolutionParameterxOES(uint target) + { + int @params = default; + GetConvolutionParameterxOES(target, 1, (int*)&@params); + return @params; + } + [NativeName("glGetCoverageModulationTableNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetCoverageModulationTableNV")] [SupportedApiProfile("gl", ["GL_NV_framebuffer_mixed_samples"])] @@ -39321,37 +39321,37 @@ public static Constant GetGraphicsResetStatus [SupportedApiProfile("glcore", ["GL_ARB_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusARB")] public static Constant GetGraphicsResetStatusARB() => - (Constant)(uint)GetGraphicsResetStatusARBRawARB(); + (Constant)(uint)GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetGraphicsResetStatusARB")] [SupportedApiProfile("gl", ["GL_ARB_robustness"])] [SupportedApiProfile("glcore", ["GL_ARB_robustness"])] - public static extern uint GetGraphicsResetStatusARBRawARB(); + public static extern uint GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] [SupportedApiProfile("gles1", ["GL_EXT_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusEXT")] public static Constant GetGraphicsResetStatusEXT() => - (Constant)(uint)GetGraphicsResetStatusEXTRawEXT(); + (Constant)(uint)GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] [SupportedApiProfile("gles1", ["GL_EXT_robustness"])] - public static extern uint GetGraphicsResetStatusEXTRawEXT(); + public static extern uint GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusKHR")] public static Constant GetGraphicsResetStatusKHR() => - (Constant)(uint)GetGraphicsResetStatusKHRRawKHR(); + (Constant)(uint)GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatusKHR")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] - public static extern uint GetGraphicsResetStatusKHRRawKHR(); + public static extern uint GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatus")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetGraphicsResetStatus")] @@ -58838,12 +58838,12 @@ public static Ptr ImportSyncEXT( uint external_sync_type, nint external_sync, uint flags - ) => (Sync*)ImportSyncEXTRawEXT(external_sync_type, external_sync, flags); + ) => (Sync*)ImportSyncRawEXT(external_sync_type, external_sync, flags); [NativeName("glImportSyncEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glImportSyncEXT")] [SupportedApiProfile("gl", ["GL_EXT_x11_sync_object"])] - public static extern Sync* ImportSyncEXTRawEXT( + public static extern Sync* ImportSyncRawEXT( uint external_sync_type, nint external_sync, uint flags @@ -59661,15 +59661,10 @@ public static void Indexubv(Ref c) [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] public static extern void IndexxOES(int component); - [NativeName("glIndexxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - public static void IndexxvOOES(int component) => IndexxOES((int*)&component); - [NativeName("glIndexxvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - public static extern void IndexxOES(int* component); + public static extern void IndexxvOES(int* component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -59677,14 +59672,19 @@ public static void Indexubv(Ref c) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void IndexxOES(Ref component) + public static void IndexxvOES(Ref component) { fixed (int* __dsl_component = component) { - IndexxOES(__dsl_component); + IndexxvOES(__dsl_component); } } + [NativeName("glIndexxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] + public static void IndexxvOES(int component) => IndexxvOES((int*)&component); + [NativeName("glInitNames")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glInitNames")] [SupportedApiProfile( @@ -60906,12 +60906,12 @@ uint depth [SupportedApiProfile("gl", ["GL_SGIX_async"])] [NativeFunction("opengl", EntryPoint = "glIsAsyncMarkerSGIX")] public static MaybeBool IsAsyncMarkerSGIX(uint marker) => - (MaybeBool)(uint)IsAsyncMarkerSGIXRawSGIX(marker); + (MaybeBool)(uint)IsAsyncMarkerRawSGIX(marker); [NativeName("glIsAsyncMarkerSGIX")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsAsyncMarkerSGIX")] [SupportedApiProfile("gl", ["GL_SGIX_async"])] - public static extern uint IsAsyncMarkerSGIXRawSGIX(uint marker); + public static extern uint IsAsyncMarkerRawSGIX(uint marker); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -60968,12 +60968,12 @@ public static MaybeBool IsBuffer(uint buffer) => [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsBufferARB")] public static MaybeBool IsBufferARB(uint buffer) => - (MaybeBool)(uint)IsBufferARBRawARB(buffer); + (MaybeBool)(uint)IsBufferRawARB(buffer); [NativeName("glIsBufferARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsBufferARB")] [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] - public static extern uint IsBufferARBRawARB(uint buffer); + public static extern uint IsBufferRawARB(uint buffer); [NativeName("glIsBuffer")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsBuffer")] @@ -61030,26 +61030,26 @@ public static MaybeBool IsBufferARB(uint buffer) => [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsBufferResidentNV")] public static MaybeBool IsBufferResidentNV(uint target) => - (MaybeBool)(uint)IsBufferResidentNVRawNV(target); + (MaybeBool)(uint)IsBufferResidentRawNV(target); [NativeName("glIsBufferResidentNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] - public static extern uint IsBufferResidentNVRawNV(uint target); + public static extern uint IsBufferResidentRawNV(uint target); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsCommandListNV")] public static MaybeBool IsCommandListNV(uint list) => - (MaybeBool)(uint)IsCommandListNVRawNV(list); + (MaybeBool)(uint)IsCommandListRawNV(list); [NativeName("glIsCommandListNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] - public static extern uint IsCommandListNVRawNV(uint list); + public static extern uint IsCommandListRawNV(uint list); [NativeName("glIsEnabled")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsEnabled")] @@ -61309,12 +61309,12 @@ uint index [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceAPPLE")] public static MaybeBool IsFenceAPPLE(uint fence) => - (MaybeBool)(uint)IsFenceAppleRawAPPLE(fence); + (MaybeBool)(uint)IsFenceRawAPPLE(fence); [NativeName("glIsFenceAPPLE")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] - public static extern uint IsFenceAppleRawAPPLE(uint fence); + public static extern uint IsFenceRawAPPLE(uint fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -61322,14 +61322,14 @@ public static MaybeBool IsFenceAPPLE(uint fence) => [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceNV")] public static MaybeBool IsFenceNV(uint fence) => - (MaybeBool)(uint)IsFenceNVRawNV(fence); + (MaybeBool)(uint)IsFenceRawNV(fence); [NativeName("glIsFenceNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] [SupportedApiProfile("gles2", ["GL_NV_fence"])] [SupportedApiProfile("gles1", ["GL_NV_fence"])] - public static extern uint IsFenceNVRawNV(uint fence); + public static extern uint IsFenceRawNV(uint fence); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -61381,23 +61381,23 @@ public static MaybeBool IsFramebuffer(uint framebuffer) => [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferEXT")] public static MaybeBool IsFramebufferEXT(uint framebuffer) => - (MaybeBool)(uint)IsFramebufferEXTRawEXT(framebuffer); + (MaybeBool)(uint)IsFramebufferRawEXT(framebuffer); [NativeName("glIsFramebufferEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsFramebufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] - public static extern uint IsFramebufferEXTRawEXT(uint framebuffer); + public static extern uint IsFramebufferRawEXT(uint framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferOES")] public static MaybeBool IsFramebufferOES(uint framebuffer) => - (MaybeBool)(uint)IsFramebufferOESRawOES(framebuffer); + (MaybeBool)(uint)IsFramebufferRawOES(framebuffer); [NativeName("glIsFramebufferOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - public static extern uint IsFramebufferOESRawOES(uint framebuffer); + public static extern uint IsFramebufferRawOES(uint framebuffer); [NativeName("glIsFramebuffer")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsFramebuffer")] @@ -61449,13 +61449,13 @@ public static MaybeBool IsFramebufferOES(uint framebuffer) => [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentARB")] public static MaybeBool IsImageHandleResidentARB(ulong handle) => - (MaybeBool)(uint)IsImageHandleResidentARBRawARB(handle); + (MaybeBool)(uint)IsImageHandleResidentRawARB(handle); [NativeName("glIsImageHandleResidentARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsImageHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] - public static extern uint IsImageHandleResidentARBRawARB(ulong handle); + public static extern uint IsImageHandleResidentRawARB(ulong handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -61463,14 +61463,14 @@ public static MaybeBool IsImageHandleResidentARB(ulong handle) => [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentNV")] public static MaybeBool IsImageHandleResidentNV(ulong handle) => - (MaybeBool)(uint)IsImageHandleResidentNVRawNV(handle); + (MaybeBool)(uint)IsImageHandleResidentRawNV(handle); [NativeName("glIsImageHandleResidentNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_NV_bindless_texture"])] [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] - public static extern uint IsImageHandleResidentNVRawNV(ulong handle); + public static extern uint IsImageHandleResidentRawNV(ulong handle); [NativeName("glIsList")] [SupportedApiProfile( @@ -61535,37 +61535,37 @@ public static MaybeBool IsImageHandleResidentNV(ulong handle) => [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])] [NativeFunction("opengl", EntryPoint = "glIsMemoryObjectEXT")] public static MaybeBool IsMemoryObjectEXT(uint memoryObject) => - (MaybeBool)(uint)IsMemoryObjectEXTRawEXT(memoryObject); + (MaybeBool)(uint)IsMemoryObjectRawEXT(memoryObject); [NativeName("glIsMemoryObjectEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsMemoryObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_memory_object"])] [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])] - public static extern uint IsMemoryObjectEXTRawEXT(uint memoryObject); + public static extern uint IsMemoryObjectRawEXT(uint memoryObject); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] [NativeFunction("opengl", EntryPoint = "glIsNameAMD")] public static MaybeBool IsNameAMD(uint identifier, uint name) => - (MaybeBool)(uint)IsNameAMDRawAMD(identifier, name); + (MaybeBool)(uint)IsNameRawAMD(identifier, name); [NativeName("glIsNameAMD")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] - public static extern uint IsNameAMDRawAMD(uint identifier, uint name); + public static extern uint IsNameRawAMD(uint identifier, uint name); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsNamedBufferResidentNV")] public static MaybeBool IsNamedBufferResidentNV(uint buffer) => - (MaybeBool)(uint)IsNamedBufferResidentNVRawNV(buffer); + (MaybeBool)(uint)IsNamedBufferResidentRawNV(buffer); [NativeName("glIsNamedBufferResidentNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] - public static extern uint IsNamedBufferResidentNVRawNV(uint buffer); + public static extern uint IsNamedBufferResidentRawNV(uint buffer); [NativeName("glIsNamedStringARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsNamedStringARB")] @@ -61592,23 +61592,23 @@ public static MaybeBool IsNamedStringARB(int namelen, Ref name) [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsObjectBufferATI")] public static MaybeBool IsObjectBufferATI(uint buffer) => - (MaybeBool)(uint)IsObjectBufferATIRawATI(buffer); + (MaybeBool)(uint)IsObjectBufferRawATI(buffer); [NativeName("glIsObjectBufferATI")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] - public static extern uint IsObjectBufferATIRawATI(uint buffer); + public static extern uint IsObjectBufferRawATI(uint buffer); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsOcclusionQueryNV")] public static MaybeBool IsOcclusionQueryNV(uint id) => - (MaybeBool)(uint)IsOcclusionQueryNVRawNV(id); + (MaybeBool)(uint)IsOcclusionQueryRawNV(id); [NativeName("glIsOcclusionQueryNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] - public static extern uint IsOcclusionQueryNVRawNV(uint id); + public static extern uint IsOcclusionQueryRawNV(uint id); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -61616,14 +61616,14 @@ public static MaybeBool IsOcclusionQueryNV(uint id) => [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPathNV")] public static MaybeBool IsPathNV(uint path) => - (MaybeBool)(uint)IsPathNVRawNV(path); + (MaybeBool)(uint)IsPathRawNV(path); [NativeName("glIsPathNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] - public static extern uint IsPathNVRawNV(uint path); + public static extern uint IsPathRawNV(uint path); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -61631,14 +61631,14 @@ public static MaybeBool IsPathNV(uint path) => [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInFillPathNV")] public static MaybeBool IsPointInFillPathNV(uint path, uint mask, float x, float y) => - (MaybeBool)(uint)IsPointInFillPathNVRawNV(path, mask, x, y); + (MaybeBool)(uint)IsPointInFillPathRawNV(path, mask, x, y); [NativeName("glIsPointInFillPathNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] - public static extern uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y); + public static extern uint IsPointInFillPathRawNV(uint path, uint mask, float x, float y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -61646,14 +61646,14 @@ public static MaybeBool IsPointInFillPathNV(uint path, uint mask, float x, [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInStrokePathNV")] public static MaybeBool IsPointInStrokePathNV(uint path, float x, float y) => - (MaybeBool)(uint)IsPointInStrokePathNVRawNV(path, x, y); + (MaybeBool)(uint)IsPointInStrokePathRawNV(path, x, y); [NativeName("glIsPointInStrokePathNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] - public static extern uint IsPointInStrokePathNVRawNV(uint path, float x, float y); + public static extern uint IsPointInStrokePathRawNV(uint path, float x, float y); [NativeName("glIsProgram")] [SupportedApiProfile( @@ -61707,23 +61707,23 @@ public static MaybeBool IsProgram(uint program) => [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramARB")] public static MaybeBool IsProgramARB(uint program) => - (MaybeBool)(uint)IsProgramARBRawARB(program); + (MaybeBool)(uint)IsProgramRawARB(program); [NativeName("glIsProgramARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsProgramARB")] [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] - public static extern uint IsProgramARBRawARB(uint program); + public static extern uint IsProgramRawARB(uint program); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramNV")] public static MaybeBool IsProgramNV(uint id) => - (MaybeBool)(uint)IsProgramNVRawNV(id); + (MaybeBool)(uint)IsProgramRawNV(id); [NativeName("glIsProgramNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] - public static extern uint IsProgramNVRawNV(uint id); + public static extern uint IsProgramRawNV(uint id); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -61760,12 +61760,12 @@ public static MaybeBool IsProgramPipeline(uint pipeline) => [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] [NativeFunction("opengl", EntryPoint = "glIsProgramPipelineEXT")] public static MaybeBool IsProgramPipelineEXT(uint pipeline) => - (MaybeBool)(uint)IsProgramPipelineEXTRawEXT(pipeline); + (MaybeBool)(uint)IsProgramPipelineRawEXT(pipeline); [NativeName("glIsProgramPipelineEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsProgramPipelineEXT")] [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] - public static extern uint IsProgramPipelineEXTRawEXT(uint pipeline); + public static extern uint IsProgramPipelineRawEXT(uint pipeline); [NativeName("glIsProgramPipeline")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsProgramPipeline")] @@ -61892,12 +61892,12 @@ public static MaybeBool IsProgramPipelineEXT(uint pipeline) => [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsQueryARB")] public static MaybeBool IsQueryARB(uint id) => - (MaybeBool)(uint)IsQueryARBRawARB(id); + (MaybeBool)(uint)IsQueryRawARB(id); [NativeName("glIsQueryARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsQueryARB")] [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] - public static extern uint IsQueryARBRawARB(uint id); + public static extern uint IsQueryRawARB(uint id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -61906,7 +61906,7 @@ public static MaybeBool IsQueryARB(uint id) => )] [NativeFunction("opengl", EntryPoint = "glIsQueryEXT")] public static MaybeBool IsQueryEXT(uint id) => - (MaybeBool)(uint)IsQueryEXTRawEXT(id); + (MaybeBool)(uint)IsQueryRawEXT(id); [NativeName("glIsQueryEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsQueryEXT")] @@ -61914,7 +61914,7 @@ public static MaybeBool IsQueryEXT(uint id) => "gles2", ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"] )] - public static extern uint IsQueryEXTRawEXT(uint id); + public static extern uint IsQueryRawEXT(uint id); [NativeName("glIsQuery")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsQuery")] @@ -62010,23 +62010,23 @@ public static MaybeBool IsRenderbuffer(uint renderbuffer) => [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferEXT")] public static MaybeBool IsRenderbufferEXT(uint renderbuffer) => - (MaybeBool)(uint)IsRenderbufferEXTRawEXT(renderbuffer); + (MaybeBool)(uint)IsRenderbufferRawEXT(renderbuffer); [NativeName("glIsRenderbufferEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsRenderbufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] - public static extern uint IsRenderbufferEXTRawEXT(uint renderbuffer); + public static extern uint IsRenderbufferRawEXT(uint renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferOES")] public static MaybeBool IsRenderbufferOES(uint renderbuffer) => - (MaybeBool)(uint)IsRenderbufferOESRawOES(renderbuffer); + (MaybeBool)(uint)IsRenderbufferRawOES(renderbuffer); [NativeName("glIsRenderbufferOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - public static extern uint IsRenderbufferOESRawOES(uint renderbuffer); + public static extern uint IsRenderbufferRawOES(uint renderbuffer); [NativeName("glIsRenderbuffer")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsRenderbuffer")] @@ -62167,13 +62167,13 @@ public static MaybeBool IsSampler(uint sampler) => [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])] [NativeFunction("opengl", EntryPoint = "glIsSemaphoreEXT")] public static MaybeBool IsSemaphoreEXT(uint semaphore) => - (MaybeBool)(uint)IsSemaphoreEXTRawEXT(semaphore); + (MaybeBool)(uint)IsSemaphoreRawEXT(semaphore); [NativeName("glIsSemaphoreEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsSemaphoreEXT")] [SupportedApiProfile("gl", ["GL_EXT_semaphore"])] [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])] - public static extern uint IsSemaphoreEXTRawEXT(uint semaphore); + public static extern uint IsSemaphoreRawEXT(uint semaphore); [NativeName("glIsShader")] [SupportedApiProfile( @@ -62275,13 +62275,13 @@ public static MaybeBool IsShader(uint shader) => [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsStateNV")] public static MaybeBool IsStateNV(uint state) => - (MaybeBool)(uint)IsStateNVRawNV(state); + (MaybeBool)(uint)IsStateRawNV(state); [NativeName("glIsStateNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsStateNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] - public static extern uint IsStateNVRawNV(uint state); + public static extern uint IsStateRawNV(uint state); [NativeName("glIsSync")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsSync")] @@ -62448,25 +62448,25 @@ public static MaybeBool IsTexture(uint texture) => [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] [NativeFunction("opengl", EntryPoint = "glIsTextureEXT")] public static MaybeBool IsTextureEXT(uint texture) => - (MaybeBool)(uint)IsTextureEXTRawEXT(texture); + (MaybeBool)(uint)IsTextureRawEXT(texture); [NativeName("glIsTextureEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsTextureEXT")] [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] - public static extern uint IsTextureEXTRawEXT(uint texture); + public static extern uint IsTextureRawEXT(uint texture); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentARB")] public static MaybeBool IsTextureHandleResidentARB(ulong handle) => - (MaybeBool)(uint)IsTextureHandleResidentARBRawARB(handle); + (MaybeBool)(uint)IsTextureHandleResidentRawARB(handle); [NativeName("glIsTextureHandleResidentARB")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] - public static extern uint IsTextureHandleResidentARBRawARB(ulong handle); + public static extern uint IsTextureHandleResidentRawARB(ulong handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -62474,14 +62474,14 @@ public static MaybeBool IsTextureHandleResidentARB(ulong handle) => [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentNV")] public static MaybeBool IsTextureHandleResidentNV(ulong handle) => - (MaybeBool)(uint)IsTextureHandleResidentNVRawNV(handle); + (MaybeBool)(uint)IsTextureHandleResidentRawNV(handle); [NativeName("glIsTextureHandleResidentNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_NV_bindless_texture"])] [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] - public static extern uint IsTextureHandleResidentNVRawNV(ulong handle); + public static extern uint IsTextureHandleResidentRawNV(ulong handle); [NativeName("glIsTexture")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsTexture")] @@ -62578,12 +62578,12 @@ public static MaybeBool IsTransformFeedback(uint id) => [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] [NativeFunction("opengl", EntryPoint = "glIsTransformFeedbackNV")] public static MaybeBool IsTransformFeedbackNV(uint id) => - (MaybeBool)(uint)IsTransformFeedbackNVRawNV(id); + (MaybeBool)(uint)IsTransformFeedbackRawNV(id); [NativeName("glIsTransformFeedbackNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsTransformFeedbackNV")] [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] - public static extern uint IsTransformFeedbackNVRawNV(uint id); + public static extern uint IsTransformFeedbackRawNV(uint id); [NativeName("glIsTransformFeedback")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsTransformFeedback")] @@ -62675,25 +62675,25 @@ public static MaybeBool IsVertexArray(uint array) => [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayAPPLE")] public static MaybeBool IsVertexArrayAPPLE(uint array) => - (MaybeBool)(uint)IsVertexArrayAppleRawAPPLE(array); + (MaybeBool)(uint)IsVertexArrayRawAPPLE(array); [NativeName("glIsVertexArrayAPPLE")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsVertexArrayAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] - public static extern uint IsVertexArrayAppleRawAPPLE(uint array); + public static extern uint IsVertexArrayRawAPPLE(uint array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayOES")] public static MaybeBool IsVertexArrayOES(uint array) => - (MaybeBool)(uint)IsVertexArrayOESRawOES(array); + (MaybeBool)(uint)IsVertexArrayRawOES(array); [NativeName("glIsVertexArrayOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - public static extern uint IsVertexArrayOESRawOES(uint array); + public static extern uint IsVertexArrayRawOES(uint array); [NativeName("glIsVertexArray")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsVertexArray")] @@ -62739,12 +62739,12 @@ public static MaybeBool IsVertexArrayOES(uint array) => [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] [NativeFunction("opengl", EntryPoint = "glIsVertexAttribEnabledAPPLE")] public static MaybeBool IsVertexAttribEnabledAPPLE(uint index, uint pname) => - (MaybeBool)(uint)IsVertexAttribEnabledAppleRawAPPLE(index, pname); + (MaybeBool)(uint)IsVertexAttribEnabledRawAPPLE(index, pname); [NativeName("glIsVertexAttribEnabledAPPLE")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glIsVertexAttribEnabledAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] - public static extern uint IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname); + public static extern uint IsVertexAttribEnabledRawAPPLE(uint index, uint pname); [NativeName("glLabelObjectEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glLabelObjectEXT")] @@ -65448,13 +65448,12 @@ Constant access [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static Ptr MapObjectBufferATI(uint buffer) => - (void*)MapObjectBufferATIRawATI(buffer); + public static Ptr MapObjectBufferATI(uint buffer) => (void*)MapObjectBufferRawATI(buffer); [NativeName("glMapObjectBufferATI")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glMapObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] - public static extern void* MapObjectBufferATIRawATI(uint buffer); + public static extern void* MapObjectBufferRawATI(uint buffer); [NativeName("glMapParameterfvNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glMapParameterfvNV")] @@ -68875,18 +68874,10 @@ public static void MultiTexCoord1OES( sbyte s ) => MultiTexCoord1OES((uint)texture, s); - [NativeName("glMultiTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - public static void MultiTexCoord1BvOOES( - Constant texture, - sbyte coords - ) => MultiTexCoord1OES((uint)texture, (sbyte*)&coords); - [NativeName("glMultiTexCoord1bvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - public static extern void MultiTexCoord1OES(uint texture, sbyte* coords); + public static extern void MultiTexCoord1bvOES(uint texture, sbyte* coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -68894,17 +68885,25 @@ sbyte coords [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void MultiTexCoord1OES( + public static void MultiTexCoord1bvOES( Constant texture, Ref coords ) { fixed (sbyte* __dsl_coords = coords) { - MultiTexCoord1OES((uint)texture, __dsl_coords); + MultiTexCoord1bvOES((uint)texture, __dsl_coords); } } + [NativeName("glMultiTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] + public static void MultiTexCoord1bvOES( + Constant texture, + sbyte coords + ) => MultiTexCoord1bvOES((uint)texture, (sbyte*)&coords); + [NativeName("glMultiTexCoord1d")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glMultiTexCoord1d")] [SupportedApiProfile( @@ -69698,18 +69697,10 @@ short v public static void MultiTexCoord1XOES(Constant texture, int s) => MultiTexCoord1XOES((uint)texture, s); - [NativeName("glMultiTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - public static void MultiTexCoord1XvOOES( - Constant texture, - int coords - ) => MultiTexCoord1XOES((uint)texture, (int*)&coords); - [NativeName("glMultiTexCoord1xvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - public static extern void MultiTexCoord1XOES(uint texture, int* coords); + public static extern void MultiTexCoord1XvOES(uint texture, int* coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -69717,17 +69708,25 @@ int coords [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void MultiTexCoord1XOES( + public static void MultiTexCoord1XvOES( Constant texture, Ref coords ) { fixed (int* __dsl_coords = coords) { - MultiTexCoord1XOES((uint)texture, __dsl_coords); + MultiTexCoord1XvOES((uint)texture, __dsl_coords); } } + [NativeName("glMultiTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] + public static void MultiTexCoord1XvOES( + Constant texture, + int coords + ) => MultiTexCoord1XvOES((uint)texture, (int*)&coords); + [NativeName("glMultiTexCoord2bOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glMultiTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -89658,13 +89657,13 @@ public static void ReferencePlaneSGIX(Ref equation) [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glReleaseKeyedMutexWin32EXT")] public static MaybeBool ReleaseKeyedMutexWin32EXT(uint memory, ulong key) => - (MaybeBool)(uint)ReleaseKeyedMutexWin32EXTRawEXT(memory, key); + (MaybeBool)(uint)ReleaseKeyedMutexWin32RawEXT(memory, key); [NativeName("glReleaseKeyedMutexWin32EXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glReleaseKeyedMutexWin32EXT")] [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] - public static extern uint ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key); + public static extern uint ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key); [NativeName("glReleaseShaderCompiler")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glReleaseShaderCompiler")] @@ -93115,12 +93114,6 @@ public static void ScissorArrayNV(uint first, uint count, Ref v) [NativeFunction("opengl", EntryPoint = "glScissorArrayvNV")] public static void ScissorArrayNV(uint first, int v) => ScissorArrayNV(first, 1, (int*)&v); - [NativeName("glScissorArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - public static void ScissorArrayvOOES(uint first, int v) => - ScissorArrayOES(first, 1, (int*)&v); - [NativeName("glScissorArrayvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] @@ -93140,6 +93133,12 @@ public static void ScissorArrayOES(uint first, uint count, Ref v) } } + [NativeName("glScissorArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] + public static void ScissorArrayOES(uint first, int v) => + ScissorArrayOES(first, 1, (int*)&v); + [NativeName("glScissorExclusiveArrayvNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glScissorExclusiveArrayvNV")] [SupportedApiProfile("gl", ["GL_NV_scissor_exclusive"])] @@ -96992,12 +96991,12 @@ Ref pointer [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceAPPLE")] public static MaybeBool TestFenceAPPLE(uint fence) => - (MaybeBool)(uint)TestFenceAppleRawAPPLE(fence); + (MaybeBool)(uint)TestFenceRawAPPLE(fence); [NativeName("glTestFenceAPPLE")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTestFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] - public static extern uint TestFenceAppleRawAPPLE(uint fence); + public static extern uint TestFenceRawAPPLE(uint fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -97005,25 +97004,25 @@ public static MaybeBool TestFenceAPPLE(uint fence) => [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceNV")] public static MaybeBool TestFenceNV(uint fence) => - (MaybeBool)(uint)TestFenceNVRawNV(fence); + (MaybeBool)(uint)TestFenceRawNV(fence); [NativeName("glTestFenceNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] [SupportedApiProfile("gles2", ["GL_NV_fence"])] [SupportedApiProfile("gles1", ["GL_NV_fence"])] - public static extern uint TestFenceNVRawNV(uint fence); + public static extern uint TestFenceRawNV(uint fence); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestObjectAPPLE")] public static MaybeBool TestObjectAPPLE(uint @object, uint name) => - (MaybeBool)(uint)TestObjectAppleRawAPPLE(@object, name); + (MaybeBool)(uint)TestObjectRawAPPLE(@object, name); [NativeName("glTestObjectAPPLE")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] - public static extern uint TestObjectAppleRawAPPLE(uint @object, uint name); + public static extern uint TestObjectRawAPPLE(uint @object, uint name); [NativeName("glTexAttachMemoryNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexAttachMemoryNV")] @@ -97322,15 +97321,10 @@ Ref param1 [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] public static extern void TexCoord1OES(sbyte s); - [NativeName("glTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - public static void TexCoord1BvOOES(sbyte coords) => TexCoord1OES((sbyte*)&coords); - [NativeName("glTexCoord1bvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - public static extern void TexCoord1OES(sbyte* coords); + public static extern void TexCoord1bvOES(sbyte* coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -97338,14 +97332,19 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1OES(Ref coords) + public static void TexCoord1bvOES(Ref coords) { fixed (sbyte* __dsl_coords = coords) { - TexCoord1OES(__dsl_coords); + TexCoord1bvOES(__dsl_coords); } } + [NativeName("glTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] + public static void TexCoord1bvOES(sbyte coords) => TexCoord1bvOES((sbyte*)&coords); + [NativeName("glTexCoord1d")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexCoord1d")] [SupportedApiProfile( @@ -97880,15 +97879,10 @@ public static void TexCoord1sv(Ref v) [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] public static extern void TexCoord1XOES(int s); - [NativeName("glTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - public static void TexCoord1XvOOES(int coords) => TexCoord1XOES((int*)&coords); - [NativeName("glTexCoord1xvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - public static extern void TexCoord1XOES(int* coords); + public static extern void TexCoord1XvOES(int* coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -97896,14 +97890,19 @@ public static void TexCoord1sv(Ref v) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1XOES(Ref coords) + public static void TexCoord1XvOES(Ref coords) { fixed (int* __dsl_coords = coords) { - TexCoord1XOES(__dsl_coords); + TexCoord1XvOES(__dsl_coords); } } + [NativeName("glTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] + public static void TexCoord1XvOES(int coords) => TexCoord1XvOES((int*)&coords); + [NativeName("glTexCoord2bOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -112264,13 +112263,13 @@ public static MaybeBool UnmapBufferARB(Constant UnmapBufferOES(uint target) => - (MaybeBool)(uint)UnmapBufferOESRawOES(target); + (MaybeBool)(uint)UnmapBufferRawOES(target); [NativeName("glUnmapBufferOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glUnmapBufferOES")] [SupportedApiProfile("gles2", ["GL_OES_mapbuffer"])] [SupportedApiProfile("gles1", ["GL_OES_mapbuffer"])] - public static extern uint UnmapBufferOESRawOES(uint target); + public static extern uint UnmapBufferRawOES(uint target); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -112292,13 +112291,13 @@ public static MaybeBool UnmapNamedBuffer(uint buffer) => [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])] [NativeFunction("opengl", EntryPoint = "glUnmapNamedBufferEXT")] public static MaybeBool UnmapNamedBufferEXT(uint buffer) => - (MaybeBool)(uint)UnmapNamedBufferEXTRawEXT(buffer); + (MaybeBool)(uint)UnmapNamedBufferRawEXT(buffer); [NativeName("glUnmapNamedBufferEXT")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glUnmapNamedBufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])] [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])] - public static extern uint UnmapNamedBufferEXTRawEXT(uint buffer); + public static extern uint UnmapNamedBufferRawEXT(uint buffer); [NativeName("glUnmapNamedBuffer")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glUnmapNamedBuffer")] @@ -112898,12 +112897,12 @@ public static void VdpauInitNV(Ref vdpDevice, Ref getProcAddress) [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] [NativeFunction("opengl", EntryPoint = "glVDPAUIsSurfaceNV")] public static MaybeBool VdpauIsSurfaceNV(nint surface) => - (MaybeBool)(uint)VdpauIsSurfaceNVRawNV(surface); + (MaybeBool)(uint)VdpauIsSurfaceRawNV(surface); [NativeName("glVDPAUIsSurfaceNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glVDPAUIsSurfaceNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] - public static extern uint VdpauIsSurfaceNVRawNV(nint surface); + public static extern uint VdpauIsSurfaceRawNV(nint surface); [NativeName("glVDPAUMapSurfacesNV")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glVDPAUMapSurfacesNV")] @@ -125005,12 +125004,6 @@ public static void ViewportArrayNV(uint first, uint count, Ref v) public static void ViewportArrayNV(uint first, float v) => ViewportArrayNV(first, 1, (float*)&v); - [NativeName("glViewportArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - public static void ViewportArrayvOOES(uint first, float v) => - ViewportArrayOES(first, 1, (float*)&v); - [NativeName("glViewportArrayvOES")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] @@ -125030,6 +125023,12 @@ public static void ViewportArrayOES(uint first, uint count, Ref v) } } + [NativeName("glViewportArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] + public static void ViewportArrayOES(uint first, float v) => + ViewportArrayOES(first, 1, (float*)&v); + [NativeName("glViewportIndexedf")] [DllImport("opengl", ExactSpelling = true, EntryPoint = "glViewportIndexedf")] [SupportedApiProfile( @@ -127117,8 +127116,8 @@ public MaybeBool AcquireKeyedMutexWin32EXT(uint memory, ulong key, uint ti [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint AcquireKeyedMutexWin32EXTRawEXT(uint memory, ulong key, uint timeout) => - T.AcquireKeyedMutexWin32EXTRawEXT(memory, key, timeout); + public uint AcquireKeyedMutexWin32RawEXT(uint memory, ulong key, uint timeout) => + T.AcquireKeyedMutexWin32RawEXT(memory, key, timeout); [NativeName("glActiveProgramEXT")] [SupportedApiProfile("gl", ["GL_EXT_separate_shader_objects"])] @@ -130989,14 +130988,15 @@ byte bitmap [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void BitmapxOOES( + public void BitmapxOES( + uint width, uint height, int xorig, int yorig, int xmove, int ymove, - byte bitmap - ) => T.BitmapxOOES(height, xorig, yorig, xmove, ymove, bitmap); + byte* bitmap + ) => T.BitmapxOES(width, height, xorig, yorig, xmove, ymove, bitmap); [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -131011,7 +131011,7 @@ public void BitmapxOES( int yorig, int xmove, int ymove, - byte* bitmap + Ref bitmap ) => T.BitmapxOES(width, height, xorig, yorig, xmove, ymove, bitmap); [NativeName("glBitmapxOES")] @@ -131021,14 +131021,13 @@ public void BitmapxOES( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] public void BitmapxOES( - uint width, uint height, int xorig, int yorig, int xmove, int ymove, - Ref bitmap - ) => T.BitmapxOES(width, height, xorig, yorig, xmove, ymove, bitmap); + byte bitmap + ) => T.BitmapxOES(height, xorig, yorig, xmove, ymove, bitmap); [NativeName("glBlendBarrierKHR")] [SupportedApiProfile("gl", ["GL_KHR_blend_equation_advanced"])] @@ -146262,8 +146261,8 @@ public void DeleteFramebuffersEXT(uint framebuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteFramebuffersOOES(uint framebuffers) => - T.DeleteFramebuffersOOES(framebuffers); + public void DeleteFramebuffersOES(uint n, uint* framebuffers) => + T.DeleteFramebuffersOES(n, framebuffers); [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -146271,7 +146270,7 @@ public void DeleteFramebuffersOOES(uint framebuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteFramebuffersOES(uint n, uint* framebuffers) => + public void DeleteFramebuffersOES(uint n, Ref framebuffers) => T.DeleteFramebuffersOES(n, framebuffers); [NativeName("glDeleteFramebuffersOES")] @@ -146280,8 +146279,8 @@ public void DeleteFramebuffersOES(uint n, uint* framebuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteFramebuffersOES(uint n, Ref framebuffers) => - T.DeleteFramebuffersOES(n, framebuffers); + public void DeleteFramebuffersOES(uint framebuffers) => + T.DeleteFramebuffersOES(framebuffers); [NativeName("glDeleteLists")] [SupportedApiProfile( @@ -147116,8 +147115,8 @@ public void DeleteRenderbuffersEXT(uint renderbuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteRenderbuffersOOES(uint renderbuffers) => - T.DeleteRenderbuffersOOES(renderbuffers); + public void DeleteRenderbuffersOES(uint n, uint* renderbuffers) => + T.DeleteRenderbuffersOES(n, renderbuffers); [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -147125,7 +147124,7 @@ public void DeleteRenderbuffersOOES(uint renderbuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteRenderbuffersOES(uint n, uint* renderbuffers) => + public void DeleteRenderbuffersOES(uint n, Ref renderbuffers) => T.DeleteRenderbuffersOES(n, renderbuffers); [NativeName("glDeleteRenderbuffersOES")] @@ -147134,8 +147133,8 @@ public void DeleteRenderbuffersOES(uint n, uint* renderbuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteRenderbuffersOES(uint n, Ref renderbuffers) => - T.DeleteRenderbuffersOES(n, renderbuffers); + public void DeleteRenderbuffersOES(uint renderbuffers) => + T.DeleteRenderbuffersOES(renderbuffers); [NativeName("glDeleteSamplers")] [SupportedApiProfile( @@ -147984,7 +147983,8 @@ public void DeleteVertexArraysAPPLE(uint n, Ref arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteVertexArraysOOES(uint arrays) => T.DeleteVertexArraysOOES(arrays); + public void DeleteVertexArraysOES(uint n, uint* arrays) => + T.DeleteVertexArraysOES(n, arrays); [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -147993,7 +147993,7 @@ public void DeleteVertexArraysAPPLE(uint n, Ref arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteVertexArraysOES(uint n, uint* arrays) => + public void DeleteVertexArraysOES(uint n, Ref arrays) => T.DeleteVertexArraysOES(n, arrays); [NativeName("glDeleteVertexArraysOES")] @@ -148003,8 +148003,7 @@ public void DeleteVertexArraysOES(uint n, uint* arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void DeleteVertexArraysOES(uint n, Ref arrays) => - T.DeleteVertexArraysOES(n, arrays); + public void DeleteVertexArraysOES(uint arrays) => T.DeleteVertexArraysOES(arrays); [NativeName("glDeleteVertexShaderEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -154274,7 +154273,7 @@ public void EndVideoCaptureNV(uint video_capture_slot) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void EvalCoord1XvOOES(int coords) => T.EvalCoord1XvOOES(coords); + public void EvalCoord1XvOES(int* coords) => T.EvalCoord1XvOES(coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -154282,7 +154281,7 @@ public void EndVideoCaptureNV(uint video_capture_slot) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void EvalCoord1XOES(int* coords) => T.EvalCoord1XOES(coords); + public void EvalCoord1XvOES(Ref coords) => T.EvalCoord1XvOES(coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -154290,7 +154289,7 @@ public void EndVideoCaptureNV(uint video_capture_slot) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void EvalCoord1XOES(Ref coords) => T.EvalCoord1XOES(coords); + public void EvalCoord1XvOES(int coords) => T.EvalCoord1XvOES(coords); [NativeName("glEvalCoord2d")] [SupportedApiProfile( @@ -155099,8 +155098,7 @@ public MaybeBool ExtIsProgramBinaryQCOM(uint program) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint ExtIsProgramBinaryQCOMRawQCOM(uint program) => - T.ExtIsProgramBinaryQCOMRawQCOM(program); + public uint ExtIsProgramBinaryRawQCOM(uint program) => T.ExtIsProgramBinaryRawQCOM(program); [NativeName("glExtractComponentEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -155238,8 +155236,8 @@ public float FeedbackBuffer(Constant type) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void FeedbackBufferxOOES(uint type, int buffer) => - T.FeedbackBufferxOOES(type, buffer); + public void FeedbackBufferxOES(uint n, uint type, int* buffer) => + T.FeedbackBufferxOES(n, type, buffer); [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -155247,7 +155245,7 @@ public void FeedbackBufferxOOES(uint type, int buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void FeedbackBufferxOES(uint n, uint type, int* buffer) => + public void FeedbackBufferxOES(uint n, uint type, Ref buffer) => T.FeedbackBufferxOES(n, type, buffer); [NativeName("glFeedbackBufferxOES")] @@ -155256,8 +155254,7 @@ public void FeedbackBufferxOES(uint n, uint type, int* buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void FeedbackBufferxOES(uint n, uint type, Ref buffer) => - T.FeedbackBufferxOES(n, type, buffer); + public void FeedbackBufferxOES(uint type, int buffer) => T.FeedbackBufferxOES(type, buffer); [NativeName("glFenceSync")] [SupportedApiProfile( @@ -159410,7 +159407,8 @@ public void GenFramebuffersEXT(uint n, Ref framebuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint GenFramebuffersOOES() => T.GenFramebuffersOOES(); + public void GenFramebuffersOES(uint n, uint* framebuffers) => + T.GenFramebuffersOES(n, framebuffers); [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -159418,7 +159416,7 @@ public void GenFramebuffersEXT(uint n, Ref framebuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GenFramebuffersOES(uint n, uint* framebuffers) => + public void GenFramebuffersOES(uint n, Ref framebuffers) => T.GenFramebuffersOES(n, framebuffers); [NativeName("glGenFramebuffersOES")] @@ -159427,8 +159425,7 @@ public void GenFramebuffersOES(uint n, uint* framebuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GenFramebuffersOES(uint n, Ref framebuffers) => - T.GenFramebuffersOES(n, framebuffers); + public uint GenFramebuffersOES() => T.GenFramebuffersOES(); [NativeName("glGenLists")] [SupportedApiProfile( @@ -160130,7 +160127,8 @@ public void GenRenderbuffersEXT(uint n, Ref renderbuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint GenRenderbuffersOOES() => T.GenRenderbuffersOOES(); + public void GenRenderbuffersOES(uint n, uint* renderbuffers) => + T.GenRenderbuffersOES(n, renderbuffers); [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -160138,7 +160136,7 @@ public void GenRenderbuffersEXT(uint n, Ref renderbuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GenRenderbuffersOES(uint n, uint* renderbuffers) => + public void GenRenderbuffersOES(uint n, Ref renderbuffers) => T.GenRenderbuffersOES(n, renderbuffers); [NativeName("glGenRenderbuffersOES")] @@ -160147,8 +160145,7 @@ public void GenRenderbuffersOES(uint n, uint* renderbuffers) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GenRenderbuffersOES(uint n, Ref renderbuffers) => - T.GenRenderbuffersOES(n, renderbuffers); + public uint GenRenderbuffersOES() => T.GenRenderbuffersOES(); [NativeName("glGenSamplers")] [SupportedApiProfile( @@ -160839,7 +160836,7 @@ public void GenVertexArraysAPPLE(uint n, Ref arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint GenVertexArraysOOES() => T.GenVertexArraysOOES(); + public void GenVertexArraysOES(uint n, uint* arrays) => T.GenVertexArraysOES(n, arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -160848,7 +160845,7 @@ public void GenVertexArraysAPPLE(uint n, Ref arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GenVertexArraysOES(uint n, uint* arrays) => T.GenVertexArraysOES(n, arrays); + public void GenVertexArraysOES(uint n, Ref arrays) => T.GenVertexArraysOES(n, arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -160857,7 +160854,7 @@ public void GenVertexArraysAPPLE(uint n, Ref arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GenVertexArraysOES(uint n, Ref arrays) => T.GenVertexArraysOES(n, arrays); + public uint GenVertexArraysOES() => T.GenVertexArraysOES(); [NativeName("glGenVertexShadersEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -164888,8 +164885,8 @@ Ref @params [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public int GetConvolutionParameterxvOOES(uint target) => - T.GetConvolutionParameterxvOOES(target); + public void GetConvolutionParameterxOES(uint target, uint pname, int* @params) => + T.GetConvolutionParameterxOES(target, pname, @params); [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -164897,7 +164894,7 @@ public int GetConvolutionParameterxvOOES(uint target) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GetConvolutionParameterxOES(uint target, uint pname, int* @params) => + public void GetConvolutionParameterxOES(uint target, uint pname, Ref @params) => T.GetConvolutionParameterxOES(target, pname, @params); [NativeName("glGetConvolutionParameterxvOES")] @@ -164906,8 +164903,8 @@ public void GetConvolutionParameterxOES(uint target, uint pname, int* @params) = [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void GetConvolutionParameterxOES(uint target, uint pname, Ref @params) => - T.GetConvolutionParameterxOES(target, pname, @params); + public int GetConvolutionParameterxOES(uint target) => + T.GetConvolutionParameterxOES(target); [NativeName("glGetCoverageModulationTableNV")] [SupportedApiProfile("gl", ["GL_NV_framebuffer_mixed_samples"])] @@ -166981,7 +166978,7 @@ public Constant GetGraphicsResetStatusARB() = [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint GetGraphicsResetStatusARBRawARB() => T.GetGraphicsResetStatusARBRawARB(); + public uint GetGraphicsResetStatusRawARB() => T.GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] @@ -167000,7 +166997,7 @@ public Constant GetGraphicsResetStatusEXT() = [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint GetGraphicsResetStatusEXTRawEXT() => T.GetGraphicsResetStatusEXTRawEXT(); + public uint GetGraphicsResetStatusRawEXT() => T.GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] @@ -167017,7 +167014,7 @@ public Constant GetGraphicsResetStatusKHR() = [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint GetGraphicsResetStatusKHRRawKHR() => T.GetGraphicsResetStatusKHRRawKHR(); + public uint GetGraphicsResetStatusRawKHR() => T.GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatus")] [SupportedApiProfile( @@ -184425,8 +184422,8 @@ public Ptr ImportSyncEXT(uint external_sync_type, nint external_sync, uint [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public Sync* ImportSyncEXTRawEXT(uint external_sync_type, nint external_sync, uint flags) => - T.ImportSyncEXTRawEXT(external_sync_type, external_sync, flags); + public Sync* ImportSyncRawEXT(uint external_sync_type, nint external_sync, uint flags) => + T.ImportSyncRawEXT(external_sync_type, external_sync, flags); [NativeName("glIndexd")] [SupportedApiProfile( @@ -185266,7 +185263,7 @@ int ptrstride [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void IndexxvOOES(int component) => T.IndexxvOOES(component); + public void IndexxvOES(int* component) => T.IndexxvOES(component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -185274,7 +185271,7 @@ int ptrstride [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void IndexxOES(int* component) => T.IndexxOES(component); + public void IndexxvOES(Ref component) => T.IndexxvOES(component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -185282,7 +185279,7 @@ int ptrstride [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void IndexxOES(Ref component) => T.IndexxOES(component); + public void IndexxvOES(int component) => T.IndexxvOES(component); [NativeName("glInitNames")] [SupportedApiProfile( @@ -186433,7 +186430,7 @@ uint depth [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsAsyncMarkerSGIXRawSGIX(uint marker) => T.IsAsyncMarkerSGIXRawSGIX(marker); + public uint IsAsyncMarkerRawSGIX(uint marker) => T.IsAsyncMarkerRawSGIX(marker); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -186502,7 +186499,7 @@ uint depth [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsBufferARBRawARB(uint buffer) => T.IsBufferARBRawARB(buffer); + public uint IsBufferRawARB(uint buffer) => T.IsBufferRawARB(buffer); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -186573,7 +186570,7 @@ uint depth [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsBufferResidentNVRawNV(uint target) => T.IsBufferResidentNVRawNV(target); + public uint IsBufferResidentRawNV(uint target) => T.IsBufferResidentRawNV(target); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -186591,7 +186588,7 @@ uint depth [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsCommandListNVRawNV(uint list) => T.IsCommandListNVRawNV(list); + public uint IsCommandListRawNV(uint list) => T.IsCommandListRawNV(list); [NativeName("glIsEnabled")] [SupportedApiProfile( @@ -186889,7 +186886,7 @@ public MaybeBool IsEnabledOES(Constant target, ui [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsFenceAppleRawAPPLE(uint fence) => T.IsFenceAppleRawAPPLE(fence); + public uint IsFenceRawAPPLE(uint fence) => T.IsFenceRawAPPLE(fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -186909,7 +186906,7 @@ public MaybeBool IsEnabledOES(Constant target, ui [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsFenceNVRawNV(uint fence) => T.IsFenceNVRawNV(fence); + public uint IsFenceRawNV(uint fence) => T.IsFenceRawNV(fence); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -186974,8 +186971,7 @@ public MaybeBool IsFramebufferEXT(uint framebuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsFramebufferEXTRawEXT(uint framebuffer) => - T.IsFramebufferEXTRawEXT(framebuffer); + public uint IsFramebufferRawEXT(uint framebuffer) => T.IsFramebufferRawEXT(framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -186992,8 +186988,7 @@ public MaybeBool IsFramebufferOES(uint framebuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsFramebufferOESRawOES(uint framebuffer) => - T.IsFramebufferOESRawOES(framebuffer); + public uint IsFramebufferRawOES(uint framebuffer) => T.IsFramebufferRawOES(framebuffer); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -187060,8 +187055,8 @@ public MaybeBool IsImageHandleResidentARB(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsImageHandleResidentARBRawARB(ulong handle) => - T.IsImageHandleResidentARBRawARB(handle); + public uint IsImageHandleResidentRawARB(ulong handle) => + T.IsImageHandleResidentRawARB(handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -187082,8 +187077,8 @@ public MaybeBool IsImageHandleResidentNV(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsImageHandleResidentNVRawNV(ulong handle) => - T.IsImageHandleResidentNVRawNV(handle); + public uint IsImageHandleResidentRawNV(ulong handle) => + T.IsImageHandleResidentRawNV(handle); [NativeName("glIsList")] [SupportedApiProfile( @@ -187166,8 +187161,7 @@ public MaybeBool IsMemoryObjectEXT(uint memoryObject) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsMemoryObjectEXTRawEXT(uint memoryObject) => - T.IsMemoryObjectEXTRawEXT(memoryObject); + public uint IsMemoryObjectRawEXT(uint memoryObject) => T.IsMemoryObjectRawEXT(memoryObject); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] @@ -187184,8 +187178,7 @@ public MaybeBool IsNameAMD(uint identifier, uint name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsNameAMDRawAMD(uint identifier, uint name) => - T.IsNameAMDRawAMD(identifier, name); + public uint IsNameRawAMD(uint identifier, uint name) => T.IsNameRawAMD(identifier, name); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -187204,8 +187197,7 @@ public MaybeBool IsNamedBufferResidentNV(uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsNamedBufferResidentNVRawNV(uint buffer) => - T.IsNamedBufferResidentNVRawNV(buffer); + public uint IsNamedBufferResidentRawNV(uint buffer) => T.IsNamedBufferResidentRawNV(buffer); [NativeName("glIsNamedStringARB")] [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])] @@ -187240,7 +187232,7 @@ public MaybeBool IsNamedStringARB(int namelen, Ref name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsObjectBufferATIRawATI(uint buffer) => T.IsObjectBufferATIRawATI(buffer); + public uint IsObjectBufferRawATI(uint buffer) => T.IsObjectBufferRawATI(buffer); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] @@ -187256,7 +187248,7 @@ public MaybeBool IsNamedStringARB(int namelen, Ref name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsOcclusionQueryNVRawNV(uint id) => T.IsOcclusionQueryNVRawNV(id); + public uint IsOcclusionQueryRawNV(uint id) => T.IsOcclusionQueryRawNV(id); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -187276,7 +187268,7 @@ public MaybeBool IsNamedStringARB(int namelen, Ref name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsPathNVRawNV(uint path) => T.IsPathNVRawNV(path); + public uint IsPathRawNV(uint path) => T.IsPathRawNV(path); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -187297,8 +187289,8 @@ public MaybeBool IsPointInFillPathNV(uint path, uint mask, float x, float [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y) => - T.IsPointInFillPathNVRawNV(path, mask, x, y); + public uint IsPointInFillPathRawNV(uint path, uint mask, float x, float y) => + T.IsPointInFillPathRawNV(path, mask, x, y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -187319,8 +187311,8 @@ public MaybeBool IsPointInStrokePathNV(uint path, float x, float y) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsPointInStrokePathNVRawNV(uint path, float x, float y) => - T.IsPointInStrokePathNVRawNV(path, x, y); + public uint IsPointInStrokePathRawNV(uint path, float x, float y) => + T.IsPointInStrokePathRawNV(path, x, y); [NativeName("glIsProgram")] [SupportedApiProfile( @@ -187386,7 +187378,7 @@ public uint IsPointInStrokePathNVRawNV(uint path, float x, float y) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsProgramARBRawARB(uint program) => T.IsProgramARBRawARB(program); + public uint IsProgramRawARB(uint program) => T.IsProgramRawARB(program); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] @@ -187402,7 +187394,7 @@ public uint IsPointInStrokePathNVRawNV(uint path, float x, float y) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsProgramNVRawNV(uint id) => T.IsProgramNVRawNV(id); + public uint IsProgramRawNV(uint id) => T.IsProgramRawNV(id); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -187452,8 +187444,7 @@ public MaybeBool IsProgramPipelineEXT(uint pipeline) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsProgramPipelineEXTRawEXT(uint pipeline) => - T.IsProgramPipelineEXTRawEXT(pipeline); + public uint IsProgramPipelineRawEXT(uint pipeline) => T.IsProgramPipelineRawEXT(pipeline); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -187599,7 +187590,7 @@ public uint IsProgramPipelineEXTRawEXT(uint pipeline) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsQueryARBRawARB(uint id) => T.IsQueryARBRawARB(id); + public uint IsQueryRawARB(uint id) => T.IsQueryRawARB(id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -187621,7 +187612,7 @@ public uint IsProgramPipelineEXTRawEXT(uint pipeline) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsQueryEXTRawEXT(uint id) => T.IsQueryEXTRawEXT(id); + public uint IsQueryRawEXT(uint id) => T.IsQueryRawEXT(id); [NativeName("glIsQuery")] [SupportedApiProfile( @@ -187733,8 +187724,7 @@ public MaybeBool IsRenderbufferEXT(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsRenderbufferEXTRawEXT(uint renderbuffer) => - T.IsRenderbufferEXTRawEXT(renderbuffer); + public uint IsRenderbufferRawEXT(uint renderbuffer) => T.IsRenderbufferRawEXT(renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -187751,8 +187741,7 @@ public MaybeBool IsRenderbufferOES(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsRenderbufferOESRawOES(uint renderbuffer) => - T.IsRenderbufferOESRawOES(renderbuffer); + public uint IsRenderbufferRawOES(uint renderbuffer) => T.IsRenderbufferRawOES(renderbuffer); [NativeName("glIsRenderbuffer")] [SupportedApiProfile( @@ -187912,7 +187901,7 @@ public uint IsRenderbufferOESRawOES(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsSemaphoreEXTRawEXT(uint semaphore) => T.IsSemaphoreEXTRawEXT(semaphore); + public uint IsSemaphoreRawEXT(uint semaphore) => T.IsSemaphoreRawEXT(semaphore); [NativeName("glIsShader")] [SupportedApiProfile( @@ -188030,7 +188019,7 @@ public uint IsRenderbufferOESRawOES(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsStateNVRawNV(uint state) => T.IsStateNVRawNV(state); + public uint IsStateRawNV(uint state) => T.IsStateRawNV(state); [NativeName("glIsSync")] [SupportedApiProfile( @@ -188203,7 +188192,7 @@ public uint IsRenderbufferOESRawOES(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsTextureEXTRawEXT(uint texture) => T.IsTextureEXTRawEXT(texture); + public uint IsTextureRawEXT(uint texture) => T.IsTextureRawEXT(texture); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -188222,8 +188211,8 @@ public MaybeBool IsTextureHandleResidentARB(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsTextureHandleResidentARBRawARB(ulong handle) => - T.IsTextureHandleResidentARBRawARB(handle); + public uint IsTextureHandleResidentRawARB(ulong handle) => + T.IsTextureHandleResidentRawARB(handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -188244,8 +188233,8 @@ public MaybeBool IsTextureHandleResidentNV(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsTextureHandleResidentNVRawNV(ulong handle) => - T.IsTextureHandleResidentNVRawNV(handle); + public uint IsTextureHandleResidentRawNV(ulong handle) => + T.IsTextureHandleResidentRawNV(handle); [NativeName("glIsTexture")] [SupportedApiProfile( @@ -188357,7 +188346,7 @@ public uint IsTextureHandleResidentNVRawNV(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsTransformFeedbackNVRawNV(uint id) => T.IsTransformFeedbackNVRawNV(id); + public uint IsTransformFeedbackRawNV(uint id) => T.IsTransformFeedbackRawNV(id); [NativeName("glIsTransformFeedback")] [SupportedApiProfile( @@ -188470,7 +188459,7 @@ Constant cap [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsVertexArrayAppleRawAPPLE(uint array) => T.IsVertexArrayAppleRawAPPLE(array); + public uint IsVertexArrayRawAPPLE(uint array) => T.IsVertexArrayRawAPPLE(array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -188488,7 +188477,7 @@ Constant cap [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsVertexArrayOESRawOES(uint array) => T.IsVertexArrayOESRawOES(array); + public uint IsVertexArrayRawOES(uint array) => T.IsVertexArrayRawOES(array); [NativeName("glIsVertexArray")] [SupportedApiProfile( @@ -188548,8 +188537,8 @@ public MaybeBool IsVertexAttribEnabledAPPLE(uint index, uint pname) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname) => - T.IsVertexAttribEnabledAppleRawAPPLE(index, pname); + public uint IsVertexAttribEnabledRawAPPLE(uint index, uint pname) => + T.IsVertexAttribEnabledRawAPPLE(index, pname); [NativeName("glLabelObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_debug_label"])] @@ -191374,7 +191363,7 @@ Constant access [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void* MapObjectBufferATIRawATI(uint buffer) => T.MapObjectBufferATIRawATI(buffer); + public void* MapObjectBufferRawATI(uint buffer) => T.MapObjectBufferRawATI(buffer); [NativeName("glMapParameterfvNV")] [SupportedApiProfile("gl", ["GL_NV_evaluators"])] @@ -194709,10 +194698,8 @@ public void MultiTexCoord1OES(Constant texture, sbyte [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void MultiTexCoord1BvOOES( - Constant texture, - sbyte coords - ) => T.MultiTexCoord1BvOOES(texture, coords); + public void MultiTexCoord1bvOES(uint texture, sbyte* coords) => + T.MultiTexCoord1bvOES(texture, coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -194720,8 +194707,10 @@ sbyte coords [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void MultiTexCoord1OES(uint texture, sbyte* coords) => - T.MultiTexCoord1OES(texture, coords); + public void MultiTexCoord1bvOES( + Constant texture, + Ref coords + ) => T.MultiTexCoord1bvOES(texture, coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -194729,10 +194718,10 @@ public void MultiTexCoord1OES(uint texture, sbyte* coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void MultiTexCoord1OES( + public void MultiTexCoord1bvOES( Constant texture, - Ref coords - ) => T.MultiTexCoord1OES(texture, coords); + sbyte coords + ) => T.MultiTexCoord1bvOES(texture, coords); [NativeName("glMultiTexCoord1d")] [SupportedApiProfile( @@ -195566,8 +195555,8 @@ public void MultiTexCoord1XOES(Constant texture, int [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void MultiTexCoord1XvOOES(Constant texture, int coords) => - T.MultiTexCoord1XvOOES(texture, coords); + public void MultiTexCoord1XvOES(uint texture, int* coords) => + T.MultiTexCoord1XvOES(texture, coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -195575,8 +195564,10 @@ public void MultiTexCoord1XvOOES(Constant texture, in [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void MultiTexCoord1XOES(uint texture, int* coords) => - T.MultiTexCoord1XOES(texture, coords); + public void MultiTexCoord1XvOES( + Constant texture, + Ref coords + ) => T.MultiTexCoord1XvOES(texture, coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -195584,10 +195575,8 @@ public void MultiTexCoord1XOES(uint texture, int* coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void MultiTexCoord1XOES( - Constant texture, - Ref coords - ) => T.MultiTexCoord1XOES(texture, coords); + public void MultiTexCoord1XvOES(Constant texture, int coords) => + T.MultiTexCoord1XvOES(texture, coords); [NativeName("glMultiTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -215420,8 +215409,8 @@ public MaybeBool ReleaseKeyedMutexWin32EXT(uint memory, ulong key) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key) => - T.ReleaseKeyedMutexWin32EXTRawEXT(memory, key); + public uint ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key) => + T.ReleaseKeyedMutexWin32RawEXT(memory, key); [NativeName("glReleaseShaderCompiler")] [SupportedApiProfile( @@ -218592,7 +218581,8 @@ public void ScissorArrayNV(uint first, uint count, Ref v) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void ScissorArrayvOOES(uint first, int v) => T.ScissorArrayvOOES(first, v); + public void ScissorArrayOES(uint first, uint count, int* v) => + T.ScissorArrayOES(first, count, v); [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] @@ -218600,7 +218590,7 @@ public void ScissorArrayNV(uint first, uint count, Ref v) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void ScissorArrayOES(uint first, uint count, int* v) => + public void ScissorArrayOES(uint first, uint count, Ref v) => T.ScissorArrayOES(first, count, v); [NativeName("glScissorArrayvOES")] @@ -218609,8 +218599,7 @@ public void ScissorArrayOES(uint first, uint count, int* v) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void ScissorArrayOES(uint first, uint count, Ref v) => - T.ScissorArrayOES(first, count, v); + public void ScissorArrayOES(uint first, int v) => T.ScissorArrayOES(first, v); [NativeName("glScissorExclusiveArrayvNV")] [SupportedApiProfile("gl", ["GL_NV_scissor_exclusive"])] @@ -222536,7 +222525,7 @@ Ref pointer [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint TestFenceAppleRawAPPLE(uint fence) => T.TestFenceAppleRawAPPLE(fence); + public uint TestFenceRawAPPLE(uint fence) => T.TestFenceRawAPPLE(fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -222556,7 +222545,7 @@ Ref pointer [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint TestFenceNVRawNV(uint fence) => T.TestFenceNVRawNV(fence); + public uint TestFenceRawNV(uint fence) => T.TestFenceRawNV(fence); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -222573,8 +222562,8 @@ public MaybeBool TestObjectAPPLE(uint @object, uint name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint TestObjectAppleRawAPPLE(uint @object, uint name) => - T.TestObjectAppleRawAPPLE(@object, name); + public uint TestObjectRawAPPLE(uint @object, uint name) => + T.TestObjectRawAPPLE(@object, name); [NativeName("glTexAttachMemoryNV")] [SupportedApiProfile("gl", ["GL_NV_memory_attachment"])] @@ -222931,7 +222920,7 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void TexCoord1BvOOES(sbyte coords) => T.TexCoord1BvOOES(coords); + public void TexCoord1bvOES(sbyte* coords) => T.TexCoord1bvOES(coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -222939,7 +222928,7 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void TexCoord1OES(sbyte* coords) => T.TexCoord1OES(coords); + public void TexCoord1bvOES(Ref coords) => T.TexCoord1bvOES(coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -222947,7 +222936,7 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void TexCoord1OES(Ref coords) => T.TexCoord1OES(coords); + public void TexCoord1bvOES(sbyte coords) => T.TexCoord1bvOES(coords); [NativeName("glTexCoord1d")] [SupportedApiProfile( @@ -223507,7 +223496,7 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void TexCoord1XvOOES(int coords) => T.TexCoord1XvOOES(coords); + public void TexCoord1XvOES(int* coords) => T.TexCoord1XvOES(coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -223515,7 +223504,7 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void TexCoord1XOES(int* coords) => T.TexCoord1XOES(coords); + public void TexCoord1XvOES(Ref coords) => T.TexCoord1XvOES(coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -223523,7 +223512,7 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void TexCoord1XOES(Ref coords) => T.TexCoord1XOES(coords); + public void TexCoord1XvOES(int coords) => T.TexCoord1XvOES(coords); [NativeName("glTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -238488,7 +238477,7 @@ public MaybeBool UnmapBufferARB(Constant targe [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint UnmapBufferOESRawOES(uint target) => T.UnmapBufferOESRawOES(target); + public uint UnmapBufferRawOES(uint target) => T.UnmapBufferRawOES(target); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -238523,7 +238512,7 @@ public MaybeBool UnmapBufferARB(Constant targe [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint UnmapNamedBufferEXTRawEXT(uint buffer) => T.UnmapNamedBufferEXTRawEXT(buffer); + public uint UnmapNamedBufferRawEXT(uint buffer) => T.UnmapNamedBufferRawEXT(buffer); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -239174,7 +239163,7 @@ public void VdpauInitNV(Ref vdpDevice, Ref getProcAddress) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public uint VdpauIsSurfaceNVRawNV(nint surface) => T.VdpauIsSurfaceNVRawNV(surface); + public uint VdpauIsSurfaceRawNV(nint surface) => T.VdpauIsSurfaceRawNV(surface); [NativeName("glVDPAUMapSurfacesNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] @@ -251377,7 +251366,8 @@ public void ViewportArrayNV(uint first, uint count, Ref v) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void ViewportArrayvOOES(uint first, float v) => T.ViewportArrayvOOES(first, v); + public void ViewportArrayOES(uint first, uint count, float* v) => + T.ViewportArrayOES(first, count, v); [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] @@ -251385,7 +251375,7 @@ public void ViewportArrayNV(uint first, uint count, Ref v) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void ViewportArrayOES(uint first, uint count, float* v) => + public void ViewportArrayOES(uint first, uint count, Ref v) => T.ViewportArrayOES(first, count, v); [NativeName("glViewportArrayvOES")] @@ -251394,8 +251384,7 @@ public void ViewportArrayOES(uint first, uint count, float* v) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public void ViewportArrayOES(uint first, uint count, Ref v) => - T.ViewportArrayOES(first, count, v); + public void ViewportArrayOES(uint first, float v) => T.ViewportArrayOES(first, v); [NativeName("glViewportIndexedf")] [SupportedApiProfile( @@ -253422,8 +253411,8 @@ uint timeout [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint AcquireKeyedMutexWin32EXTRawEXT(uint memory, ulong key, uint timeout) => - Underlying.Value!.AcquireKeyedMutexWin32EXTRawEXT(memory, key, timeout); + public static uint AcquireKeyedMutexWin32RawEXT(uint memory, ulong key, uint timeout) => + Underlying.Value!.AcquireKeyedMutexWin32RawEXT(memory, key, timeout); [NativeName("glActiveProgramEXT")] [SupportedApiProfile("gl", ["GL_EXT_separate_shader_objects"])] @@ -257579,14 +257568,15 @@ byte bitmap [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void BitmapxOOES( + public static void BitmapxOES( + uint width, uint height, int xorig, int yorig, int xmove, int ymove, - byte bitmap - ) => Underlying.Value!.BitmapxOOES(height, xorig, yorig, xmove, ymove, bitmap); + byte* bitmap + ) => Underlying.Value!.BitmapxOES(width, height, xorig, yorig, xmove, ymove, bitmap); [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -257601,8 +257591,14 @@ public static void BitmapxOES( int yorig, int xmove, int ymove, - byte* bitmap - ) => Underlying.Value!.BitmapxOES(width, height, xorig, yorig, xmove, ymove, bitmap); + Ref bitmap + ) + { + fixed (byte* __dsl_bitmap = bitmap) + { + BitmapxOES(width, height, xorig, yorig, xmove, ymove, __dsl_bitmap); + } + } [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -257611,20 +257607,13 @@ public static void BitmapxOES( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] public static void BitmapxOES( - uint width, uint height, int xorig, int yorig, int xmove, int ymove, - Ref bitmap - ) - { - fixed (byte* __dsl_bitmap = bitmap) - { - BitmapxOES(width, height, xorig, yorig, xmove, ymove, __dsl_bitmap); - } - } + byte bitmap + ) => Underlying.Value!.BitmapxOES(height, xorig, yorig, xmove, ymove, bitmap); [NativeName("glBlendBarrierKHR")] [SupportedApiProfile("gl", ["GL_KHR_blend_equation_advanced"])] @@ -274654,15 +274643,6 @@ public static void DeleteFramebuffersEXT(uint n, Ref framebuffers) public static void DeleteFramebuffersEXT(uint framebuffers) => Underlying.Value!.DeleteFramebuffersEXT(framebuffers); - [NativeName("glDeleteFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void DeleteFramebuffersOOES(uint framebuffers) => - Underlying.Value!.DeleteFramebuffersOOES(framebuffers); - [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] @@ -274686,6 +274666,15 @@ public static void DeleteFramebuffersOES(uint n, Ref framebuffers) } } + [NativeName("glDeleteFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void DeleteFramebuffersOES(uint framebuffers) => + Underlying.Value!.DeleteFramebuffersOES(framebuffers); + [NativeName("glDeleteLists")] [SupportedApiProfile( "gl", @@ -275613,15 +275602,6 @@ public static void DeleteRenderbuffersEXT(uint n, Ref renderbuffers) public static void DeleteRenderbuffersEXT(uint renderbuffers) => Underlying.Value!.DeleteRenderbuffersEXT(renderbuffers); - [NativeName("glDeleteRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void DeleteRenderbuffersOOES(uint renderbuffers) => - Underlying.Value!.DeleteRenderbuffersOOES(renderbuffers); - [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] @@ -275645,6 +275625,15 @@ public static void DeleteRenderbuffersOES(uint n, Ref renderbuffers) } } + [NativeName("glDeleteRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void DeleteRenderbuffersOES(uint renderbuffers) => + Underlying.Value!.DeleteRenderbuffersOES(renderbuffers); + [NativeName("glDeleteSamplers")] [SupportedApiProfile( "gl", @@ -276558,16 +276547,6 @@ public static void DeleteVertexArraysAPPLE(uint n, Ref arrays) public static void DeleteVertexArraysAPPLE(uint arrays) => Underlying.Value!.DeleteVertexArraysAPPLE(arrays); - [NativeName("glDeleteVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void DeleteVertexArraysOOES(uint arrays) => - Underlying.Value!.DeleteVertexArraysOOES(arrays); - [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] @@ -276593,6 +276572,16 @@ public static void DeleteVertexArraysOES(uint n, Ref arrays) } } + [NativeName("glDeleteVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void DeleteVertexArraysOES(uint arrays) => + Underlying.Value!.DeleteVertexArraysOES(arrays); + [NativeName("glDeleteVertexShaderEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")] @@ -283446,8 +283435,8 @@ public static void EvalCoord1fv(Ref u) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void EvalCoord1XvOOES(int coords) => - Underlying.Value!.EvalCoord1XvOOES(coords); + public static void EvalCoord1XvOES(int* coords) => + Underlying.Value!.EvalCoord1XvOES(coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -283455,7 +283444,13 @@ public static void EvalCoord1XvOOES(int coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void EvalCoord1XOES(int* coords) => Underlying.Value!.EvalCoord1XOES(coords); + public static void EvalCoord1XvOES(Ref coords) + { + fixed (int* __dsl_coords = coords) + { + EvalCoord1XvOES(__dsl_coords); + } + } [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -283463,13 +283458,7 @@ public static void EvalCoord1XvOOES(int coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void EvalCoord1XOES(Ref coords) - { - fixed (int* __dsl_coords = coords) - { - EvalCoord1XOES(__dsl_coords); - } - } + public static void EvalCoord1XvOES(int coords) => Underlying.Value!.EvalCoord1XvOES(coords); [NativeName("glEvalCoord2d")] [SupportedApiProfile( @@ -284430,8 +284419,8 @@ public static MaybeBool ExtIsProgramBinaryQCOM(uint program) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint ExtIsProgramBinaryQCOMRawQCOM(uint program) => - Underlying.Value!.ExtIsProgramBinaryQCOMRawQCOM(program); + public static uint ExtIsProgramBinaryRawQCOM(uint program) => + Underlying.Value!.ExtIsProgramBinaryRawQCOM(program); [NativeName("glExtractComponentEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -284577,15 +284566,6 @@ public static float FeedbackBuffer(Constant type) return buffer; } - [NativeName("glFeedbackBufferxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void FeedbackBufferxOOES(uint type, int buffer) => - Underlying.Value!.FeedbackBufferxOOES(type, buffer); - [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] @@ -284609,6 +284589,15 @@ public static void FeedbackBufferxOES(uint n, uint type, Ref buffer) } } + [NativeName("glFeedbackBufferxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void FeedbackBufferxOES(uint type, int buffer) => + Underlying.Value!.FeedbackBufferxOES(type, buffer); + [NativeName("glFenceSync")] [SupportedApiProfile( "gl", @@ -289170,19 +289159,6 @@ public static uint GenFramebuffersEXT() return framebuffers; } - [NativeName("glGenFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static uint GenFramebuffersOOES() - { - uint framebuffers = default; - GenFramebuffersOES(1, (uint*)&framebuffers); - return framebuffers; - } - [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] @@ -289206,6 +289182,19 @@ public static void GenFramebuffersOES(uint n, Ref framebuffers) } } + [NativeName("glGenFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static uint GenFramebuffersOES() + { + uint framebuffers = default; + GenFramebuffersOES(1, (uint*)&framebuffers); + return framebuffers; + } + [NativeName("glGenLists")] [SupportedApiProfile( "gl", @@ -290042,19 +290031,6 @@ public static uint GenRenderbuffersEXT() return renderbuffers; } - [NativeName("glGenRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static uint GenRenderbuffersOOES() - { - uint renderbuffers = default; - GenRenderbuffersOES(1, (uint*)&renderbuffers); - return renderbuffers; - } - [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] @@ -290078,6 +290054,19 @@ public static void GenRenderbuffersOES(uint n, Ref renderbuffers) } } + [NativeName("glGenRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static uint GenRenderbuffersOES() + { + uint renderbuffers = default; + GenRenderbuffersOES(1, (uint*)&renderbuffers); + return renderbuffers; + } + [NativeName("glGenSamplers")] [SupportedApiProfile( "gl", @@ -290864,12 +290853,8 @@ public static uint GenVertexArraysAPPLE() [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint GenVertexArraysOOES() - { - uint arrays = default; - GenVertexArraysOES(1, (uint*)&arrays); - return arrays; - } + public static void GenVertexArraysOES(uint n, uint* arrays) => + Underlying.Value!.GenVertexArraysOES(n, arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -290878,8 +290863,13 @@ public static uint GenVertexArraysOOES() [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void GenVertexArraysOES(uint n, uint* arrays) => - Underlying.Value!.GenVertexArraysOES(n, arrays); + public static void GenVertexArraysOES(uint n, Ref arrays) + { + fixed (uint* __dsl_arrays = arrays) + { + GenVertexArraysOES(n, __dsl_arrays); + } + } [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -290888,12 +290878,11 @@ public static void GenVertexArraysOES(uint n, uint* arrays) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void GenVertexArraysOES(uint n, Ref arrays) + public static uint GenVertexArraysOES() { - fixed (uint* __dsl_arrays = arrays) - { - GenVertexArraysOES(n, __dsl_arrays); - } + uint arrays = default; + GenVertexArraysOES(1, (uint*)&arrays); + return arrays; } [NativeName("glGenVertexShadersEXT")] @@ -295925,19 +295914,6 @@ Ref @params } } - [NativeName("glGetConvolutionParameterxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static int GetConvolutionParameterxvOOES(uint target) - { - int @params = default; - GetConvolutionParameterxOES(target, 1, (int*)&@params); - return @params; - } - [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] @@ -295961,6 +295937,19 @@ public static void GetConvolutionParameterxOES(uint target, uint pname, Ref } } + [NativeName("glGetConvolutionParameterxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static int GetConvolutionParameterxOES(uint target) + { + int @params = default; + GetConvolutionParameterxOES(target, 1, (int*)&@params); + return @params; + } + [NativeName("glGetCoverageModulationTableNV")] [SupportedApiProfile("gl", ["GL_NV_framebuffer_mixed_samples"])] [SupportedApiProfile("glcore", ["GL_NV_framebuffer_mixed_samples"])] @@ -298523,8 +298512,8 @@ public static Constant GetGraphicsResetStatus [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint GetGraphicsResetStatusARBRawARB() => - Underlying.Value!.GetGraphicsResetStatusARBRawARB(); + public static uint GetGraphicsResetStatusRawARB() => + Underlying.Value!.GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] @@ -298543,8 +298532,8 @@ public static Constant GetGraphicsResetStatus [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint GetGraphicsResetStatusEXTRawEXT() => - Underlying.Value!.GetGraphicsResetStatusEXTRawEXT(); + public static uint GetGraphicsResetStatusRawEXT() => + Underlying.Value!.GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] @@ -298561,8 +298550,8 @@ public static Constant GetGraphicsResetStatus [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint GetGraphicsResetStatusKHRRawKHR() => - Underlying.Value!.GetGraphicsResetStatusKHRRawKHR(); + public static uint GetGraphicsResetStatusRawKHR() => + Underlying.Value!.GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatus")] [SupportedApiProfile( @@ -319794,11 +319783,11 @@ uint flags [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static Sync* ImportSyncEXTRawEXT( + public static Sync* ImportSyncRawEXT( uint external_sync_type, nint external_sync, uint flags - ) => Underlying.Value!.ImportSyncEXTRawEXT(external_sync_type, external_sync, flags); + ) => Underlying.Value!.ImportSyncRawEXT(external_sync_type, external_sync, flags); [NativeName("glIndexd")] [SupportedApiProfile( @@ -320693,7 +320682,7 @@ public static void Indexubv(Ref c) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void IndexxvOOES(int component) => Underlying.Value!.IndexxvOOES(component); + public static void IndexxvOES(int* component) => Underlying.Value!.IndexxvOES(component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -320701,7 +320690,13 @@ public static void Indexubv(Ref c) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void IndexxOES(int* component) => Underlying.Value!.IndexxOES(component); + public static void IndexxvOES(Ref component) + { + fixed (int* __dsl_component = component) + { + IndexxvOES(__dsl_component); + } + } [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -320709,13 +320704,7 @@ public static void Indexubv(Ref c) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void IndexxOES(Ref component) - { - fixed (int* __dsl_component = component) - { - IndexxOES(__dsl_component); - } - } + public static void IndexxvOES(int component) => Underlying.Value!.IndexxvOES(component); [NativeName("glInitNames")] [SupportedApiProfile( @@ -322035,8 +322024,8 @@ public static MaybeBool IsAsyncMarkerSGIX(uint marker) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsAsyncMarkerSGIXRawSGIX(uint marker) => - Underlying.Value!.IsAsyncMarkerSGIXRawSGIX(marker); + public static uint IsAsyncMarkerRawSGIX(uint marker) => + Underlying.Value!.IsAsyncMarkerRawSGIX(marker); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -322106,8 +322095,7 @@ public static MaybeBool IsBufferARB(uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsBufferARBRawARB(uint buffer) => - Underlying.Value!.IsBufferARBRawARB(buffer); + public static uint IsBufferRawARB(uint buffer) => Underlying.Value!.IsBufferRawARB(buffer); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -322179,8 +322167,8 @@ public static MaybeBool IsBufferResidentNV(uint target) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsBufferResidentNVRawNV(uint target) => - Underlying.Value!.IsBufferResidentNVRawNV(target); + public static uint IsBufferResidentRawNV(uint target) => + Underlying.Value!.IsBufferResidentRawNV(target); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -322199,8 +322187,8 @@ public static MaybeBool IsCommandListNV(uint list) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsCommandListNVRawNV(uint list) => - Underlying.Value!.IsCommandListNVRawNV(list); + public static uint IsCommandListRawNV(uint list) => + Underlying.Value!.IsCommandListRawNV(list); [NativeName("glIsEnabled")] [SupportedApiProfile( @@ -322512,8 +322500,7 @@ public static MaybeBool IsFenceAPPLE(uint fence) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsFenceAppleRawAPPLE(uint fence) => - Underlying.Value!.IsFenceAppleRawAPPLE(fence); + public static uint IsFenceRawAPPLE(uint fence) => Underlying.Value!.IsFenceRawAPPLE(fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -322533,7 +322520,7 @@ public static uint IsFenceAppleRawAPPLE(uint fence) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsFenceNVRawNV(uint fence) => Underlying.Value!.IsFenceNVRawNV(fence); + public static uint IsFenceRawNV(uint fence) => Underlying.Value!.IsFenceRawNV(fence); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -322599,8 +322586,8 @@ public static MaybeBool IsFramebufferEXT(uint framebuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsFramebufferEXTRawEXT(uint framebuffer) => - Underlying.Value!.IsFramebufferEXTRawEXT(framebuffer); + public static uint IsFramebufferRawEXT(uint framebuffer) => + Underlying.Value!.IsFramebufferRawEXT(framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -322617,8 +322604,8 @@ public static MaybeBool IsFramebufferOES(uint framebuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsFramebufferOESRawOES(uint framebuffer) => - Underlying.Value!.IsFramebufferOESRawOES(framebuffer); + public static uint IsFramebufferRawOES(uint framebuffer) => + Underlying.Value!.IsFramebufferRawOES(framebuffer); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -322686,8 +322673,8 @@ public static MaybeBool IsImageHandleResidentARB(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsImageHandleResidentARBRawARB(ulong handle) => - Underlying.Value!.IsImageHandleResidentARBRawARB(handle); + public static uint IsImageHandleResidentRawARB(ulong handle) => + Underlying.Value!.IsImageHandleResidentRawARB(handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -322708,8 +322695,8 @@ public static MaybeBool IsImageHandleResidentNV(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsImageHandleResidentNVRawNV(ulong handle) => - Underlying.Value!.IsImageHandleResidentNVRawNV(handle); + public static uint IsImageHandleResidentRawNV(ulong handle) => + Underlying.Value!.IsImageHandleResidentRawNV(handle); [NativeName("glIsList")] [SupportedApiProfile( @@ -322792,8 +322779,8 @@ public static MaybeBool IsMemoryObjectEXT(uint memoryObject) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsMemoryObjectEXTRawEXT(uint memoryObject) => - Underlying.Value!.IsMemoryObjectEXTRawEXT(memoryObject); + public static uint IsMemoryObjectRawEXT(uint memoryObject) => + Underlying.Value!.IsMemoryObjectRawEXT(memoryObject); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] @@ -322810,8 +322797,8 @@ public static MaybeBool IsNameAMD(uint identifier, uint name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsNameAMDRawAMD(uint identifier, uint name) => - Underlying.Value!.IsNameAMDRawAMD(identifier, name); + public static uint IsNameRawAMD(uint identifier, uint name) => + Underlying.Value!.IsNameRawAMD(identifier, name); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -322830,8 +322817,8 @@ public static MaybeBool IsNamedBufferResidentNV(uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsNamedBufferResidentNVRawNV(uint buffer) => - Underlying.Value!.IsNamedBufferResidentNVRawNV(buffer); + public static uint IsNamedBufferResidentRawNV(uint buffer) => + Underlying.Value!.IsNamedBufferResidentRawNV(buffer); [NativeName("glIsNamedStringARB")] [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])] @@ -322873,8 +322860,8 @@ public static MaybeBool IsObjectBufferATI(uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsObjectBufferATIRawATI(uint buffer) => - Underlying.Value!.IsObjectBufferATIRawATI(buffer); + public static uint IsObjectBufferRawATI(uint buffer) => + Underlying.Value!.IsObjectBufferRawATI(buffer); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] @@ -322891,8 +322878,8 @@ public static MaybeBool IsOcclusionQueryNV(uint id) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsOcclusionQueryNVRawNV(uint id) => - Underlying.Value!.IsOcclusionQueryNVRawNV(id); + public static uint IsOcclusionQueryRawNV(uint id) => + Underlying.Value!.IsOcclusionQueryRawNV(id); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -322912,7 +322899,7 @@ public static uint IsOcclusionQueryNVRawNV(uint id) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsPathNVRawNV(uint path) => Underlying.Value!.IsPathNVRawNV(path); + public static uint IsPathRawNV(uint path) => Underlying.Value!.IsPathRawNV(path); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -322933,8 +322920,8 @@ public static MaybeBool IsPointInFillPathNV(uint path, uint mask, float x, [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y) => - Underlying.Value!.IsPointInFillPathNVRawNV(path, mask, x, y); + public static uint IsPointInFillPathRawNV(uint path, uint mask, float x, float y) => + Underlying.Value!.IsPointInFillPathRawNV(path, mask, x, y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -322955,8 +322942,8 @@ public static MaybeBool IsPointInStrokePathNV(uint path, float x, float y) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsPointInStrokePathNVRawNV(uint path, float x, float y) => - Underlying.Value!.IsPointInStrokePathNVRawNV(path, x, y); + public static uint IsPointInStrokePathRawNV(uint path, float x, float y) => + Underlying.Value!.IsPointInStrokePathRawNV(path, x, y); [NativeName("glIsProgram")] [SupportedApiProfile( @@ -323024,8 +323011,8 @@ public static MaybeBool IsProgramARB(uint program) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsProgramARBRawARB(uint program) => - Underlying.Value!.IsProgramARBRawARB(program); + public static uint IsProgramRawARB(uint program) => + Underlying.Value!.IsProgramRawARB(program); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] @@ -323041,7 +323028,7 @@ public static uint IsProgramARBRawARB(uint program) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsProgramNVRawNV(uint id) => Underlying.Value!.IsProgramNVRawNV(id); + public static uint IsProgramRawNV(uint id) => Underlying.Value!.IsProgramRawNV(id); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -323092,8 +323079,8 @@ public static MaybeBool IsProgramPipelineEXT(uint pipeline) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsProgramPipelineEXTRawEXT(uint pipeline) => - Underlying.Value!.IsProgramPipelineEXTRawEXT(pipeline); + public static uint IsProgramPipelineRawEXT(uint pipeline) => + Underlying.Value!.IsProgramPipelineRawEXT(pipeline); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -323240,7 +323227,7 @@ public static uint IsProgramPipelineRaw(uint pipeline) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsQueryARBRawARB(uint id) => Underlying.Value!.IsQueryARBRawARB(id); + public static uint IsQueryRawARB(uint id) => Underlying.Value!.IsQueryRawARB(id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -323262,7 +323249,7 @@ public static uint IsProgramPipelineRaw(uint pipeline) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsQueryEXTRawEXT(uint id) => Underlying.Value!.IsQueryEXTRawEXT(id); + public static uint IsQueryRawEXT(uint id) => Underlying.Value!.IsQueryRawEXT(id); [NativeName("glIsQuery")] [SupportedApiProfile( @@ -323375,8 +323362,8 @@ public static MaybeBool IsRenderbufferEXT(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsRenderbufferEXTRawEXT(uint renderbuffer) => - Underlying.Value!.IsRenderbufferEXTRawEXT(renderbuffer); + public static uint IsRenderbufferRawEXT(uint renderbuffer) => + Underlying.Value!.IsRenderbufferRawEXT(renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -323393,8 +323380,8 @@ public static MaybeBool IsRenderbufferOES(uint renderbuffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsRenderbufferOESRawOES(uint renderbuffer) => - Underlying.Value!.IsRenderbufferOESRawOES(renderbuffer); + public static uint IsRenderbufferRawOES(uint renderbuffer) => + Underlying.Value!.IsRenderbufferRawOES(renderbuffer); [NativeName("glIsRenderbuffer")] [SupportedApiProfile( @@ -323557,8 +323544,8 @@ public static MaybeBool IsSemaphoreEXT(uint semaphore) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsSemaphoreEXTRawEXT(uint semaphore) => - Underlying.Value!.IsSemaphoreEXTRawEXT(semaphore); + public static uint IsSemaphoreRawEXT(uint semaphore) => + Underlying.Value!.IsSemaphoreRawEXT(semaphore); [NativeName("glIsShader")] [SupportedApiProfile( @@ -323676,7 +323663,7 @@ public static uint IsSemaphoreEXTRawEXT(uint semaphore) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsStateNVRawNV(uint state) => Underlying.Value!.IsStateNVRawNV(state); + public static uint IsStateRawNV(uint state) => Underlying.Value!.IsStateRawNV(state); [NativeName("glIsSync")] [SupportedApiProfile( @@ -323863,8 +323850,8 @@ public static MaybeBool IsTextureEXT(uint texture) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsTextureEXTRawEXT(uint texture) => - Underlying.Value!.IsTextureEXTRawEXT(texture); + public static uint IsTextureRawEXT(uint texture) => + Underlying.Value!.IsTextureRawEXT(texture); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -323883,8 +323870,8 @@ public static MaybeBool IsTextureHandleResidentARB(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsTextureHandleResidentARBRawARB(ulong handle) => - Underlying.Value!.IsTextureHandleResidentARBRawARB(handle); + public static uint IsTextureHandleResidentRawARB(ulong handle) => + Underlying.Value!.IsTextureHandleResidentRawARB(handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -323905,8 +323892,8 @@ public static MaybeBool IsTextureHandleResidentNV(ulong handle) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsTextureHandleResidentNVRawNV(ulong handle) => - Underlying.Value!.IsTextureHandleResidentNVRawNV(handle); + public static uint IsTextureHandleResidentRawNV(ulong handle) => + Underlying.Value!.IsTextureHandleResidentRawNV(handle); [NativeName("glIsTexture")] [SupportedApiProfile( @@ -324020,8 +324007,8 @@ public static MaybeBool IsTransformFeedbackNV(uint id) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsTransformFeedbackNVRawNV(uint id) => - Underlying.Value!.IsTransformFeedbackNVRawNV(id); + public static uint IsTransformFeedbackRawNV(uint id) => + Underlying.Value!.IsTransformFeedbackRawNV(id); [NativeName("glIsTransformFeedback")] [SupportedApiProfile( @@ -324138,8 +324125,8 @@ public static MaybeBool IsVertexArrayAPPLE(uint array) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsVertexArrayAppleRawAPPLE(uint array) => - Underlying.Value!.IsVertexArrayAppleRawAPPLE(array); + public static uint IsVertexArrayRawAPPLE(uint array) => + Underlying.Value!.IsVertexArrayRawAPPLE(array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -324158,8 +324145,8 @@ public static MaybeBool IsVertexArrayOES(uint array) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsVertexArrayOESRawOES(uint array) => - Underlying.Value!.IsVertexArrayOESRawOES(array); + public static uint IsVertexArrayRawOES(uint array) => + Underlying.Value!.IsVertexArrayRawOES(array); [NativeName("glIsVertexArray")] [SupportedApiProfile( @@ -324220,8 +324207,8 @@ public static MaybeBool IsVertexAttribEnabledAPPLE(uint index, uint pname) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname) => - Underlying.Value!.IsVertexAttribEnabledAppleRawAPPLE(index, pname); + public static uint IsVertexAttribEnabledRawAPPLE(uint index, uint pname) => + Underlying.Value!.IsVertexAttribEnabledRawAPPLE(index, pname); [NativeName("glLabelObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_debug_label"])] @@ -327351,8 +327338,8 @@ public static Ptr MapObjectBufferATI(uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void* MapObjectBufferATIRawATI(uint buffer) => - Underlying.Value!.MapObjectBufferATIRawATI(buffer); + public static void* MapObjectBufferRawATI(uint buffer) => + Underlying.Value!.MapObjectBufferRawATI(buffer); [NativeName("glMapParameterfvNV")] [SupportedApiProfile("gl", ["GL_NV_evaluators"])] @@ -331316,19 +331303,8 @@ sbyte s [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void MultiTexCoord1BvOOES( - Constant texture, - sbyte coords - ) => Underlying.Value!.MultiTexCoord1BvOOES(texture, coords); - - [NativeName("glMultiTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void MultiTexCoord1OES(uint texture, sbyte* coords) => - Underlying.Value!.MultiTexCoord1OES(texture, coords); + public static void MultiTexCoord1bvOES(uint texture, sbyte* coords) => + Underlying.Value!.MultiTexCoord1bvOES(texture, coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -331336,17 +331312,28 @@ public static void MultiTexCoord1OES(uint texture, sbyte* coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void MultiTexCoord1OES( + public static void MultiTexCoord1bvOES( Constant texture, Ref coords ) { fixed (sbyte* __dsl_coords = coords) { - MultiTexCoord1OES((uint)texture, __dsl_coords); + MultiTexCoord1bvOES((uint)texture, __dsl_coords); } } + [NativeName("glMultiTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void MultiTexCoord1bvOES( + Constant texture, + sbyte coords + ) => Underlying.Value!.MultiTexCoord1bvOES(texture, coords); + [NativeName("glMultiTexCoord1d")] [SupportedApiProfile( "gl", @@ -332279,10 +332266,8 @@ public static void MultiTexCoord1XOES(Constant textur [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void MultiTexCoord1XvOOES( - Constant texture, - int coords - ) => Underlying.Value!.MultiTexCoord1XvOOES(texture, coords); + public static void MultiTexCoord1XvOES(uint texture, int* coords) => + Underlying.Value!.MultiTexCoord1XvOES(texture, coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -332290,26 +332275,28 @@ int coords [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void MultiTexCoord1XOES(uint texture, int* coords) => - Underlying.Value!.MultiTexCoord1XOES(texture, coords); - - [NativeName("glMultiTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void MultiTexCoord1XOES( + public static void MultiTexCoord1XvOES( Constant texture, Ref coords ) { fixed (int* __dsl_coords = coords) { - MultiTexCoord1XOES((uint)texture, __dsl_coords); + MultiTexCoord1XvOES((uint)texture, __dsl_coords); } } + [NativeName("glMultiTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void MultiTexCoord1XvOES( + Constant texture, + int coords + ) => Underlying.Value!.MultiTexCoord1XvOES(texture, coords); + [NativeName("glMultiTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord2bOES")] @@ -354840,8 +354827,8 @@ public static MaybeBool ReleaseKeyedMutexWin32EXT(uint memory, ulong key) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key) => - Underlying.Value!.ReleaseKeyedMutexWin32EXTRawEXT(memory, key); + public static uint ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key) => + Underlying.Value!.ReleaseKeyedMutexWin32RawEXT(memory, key); [NativeName("glReleaseShaderCompiler")] [SupportedApiProfile( @@ -358733,15 +358720,6 @@ public static void ScissorArrayNV(uint first, uint count, Ref v) public static void ScissorArrayNV(uint first, int v) => Underlying.Value!.ScissorArrayNV(first, v); - [NativeName("glScissorArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void ScissorArrayvOOES(uint first, int v) => - Underlying.Value!.ScissorArrayvOOES(first, v); - [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] @@ -358765,6 +358743,15 @@ public static void ScissorArrayOES(uint first, uint count, Ref v) } } + [NativeName("glScissorArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void ScissorArrayOES(uint first, int v) => + Underlying.Value!.ScissorArrayOES(first, v); + [NativeName("glScissorExclusiveArrayvNV")] [SupportedApiProfile("gl", ["GL_NV_scissor_exclusive"])] [SupportedApiProfile("glcore", ["GL_NV_scissor_exclusive"])] @@ -363250,8 +363237,8 @@ public static MaybeBool TestFenceAPPLE(uint fence) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint TestFenceAppleRawAPPLE(uint fence) => - Underlying.Value!.TestFenceAppleRawAPPLE(fence); + public static uint TestFenceRawAPPLE(uint fence) => + Underlying.Value!.TestFenceRawAPPLE(fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -363272,8 +363259,7 @@ public static MaybeBool TestFenceNV(uint fence) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint TestFenceNVRawNV(uint fence) => - Underlying.Value!.TestFenceNVRawNV(fence); + public static uint TestFenceRawNV(uint fence) => Underlying.Value!.TestFenceRawNV(fence); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -363290,8 +363276,8 @@ public static MaybeBool TestObjectAPPLE(uint @object, uint name) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint TestObjectAppleRawAPPLE(uint @object, uint name) => - Underlying.Value!.TestObjectAppleRawAPPLE(@object, name); + public static uint TestObjectRawAPPLE(uint @object, uint name) => + Underlying.Value!.TestObjectRawAPPLE(@object, name); [NativeName("glTexAttachMemoryNV")] [SupportedApiProfile("gl", ["GL_NV_memory_attachment"])] @@ -363660,8 +363646,8 @@ Ref param1 [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1BvOOES(sbyte coords) => - Underlying.Value!.TexCoord1BvOOES(coords); + public static void TexCoord1bvOES(sbyte* coords) => + Underlying.Value!.TexCoord1bvOES(coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -363669,7 +363655,13 @@ public static void TexCoord1BvOOES(sbyte coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1OES(sbyte* coords) => Underlying.Value!.TexCoord1OES(coords); + public static void TexCoord1bvOES(Ref coords) + { + fixed (sbyte* __dsl_coords = coords) + { + TexCoord1bvOES(__dsl_coords); + } + } [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -363677,13 +363669,7 @@ public static void TexCoord1BvOOES(sbyte coords) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1OES(Ref coords) - { - fixed (sbyte* __dsl_coords = coords) - { - TexCoord1OES(__dsl_coords); - } - } + public static void TexCoord1bvOES(sbyte coords) => Underlying.Value!.TexCoord1bvOES(coords); [NativeName("glTexCoord1d")] [SupportedApiProfile( @@ -364273,7 +364259,7 @@ public static void TexCoord1sv(Ref v) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1XvOOES(int coords) => Underlying.Value!.TexCoord1XvOOES(coords); + public static void TexCoord1XvOES(int* coords) => Underlying.Value!.TexCoord1XvOES(coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -364281,7 +364267,13 @@ public static void TexCoord1sv(Ref v) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1XOES(int* coords) => Underlying.Value!.TexCoord1XOES(coords); + public static void TexCoord1XvOES(Ref coords) + { + fixed (int* __dsl_coords = coords) + { + TexCoord1XvOES(__dsl_coords); + } + } [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] @@ -364289,13 +364281,7 @@ public static void TexCoord1sv(Ref v) [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static void TexCoord1XOES(Ref coords) - { - fixed (int* __dsl_coords = coords) - { - TexCoord1XOES(__dsl_coords); - } - } + public static void TexCoord1XvOES(int coords) => Underlying.Value!.TexCoord1XvOES(coords); [NativeName("glTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -380822,8 +380808,8 @@ public static MaybeBool UnmapBufferOES(uint target) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint UnmapBufferOESRawOES(uint target) => - Underlying.Value!.UnmapBufferOESRawOES(target); + public static uint UnmapBufferRawOES(uint target) => + Underlying.Value!.UnmapBufferRawOES(target); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -380860,8 +380846,8 @@ public static MaybeBool UnmapNamedBufferEXT(uint buffer) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint UnmapNamedBufferEXTRawEXT(uint buffer) => - Underlying.Value!.UnmapNamedBufferEXTRawEXT(buffer); + public static uint UnmapNamedBufferRawEXT(uint buffer) => + Underlying.Value!.UnmapNamedBufferRawEXT(buffer); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -381606,8 +381592,8 @@ public static MaybeBool VdpauIsSurfaceNV(nint surface) => [MethodImpl( MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization )] - public static uint VdpauIsSurfaceNVRawNV(nint surface) => - Underlying.Value!.VdpauIsSurfaceNVRawNV(surface); + public static uint VdpauIsSurfaceRawNV(nint surface) => + Underlying.Value!.VdpauIsSurfaceRawNV(surface); [NativeName("glVDPAUMapSurfacesNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] @@ -395450,15 +395436,6 @@ public static void ViewportArrayNV(uint first, uint count, Ref v) public static void ViewportArrayNV(uint first, float v) => Underlying.Value!.ViewportArrayNV(first, v); - [NativeName("glViewportArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - [MethodImpl( - MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization - )] - public static void ViewportArrayvOOES(uint first, float v) => - Underlying.Value!.ViewportArrayvOOES(first, v); - [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] @@ -395482,6 +395459,15 @@ public static void ViewportArrayOES(uint first, uint count, Ref v) } } + [NativeName("glViewportArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] + [MethodImpl( + MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization + )] + public static void ViewportArrayOES(uint first, float v) => + Underlying.Value!.ViewportArrayOES(first, v); + [NativeName("glViewportIndexedf")] [SupportedApiProfile( "gl", @@ -397955,7 +397941,7 @@ _slots[1] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glAcquireKeyedMutexWin32EXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.AcquireKeyedMutexWin32EXT(uint memory, ulong key, uint timeout) => - (MaybeBool)(uint)((IGL)this).AcquireKeyedMutexWin32EXTRawEXT(memory, key, timeout); + (MaybeBool)(uint)((IGL)this).AcquireKeyedMutexWin32RawEXT(memory, key, timeout); [NativeName("glAcquireKeyedMutexWin32EXT")] [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] @@ -397970,7 +397956,7 @@ public static MaybeBool AcquireKeyedMutexWin32EXT(uint memory, ulong key, [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glAcquireKeyedMutexWin32EXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.AcquireKeyedMutexWin32EXTRawEXT(uint memory, ulong key, uint timeout) => + uint IGL.AcquireKeyedMutexWin32RawEXT(uint memory, ulong key, uint timeout) => ( (delegate* unmanaged)( _slots[2] is not null and var loadedFnPtr @@ -397987,8 +397973,8 @@ _slots[2] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glAcquireKeyedMutexWin32EXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint AcquireKeyedMutexWin32EXTRawEXT(uint memory, ulong key, uint timeout) => - ThisThread.AcquireKeyedMutexWin32EXTRawEXT(memory, key, timeout); + public static uint AcquireKeyedMutexWin32RawEXT(uint memory, ulong key, uint timeout) => + ThisThread.AcquireKeyedMutexWin32RawEXT(memory, key, timeout); [NativeName("glActiveProgramEXT")] [SupportedApiProfile("gl", ["GL_EXT_separate_shader_objects"])] @@ -405954,26 +405940,6 @@ public static void Bitmap( byte bitmap ) => ThisThread.Bitmap(height, xorig, yorig, xmove, ymove, bitmap); - [NativeName("glBitmapxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.BitmapxOOES(uint height, int xorig, int yorig, int xmove, int ymove, byte bitmap) => - ((IGL)this).BitmapxOES(1, height, xorig, yorig, xmove, ymove, (byte*)&bitmap); - - [NativeName("glBitmapxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void BitmapxOOES( - uint height, - int xorig, - int yorig, - int xmove, - int ymove, - byte bitmap - ) => ThisThread.BitmapxOOES(height, xorig, yorig, xmove, ymove, bitmap); - [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] @@ -406043,6 +406009,26 @@ public static void BitmapxOES( Ref bitmap ) => ThisThread.BitmapxOES(width, height, xorig, yorig, xmove, ymove, bitmap); + [NativeName("glBitmapxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.BitmapxOES(uint height, int xorig, int yorig, int xmove, int ymove, byte bitmap) => + ((IGL)this).BitmapxOES(1, height, xorig, yorig, xmove, ymove, (byte*)&bitmap); + + [NativeName("glBitmapxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void BitmapxOES( + uint height, + int xorig, + int yorig, + int xmove, + int ymove, + byte bitmap + ) => ThisThread.BitmapxOES(height, xorig, yorig, xmove, ymove, bitmap); + [NativeName("glBlendBarrierKHR")] [SupportedApiProfile("gl", ["GL_KHR_blend_equation_advanced"])] [SupportedApiProfile("glcore", ["GL_KHR_blend_equation_advanced"])] @@ -437752,20 +437738,6 @@ void IGL.DeleteFramebuffersEXT(uint framebuffers) => public static void DeleteFramebuffersEXT(uint framebuffers) => ThisThread.DeleteFramebuffersEXT(framebuffers); - [NativeName("glDeleteFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.DeleteFramebuffersOOES(uint framebuffers) => - ((IGL)this).DeleteFramebuffersOES(1, (uint*)&framebuffers); - - [NativeName("glDeleteFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void DeleteFramebuffersOOES(uint framebuffers) => - ThisThread.DeleteFramebuffersOOES(framebuffers); - [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] @@ -437805,6 +437777,20 @@ void IGL.DeleteFramebuffersOES(uint n, Ref framebuffers) public static void DeleteFramebuffersOES(uint n, Ref framebuffers) => ThisThread.DeleteFramebuffersOES(n, framebuffers); + [NativeName("glDeleteFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.DeleteFramebuffersOES(uint framebuffers) => + ((IGL)this).DeleteFramebuffersOES(1, (uint*)&framebuffers); + + [NativeName("glDeleteFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void DeleteFramebuffersOES(uint framebuffers) => + ThisThread.DeleteFramebuffersOES(framebuffers); + [NativeName("glDeleteLists")] [SupportedApiProfile( "gl", @@ -439498,20 +439484,6 @@ void IGL.DeleteRenderbuffersEXT(uint renderbuffers) => public static void DeleteRenderbuffersEXT(uint renderbuffers) => ThisThread.DeleteRenderbuffersEXT(renderbuffers); - [NativeName("glDeleteRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.DeleteRenderbuffersOOES(uint renderbuffers) => - ((IGL)this).DeleteRenderbuffersOES(1, (uint*)&renderbuffers); - - [NativeName("glDeleteRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void DeleteRenderbuffersOOES(uint renderbuffers) => - ThisThread.DeleteRenderbuffersOOES(renderbuffers); - [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] @@ -439551,6 +439523,20 @@ void IGL.DeleteRenderbuffersOES(uint n, Ref renderbuffers) public static void DeleteRenderbuffersOES(uint n, Ref renderbuffers) => ThisThread.DeleteRenderbuffersOES(n, renderbuffers); + [NativeName("glDeleteRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.DeleteRenderbuffersOES(uint renderbuffers) => + ((IGL)this).DeleteRenderbuffersOES(1, (uint*)&renderbuffers); + + [NativeName("glDeleteRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void DeleteRenderbuffersOES(uint renderbuffers) => + ThisThread.DeleteRenderbuffersOES(renderbuffers); + [NativeName("glDeleteSamplers")] [SupportedApiProfile( "gl", @@ -441236,22 +441222,6 @@ void IGL.DeleteVertexArraysAPPLE(uint arrays) => public static void DeleteVertexArraysAPPLE(uint arrays) => ThisThread.DeleteVertexArraysAPPLE(arrays); - [NativeName("glDeleteVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.DeleteVertexArraysOOES(uint arrays) => - ((IGL)this).DeleteVertexArraysOES(1, (uint*)&arrays); - - [NativeName("glDeleteVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void DeleteVertexArraysOOES(uint arrays) => - ThisThread.DeleteVertexArraysOOES(arrays); - [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] @@ -441295,6 +441265,22 @@ void IGL.DeleteVertexArraysOES(uint n, Ref arrays) public static void DeleteVertexArraysOES(uint n, Ref arrays) => ThisThread.DeleteVertexArraysOES(n, arrays); + [NativeName("glDeleteVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.DeleteVertexArraysOES(uint arrays) => + ((IGL)this).DeleteVertexArraysOES(1, (uint*)&arrays); + + [NativeName("glDeleteVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void DeleteVertexArraysOES(uint arrays) => + ThisThread.DeleteVertexArraysOES(arrays); + [NativeName("glDeleteVertexShaderEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")] @@ -454410,19 +454396,7 @@ _slots[667] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.EvalCoord1XvOOES(int coords) => ((IGL)this).EvalCoord1XOES((int*)&coords); - - [NativeName("glEvalCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void EvalCoord1XvOOES(int coords) => ThisThread.EvalCoord1XvOOES(coords); - - [NativeName("glEvalCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.EvalCoord1XOES(int* coords) => + void IGL.EvalCoord1XvOES(int* coords) => ( (delegate* unmanaged)( _slots[668] is not null and var loadedFnPtr @@ -454435,17 +454409,17 @@ _slots[668] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void EvalCoord1XOES(int* coords) => ThisThread.EvalCoord1XOES(coords); + public static void EvalCoord1XvOES(int* coords) => ThisThread.EvalCoord1XvOES(coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.EvalCoord1XOES(Ref coords) + void IGL.EvalCoord1XvOES(Ref coords) { fixed (int* __dsl_coords = coords) { - ((IGL)this).EvalCoord1XOES(__dsl_coords); + ((IGL)this).EvalCoord1XvOES(__dsl_coords); } } @@ -454453,7 +454427,19 @@ void IGL.EvalCoord1XOES(Ref coords) [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void EvalCoord1XOES(Ref coords) => ThisThread.EvalCoord1XOES(coords); + public static void EvalCoord1XvOES(Ref coords) => ThisThread.EvalCoord1XvOES(coords); + + [NativeName("glEvalCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.EvalCoord1XvOES(int coords) => ((IGL)this).EvalCoord1XvOES((int*)&coords); + + [NativeName("glEvalCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void EvalCoord1XvOES(int coords) => ThisThread.EvalCoord1XvOES(coords); [NativeName("glEvalCoord2d")] [SupportedApiProfile( @@ -456166,7 +456152,7 @@ Ref numTextures [NativeFunction("opengl", EntryPoint = "glExtIsProgramBinaryQCOM")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.ExtIsProgramBinaryQCOM(uint program) => - (MaybeBool)(uint)((IGL)this).ExtIsProgramBinaryQCOMRawQCOM(program); + (MaybeBool)(uint)((IGL)this).ExtIsProgramBinaryRawQCOM(program); [NativeName("glExtIsProgramBinaryQCOM")] [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])] @@ -456181,7 +456167,7 @@ public static MaybeBool ExtIsProgramBinaryQCOM(uint program) => [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])] [NativeFunction("opengl", EntryPoint = "glExtIsProgramBinaryQCOM")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.ExtIsProgramBinaryQCOMRawQCOM(uint program) => + uint IGL.ExtIsProgramBinaryRawQCOM(uint program) => ( (delegate* unmanaged)( _slots[692] is not null and var loadedFnPtr @@ -456195,8 +456181,8 @@ _slots[692] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])] [NativeFunction("opengl", EntryPoint = "glExtIsProgramBinaryQCOM")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint ExtIsProgramBinaryQCOMRawQCOM(uint program) => - ThisThread.ExtIsProgramBinaryQCOMRawQCOM(program); + public static uint ExtIsProgramBinaryRawQCOM(uint program) => + ThisThread.ExtIsProgramBinaryRawQCOM(program); [NativeName("glExtractComponentEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -456467,20 +456453,6 @@ float IGL.FeedbackBuffer(Constant type) public static float FeedbackBuffer(Constant type) => ThisThread.FeedbackBuffer(type); - [NativeName("glFeedbackBufferxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.FeedbackBufferxOOES(uint type, int buffer) => - ((IGL)this).FeedbackBufferxOES(1, type, (int*)&buffer); - - [NativeName("glFeedbackBufferxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void FeedbackBufferxOOES(uint type, int buffer) => - ThisThread.FeedbackBufferxOOES(type, buffer); - [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] @@ -456520,6 +456492,20 @@ void IGL.FeedbackBufferxOES(uint n, uint type, Ref buffer) public static void FeedbackBufferxOES(uint n, uint type, Ref buffer) => ThisThread.FeedbackBufferxOES(n, type, buffer); + [NativeName("glFeedbackBufferxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.FeedbackBufferxOES(uint type, int buffer) => + ((IGL)this).FeedbackBufferxOES(1, type, (int*)&buffer); + + [NativeName("glFeedbackBufferxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void FeedbackBufferxOES(uint type, int buffer) => + ThisThread.FeedbackBufferxOES(type, buffer); + [NativeName("glFenceSync")] [SupportedApiProfile( "gl", @@ -465151,23 +465137,6 @@ uint IGL.GenFramebuffersEXT() [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static uint GenFramebuffersEXT() => ThisThread.GenFramebuffersEXT(); - [NativeName("glGenFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.GenFramebuffersOOES() - { - uint framebuffers = default; - ((IGL)this).GenFramebuffersOES(1, (uint*)&framebuffers); - return framebuffers; - } - - [NativeName("glGenFramebuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint GenFramebuffersOOES() => ThisThread.GenFramebuffersOOES(); - [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] @@ -465207,6 +465176,23 @@ void IGL.GenFramebuffersOES(uint n, Ref framebuffers) public static void GenFramebuffersOES(uint n, Ref framebuffers) => ThisThread.GenFramebuffersOES(n, framebuffers); + [NativeName("glGenFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + uint IGL.GenFramebuffersOES() + { + uint framebuffers = default; + ((IGL)this).GenFramebuffersOES(1, (uint*)&framebuffers); + return framebuffers; + } + + [NativeName("glGenFramebuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static uint GenFramebuffersOES() => ThisThread.GenFramebuffersOES(); + [NativeName("glGenLists")] [SupportedApiProfile( "gl", @@ -466672,23 +466658,6 @@ uint IGL.GenRenderbuffersEXT() [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static uint GenRenderbuffersEXT() => ThisThread.GenRenderbuffersEXT(); - [NativeName("glGenRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.GenRenderbuffersOOES() - { - uint renderbuffers = default; - ((IGL)this).GenRenderbuffersOES(1, (uint*)&renderbuffers); - return renderbuffers; - } - - [NativeName("glGenRenderbuffersOES")] - [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] - [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint GenRenderbuffersOOES() => ThisThread.GenRenderbuffersOOES(); - [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] @@ -466728,6 +466697,23 @@ void IGL.GenRenderbuffersOES(uint n, Ref renderbuffers) public static void GenRenderbuffersOES(uint n, Ref renderbuffers) => ThisThread.GenRenderbuffersOES(n, renderbuffers); + [NativeName("glGenRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + uint IGL.GenRenderbuffersOES() + { + uint renderbuffers = default; + ((IGL)this).GenRenderbuffersOES(1, (uint*)&renderbuffers); + return renderbuffers; + } + + [NativeName("glGenRenderbuffersOES")] + [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] + [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static uint GenRenderbuffersOES() => ThisThread.GenRenderbuffersOES(); + [NativeName("glGenSamplers")] [SupportedApiProfile( "gl", @@ -468120,25 +468106,6 @@ uint IGL.GenVertexArraysAPPLE() [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static uint GenVertexArraysAPPLE() => ThisThread.GenVertexArraysAPPLE(); - [NativeName("glGenVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.GenVertexArraysOOES() - { - uint arrays = default; - ((IGL)this).GenVertexArraysOES(1, (uint*)&arrays); - return arrays; - } - - [NativeName("glGenVertexArraysOES")] - [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] - [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] - [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint GenVertexArraysOOES() => ThisThread.GenVertexArraysOOES(); - [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] @@ -468182,6 +468149,25 @@ void IGL.GenVertexArraysOES(uint n, Ref arrays) public static void GenVertexArraysOES(uint n, Ref arrays) => ThisThread.GenVertexArraysOES(n, arrays); + [NativeName("glGenVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + uint IGL.GenVertexArraysOES() + { + uint arrays = default; + ((IGL)this).GenVertexArraysOES(1, (uint*)&arrays); + return arrays; + } + + [NativeName("glGenVertexArraysOES")] + [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] + [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] + [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static uint GenVertexArraysOES() => ThisThread.GenVertexArraysOES(); + [NativeName("glGenVertexShadersEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] [NativeFunction("opengl", EntryPoint = "glGenVertexShadersEXT")] @@ -477010,24 +476996,6 @@ public static void GetConvolutionParameterEXT( Ref @params ) => ThisThread.GetConvolutionParameterEXT(target, pname, @params); - [NativeName("glGetConvolutionParameterxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - int IGL.GetConvolutionParameterxvOOES(uint target) - { - int @params = default; - ((IGL)this).GetConvolutionParameterxOES(target, 1, (int*)&@params); - return @params; - } - - [NativeName("glGetConvolutionParameterxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static int GetConvolutionParameterxvOOES(uint target) => - ThisThread.GetConvolutionParameterxvOOES(target); - [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] @@ -477070,6 +477038,24 @@ void IGL.GetConvolutionParameterxOES(uint target, uint pname, Ref @params) public static void GetConvolutionParameterxOES(uint target, uint pname, Ref @params) => ThisThread.GetConvolutionParameterxOES(target, pname, @params); + [NativeName("glGetConvolutionParameterxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + int IGL.GetConvolutionParameterxOES(uint target) + { + int @params = default; + ((IGL)this).GetConvolutionParameterxOES(target, 1, (int*)&@params); + return @params; + } + + [NativeName("glGetConvolutionParameterxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static int GetConvolutionParameterxOES(uint target) => + ThisThread.GetConvolutionParameterxOES(target); + [NativeName("glGetCoverageModulationTableNV")] [SupportedApiProfile("gl", ["GL_NV_framebuffer_mixed_samples"])] [SupportedApiProfile("glcore", ["GL_NV_framebuffer_mixed_samples"])] @@ -481455,7 +481441,7 @@ public static Constant GetGraphicsResetStatus [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] Constant IGL.GetGraphicsResetStatusARB() => (Constant) - (uint)((IGL)this).GetGraphicsResetStatusARBRawARB(); + (uint)((IGL)this).GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusARB")] [SupportedApiProfile("gl", ["GL_ARB_robustness"])] @@ -481470,7 +481456,7 @@ public static Constant GetGraphicsResetStatus [SupportedApiProfile("glcore", ["GL_ARB_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.GetGraphicsResetStatusARBRawARB() => + uint IGL.GetGraphicsResetStatusRawARB() => ( (delegate* unmanaged)( _slots[954] is not null and var loadedFnPtr @@ -481487,8 +481473,7 @@ _slots[954] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_ARB_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint GetGraphicsResetStatusARBRawARB() => - ThisThread.GetGraphicsResetStatusARBRawARB(); + public static uint GetGraphicsResetStatusRawARB() => ThisThread.GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] @@ -481497,7 +481482,7 @@ public static uint GetGraphicsResetStatusARBRawARB() => [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] Constant IGL.GetGraphicsResetStatusEXT() => (Constant) - (uint)((IGL)this).GetGraphicsResetStatusEXTRawEXT(); + (uint)((IGL)this).GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] @@ -481512,7 +481497,7 @@ public static Constant GetGraphicsResetStatus [SupportedApiProfile("gles1", ["GL_EXT_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.GetGraphicsResetStatusEXTRawEXT() => + uint IGL.GetGraphicsResetStatusRawEXT() => ( (delegate* unmanaged)( _slots[955] is not null and var loadedFnPtr @@ -481529,8 +481514,7 @@ _slots[955] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_EXT_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint GetGraphicsResetStatusEXTRawEXT() => - ThisThread.GetGraphicsResetStatusEXTRawEXT(); + public static uint GetGraphicsResetStatusRawEXT() => ThisThread.GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] @@ -481538,7 +481522,7 @@ public static uint GetGraphicsResetStatusEXTRawEXT() => [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] Constant IGL.GetGraphicsResetStatusKHR() => (Constant) - (uint)((IGL)this).GetGraphicsResetStatusKHRRawKHR(); + (uint)((IGL)this).GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] @@ -481551,7 +481535,7 @@ public static Constant GetGraphicsResetStatus [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusKHR")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.GetGraphicsResetStatusKHRRawKHR() => + uint IGL.GetGraphicsResetStatusRawKHR() => ( (delegate* unmanaged)( _slots[956] is not null and var loadedFnPtr @@ -481567,8 +481551,7 @@ _slots[956] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusKHR")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint GetGraphicsResetStatusKHRRawKHR() => - ThisThread.GetGraphicsResetStatusKHRRawKHR(); + public static uint GetGraphicsResetStatusRawKHR() => ThisThread.GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatus")] [SupportedApiProfile( @@ -519010,7 +518993,7 @@ Ref name [NativeFunction("opengl", EntryPoint = "glImportSyncEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] Ptr IGL.ImportSyncEXT(uint external_sync_type, nint external_sync, uint flags) => - (Sync*)((IGL)this).ImportSyncEXTRawEXT(external_sync_type, external_sync, flags); + (Sync*)((IGL)this).ImportSyncRawEXT(external_sync_type, external_sync, flags); [NativeName("glImportSyncEXT")] [SupportedApiProfile("gl", ["GL_EXT_x11_sync_object"])] @@ -519026,7 +519009,7 @@ uint flags [SupportedApiProfile("gl", ["GL_EXT_x11_sync_object"])] [NativeFunction("opengl", EntryPoint = "glImportSyncEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - Sync* IGL.ImportSyncEXTRawEXT(uint external_sync_type, nint external_sync, uint flags) => + Sync* IGL.ImportSyncRawEXT(uint external_sync_type, nint external_sync, uint flags) => ( (delegate* unmanaged)( _slots[1377] is not null and var loadedFnPtr @@ -519039,11 +519022,8 @@ _slots[1377] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_EXT_x11_sync_object"])] [NativeFunction("opengl", EntryPoint = "glImportSyncEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static Sync* ImportSyncEXTRawEXT( - uint external_sync_type, - nint external_sync, - uint flags - ) => ThisThread.ImportSyncEXTRawEXT(external_sync_type, external_sync, flags); + public static Sync* ImportSyncRawEXT(uint external_sync_type, nint external_sync, uint flags) => + ThisThread.ImportSyncRawEXT(external_sync_type, external_sync, flags); [NativeName("glIndexd")] [SupportedApiProfile( @@ -520750,19 +520730,7 @@ _slots[1395] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.IndexxvOOES(int component) => ((IGL)this).IndexxOES((int*)&component); - - [NativeName("glIndexxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void IndexxvOOES(int component) => ThisThread.IndexxvOOES(component); - - [NativeName("glIndexxvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.IndexxOES(int* component) => + void IGL.IndexxvOES(int* component) => ( (delegate* unmanaged)( _slots[1396] is not null and var loadedFnPtr @@ -520775,17 +520743,17 @@ _slots[1396] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void IndexxOES(int* component) => ThisThread.IndexxOES(component); + public static void IndexxvOES(int* component) => ThisThread.IndexxvOES(component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.IndexxOES(Ref component) + void IGL.IndexxvOES(Ref component) { fixed (int* __dsl_component = component) { - ((IGL)this).IndexxOES(__dsl_component); + ((IGL)this).IndexxvOES(__dsl_component); } } @@ -520793,7 +520761,19 @@ void IGL.IndexxOES(Ref component) [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void IndexxOES(Ref component) => ThisThread.IndexxOES(component); + public static void IndexxvOES(Ref component) => ThisThread.IndexxvOES(component); + + [NativeName("glIndexxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.IndexxvOES(int component) => ((IGL)this).IndexxvOES((int*)&component); + + [NativeName("glIndexxvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void IndexxvOES(int component) => ThisThread.IndexxvOES(component); [NativeName("glInitNames")] [SupportedApiProfile( @@ -523240,7 +523220,7 @@ uint depth [NativeFunction("opengl", EntryPoint = "glIsAsyncMarkerSGIX")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsAsyncMarkerSGIX(uint marker) => - (MaybeBool)(uint)((IGL)this).IsAsyncMarkerSGIXRawSGIX(marker); + (MaybeBool)(uint)((IGL)this).IsAsyncMarkerRawSGIX(marker); [NativeName("glIsAsyncMarkerSGIX")] [SupportedApiProfile("gl", ["GL_SGIX_async"])] @@ -523253,7 +523233,7 @@ public static MaybeBool IsAsyncMarkerSGIX(uint marker) => [SupportedApiProfile("gl", ["GL_SGIX_async"])] [NativeFunction("opengl", EntryPoint = "glIsAsyncMarkerSGIX")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsAsyncMarkerSGIXRawSGIX(uint marker) => + uint IGL.IsAsyncMarkerRawSGIX(uint marker) => ( (delegate* unmanaged)( _slots[1411] is not null and var loadedFnPtr @@ -523266,8 +523246,7 @@ _slots[1411] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_SGIX_async"])] [NativeFunction("opengl", EntryPoint = "glIsAsyncMarkerSGIX")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsAsyncMarkerSGIXRawSGIX(uint marker) => - ThisThread.IsAsyncMarkerSGIXRawSGIX(marker); + public static uint IsAsyncMarkerRawSGIX(uint marker) => ThisThread.IsAsyncMarkerRawSGIX(marker); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -523377,7 +523356,7 @@ MaybeBool IGL.IsBuffer(uint buffer) => [NativeFunction("opengl", EntryPoint = "glIsBufferARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsBufferARB(uint buffer) => - (MaybeBool)(uint)((IGL)this).IsBufferARBRawARB(buffer); + (MaybeBool)(uint)((IGL)this).IsBufferRawARB(buffer); [NativeName("glIsBufferARB")] [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] @@ -523389,7 +523368,7 @@ MaybeBool IGL.IsBufferARB(uint buffer) => [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsBufferARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsBufferARBRawARB(uint buffer) => + uint IGL.IsBufferRawARB(uint buffer) => ( (delegate* unmanaged)( _slots[1413] is not null and var loadedFnPtr @@ -523402,7 +523381,7 @@ _slots[1413] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsBufferARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsBufferARBRawARB(uint buffer) => ThisThread.IsBufferARBRawARB(buffer); + public static uint IsBufferRawARB(uint buffer) => ThisThread.IsBufferRawARB(buffer); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -523519,7 +523498,7 @@ _slots[1412] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsBufferResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsBufferResidentNV(uint target) => - (MaybeBool)(uint)((IGL)this).IsBufferResidentNVRawNV(target); + (MaybeBool)(uint)((IGL)this).IsBufferResidentRawNV(target); [NativeName("glIsBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -523534,7 +523513,7 @@ public static MaybeBool IsBufferResidentNV(uint target) => [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsBufferResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsBufferResidentNVRawNV(uint target) => + uint IGL.IsBufferResidentRawNV(uint target) => ( (delegate* unmanaged)( _slots[1414] is not null and var loadedFnPtr @@ -523548,8 +523527,8 @@ _slots[1414] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsBufferResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsBufferResidentNVRawNV(uint target) => - ThisThread.IsBufferResidentNVRawNV(target); + public static uint IsBufferResidentRawNV(uint target) => + ThisThread.IsBufferResidentRawNV(target); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -523557,7 +523536,7 @@ public static uint IsBufferResidentNVRawNV(uint target) => [NativeFunction("opengl", EntryPoint = "glIsCommandListNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsCommandListNV(uint list) => - (MaybeBool)(uint)((IGL)this).IsCommandListNVRawNV(list); + (MaybeBool)(uint)((IGL)this).IsCommandListRawNV(list); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -523571,7 +523550,7 @@ MaybeBool IGL.IsCommandListNV(uint list) => [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsCommandListNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsCommandListNVRawNV(uint list) => + uint IGL.IsCommandListRawNV(uint list) => ( (delegate* unmanaged)( _slots[1415] is not null and var loadedFnPtr @@ -523585,7 +523564,7 @@ _slots[1415] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsCommandListNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsCommandListNVRawNV(uint list) => ThisThread.IsCommandListNVRawNV(list); + public static uint IsCommandListRawNV(uint list) => ThisThread.IsCommandListRawNV(list); [NativeName("glIsEnabled")] [SupportedApiProfile( @@ -524158,7 +524137,7 @@ uint index [NativeFunction("opengl", EntryPoint = "glIsFenceAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsFenceAPPLE(uint fence) => - (MaybeBool)(uint)((IGL)this).IsFenceAppleRawAPPLE(fence); + (MaybeBool)(uint)((IGL)this).IsFenceRawAPPLE(fence); [NativeName("glIsFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -524170,7 +524149,7 @@ MaybeBool IGL.IsFenceAPPLE(uint fence) => [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsFenceAppleRawAPPLE(uint fence) => + uint IGL.IsFenceRawAPPLE(uint fence) => ( (delegate* unmanaged)( _slots[1422] is not null and var loadedFnPtr @@ -524183,7 +524162,7 @@ _slots[1422] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsFenceAppleRawAPPLE(uint fence) => ThisThread.IsFenceAppleRawAPPLE(fence); + public static uint IsFenceRawAPPLE(uint fence) => ThisThread.IsFenceRawAPPLE(fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -524192,7 +524171,7 @@ _slots[1422] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsFenceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsFenceNV(uint fence) => - (MaybeBool)(uint)((IGL)this).IsFenceNVRawNV(fence); + (MaybeBool)(uint)((IGL)this).IsFenceRawNV(fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -524208,7 +524187,7 @@ MaybeBool IGL.IsFenceNV(uint fence) => [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsFenceNVRawNV(uint fence) => + uint IGL.IsFenceRawNV(uint fence) => ( (delegate* unmanaged)( _slots[1423] is not null and var loadedFnPtr @@ -524223,7 +524202,7 @@ _slots[1423] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsFenceNVRawNV(uint fence) => ThisThread.IsFenceNVRawNV(fence); + public static uint IsFenceRawNV(uint fence) => ThisThread.IsFenceRawNV(fence); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -524324,7 +524303,7 @@ public static MaybeBool IsFramebuffer(uint framebuffer) => [NativeFunction("opengl", EntryPoint = "glIsFramebufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsFramebufferEXT(uint framebuffer) => - (MaybeBool)(uint)((IGL)this).IsFramebufferEXTRawEXT(framebuffer); + (MaybeBool)(uint)((IGL)this).IsFramebufferRawEXT(framebuffer); [NativeName("glIsFramebufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] @@ -524337,7 +524316,7 @@ public static MaybeBool IsFramebufferEXT(uint framebuffer) => [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsFramebufferEXTRawEXT(uint framebuffer) => + uint IGL.IsFramebufferRawEXT(uint framebuffer) => ( (delegate* unmanaged)( _slots[1425] is not null and var loadedFnPtr @@ -524350,15 +524329,15 @@ _slots[1425] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsFramebufferEXTRawEXT(uint framebuffer) => - ThisThread.IsFramebufferEXTRawEXT(framebuffer); + public static uint IsFramebufferRawEXT(uint framebuffer) => + ThisThread.IsFramebufferRawEXT(framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsFramebufferOES(uint framebuffer) => - (MaybeBool)(uint)((IGL)this).IsFramebufferOESRawOES(framebuffer); + (MaybeBool)(uint)((IGL)this).IsFramebufferRawOES(framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -524371,7 +524350,7 @@ public static MaybeBool IsFramebufferOES(uint framebuffer) => [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsFramebufferOESRawOES(uint framebuffer) => + uint IGL.IsFramebufferRawOES(uint framebuffer) => ( (delegate* unmanaged)( _slots[1426] is not null and var loadedFnPtr @@ -524384,8 +524363,8 @@ _slots[1426] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsFramebufferOESRawOES(uint framebuffer) => - ThisThread.IsFramebufferOESRawOES(framebuffer); + public static uint IsFramebufferRawOES(uint framebuffer) => + ThisThread.IsFramebufferRawOES(framebuffer); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -524493,7 +524472,7 @@ public static uint IsFramebufferRaw(uint framebuffer) => [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsImageHandleResidentARB(ulong handle) => - (MaybeBool)(uint)((IGL)this).IsImageHandleResidentARBRawARB(handle); + (MaybeBool)(uint)((IGL)this).IsImageHandleResidentRawARB(handle); [NativeName("glIsImageHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -524508,7 +524487,7 @@ public static MaybeBool IsImageHandleResidentARB(ulong handle) => [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsImageHandleResidentARBRawARB(ulong handle) => + uint IGL.IsImageHandleResidentRawARB(ulong handle) => ( (delegate* unmanaged)( _slots[1427] is not null and var loadedFnPtr @@ -524525,8 +524504,8 @@ _slots[1427] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsImageHandleResidentARBRawARB(ulong handle) => - ThisThread.IsImageHandleResidentARBRawARB(handle); + public static uint IsImageHandleResidentRawARB(ulong handle) => + ThisThread.IsImageHandleResidentRawARB(handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -524535,7 +524514,7 @@ public static uint IsImageHandleResidentARBRawARB(ulong handle) => [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsImageHandleResidentNV(ulong handle) => - (MaybeBool)(uint)((IGL)this).IsImageHandleResidentNVRawNV(handle); + (MaybeBool)(uint)((IGL)this).IsImageHandleResidentRawNV(handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -524552,7 +524531,7 @@ public static MaybeBool IsImageHandleResidentNV(ulong handle) => [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsImageHandleResidentNVRawNV(ulong handle) => + uint IGL.IsImageHandleResidentRawNV(ulong handle) => ( (delegate* unmanaged)( _slots[1428] is not null and var loadedFnPtr @@ -524570,8 +524549,8 @@ _slots[1428] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsImageHandleResidentNVRawNV(ulong handle) => - ThisThread.IsImageHandleResidentNVRawNV(handle); + public static uint IsImageHandleResidentRawNV(ulong handle) => + ThisThread.IsImageHandleResidentRawNV(handle); [NativeName("glIsList")] [SupportedApiProfile( @@ -524706,7 +524685,7 @@ _slots[1429] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsMemoryObjectEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsMemoryObjectEXT(uint memoryObject) => - (MaybeBool)(uint)((IGL)this).IsMemoryObjectEXTRawEXT(memoryObject); + (MaybeBool)(uint)((IGL)this).IsMemoryObjectRawEXT(memoryObject); [NativeName("glIsMemoryObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_memory_object"])] @@ -524721,7 +524700,7 @@ public static MaybeBool IsMemoryObjectEXT(uint memoryObject) => [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])] [NativeFunction("opengl", EntryPoint = "glIsMemoryObjectEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsMemoryObjectEXTRawEXT(uint memoryObject) => + uint IGL.IsMemoryObjectRawEXT(uint memoryObject) => ( (delegate* unmanaged)( _slots[1430] is not null and var loadedFnPtr @@ -524735,15 +524714,15 @@ _slots[1430] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])] [NativeFunction("opengl", EntryPoint = "glIsMemoryObjectEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsMemoryObjectEXTRawEXT(uint memoryObject) => - ThisThread.IsMemoryObjectEXTRawEXT(memoryObject); + public static uint IsMemoryObjectRawEXT(uint memoryObject) => + ThisThread.IsMemoryObjectRawEXT(memoryObject); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] [NativeFunction("opengl", EntryPoint = "glIsNameAMD")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsNameAMD(uint identifier, uint name) => - (MaybeBool)(uint)((IGL)this).IsNameAMDRawAMD(identifier, name); + (MaybeBool)(uint)((IGL)this).IsNameRawAMD(identifier, name); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] @@ -524756,7 +524735,7 @@ public static MaybeBool IsNameAMD(uint identifier, uint name) => [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] [NativeFunction("opengl", EntryPoint = "glIsNameAMD")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsNameAMDRawAMD(uint identifier, uint name) => + uint IGL.IsNameRawAMD(uint identifier, uint name) => ( (delegate* unmanaged)( _slots[1431] is not null and var loadedFnPtr @@ -524769,8 +524748,8 @@ _slots[1431] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] [NativeFunction("opengl", EntryPoint = "glIsNameAMD")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsNameAMDRawAMD(uint identifier, uint name) => - ThisThread.IsNameAMDRawAMD(identifier, name); + public static uint IsNameRawAMD(uint identifier, uint name) => + ThisThread.IsNameRawAMD(identifier, name); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -524778,7 +524757,7 @@ public static uint IsNameAMDRawAMD(uint identifier, uint name) => [NativeFunction("opengl", EntryPoint = "glIsNamedBufferResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsNamedBufferResidentNV(uint buffer) => - (MaybeBool)(uint)((IGL)this).IsNamedBufferResidentNVRawNV(buffer); + (MaybeBool)(uint)((IGL)this).IsNamedBufferResidentRawNV(buffer); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -524793,7 +524772,7 @@ public static MaybeBool IsNamedBufferResidentNV(uint buffer) => [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsNamedBufferResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsNamedBufferResidentNVRawNV(uint buffer) => + uint IGL.IsNamedBufferResidentRawNV(uint buffer) => ( (delegate* unmanaged)( _slots[1432] is not null and var loadedFnPtr @@ -524810,8 +524789,8 @@ _slots[1432] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsNamedBufferResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsNamedBufferResidentNVRawNV(uint buffer) => - ThisThread.IsNamedBufferResidentNVRawNV(buffer); + public static uint IsNamedBufferResidentRawNV(uint buffer) => + ThisThread.IsNamedBufferResidentRawNV(buffer); [NativeName("glIsNamedStringARB")] [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])] @@ -524861,7 +524840,7 @@ public static MaybeBool IsNamedStringARB(int namelen, Ref name) => [NativeFunction("opengl", EntryPoint = "glIsObjectBufferATI")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsObjectBufferATI(uint buffer) => - (MaybeBool)(uint)((IGL)this).IsObjectBufferATIRawATI(buffer); + (MaybeBool)(uint)((IGL)this).IsObjectBufferRawATI(buffer); [NativeName("glIsObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] @@ -524874,7 +524853,7 @@ public static MaybeBool IsObjectBufferATI(uint buffer) => [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsObjectBufferATI")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsObjectBufferATIRawATI(uint buffer) => + uint IGL.IsObjectBufferRawATI(uint buffer) => ( (delegate* unmanaged)( _slots[1434] is not null and var loadedFnPtr @@ -524887,15 +524866,14 @@ _slots[1434] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsObjectBufferATI")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsObjectBufferATIRawATI(uint buffer) => - ThisThread.IsObjectBufferATIRawATI(buffer); + public static uint IsObjectBufferRawATI(uint buffer) => ThisThread.IsObjectBufferRawATI(buffer); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsOcclusionQueryNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsOcclusionQueryNV(uint id) => - (MaybeBool)(uint)((IGL)this).IsOcclusionQueryNVRawNV(id); + (MaybeBool)(uint)((IGL)this).IsOcclusionQueryRawNV(id); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] @@ -524907,7 +524885,7 @@ MaybeBool IGL.IsOcclusionQueryNV(uint id) => [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsOcclusionQueryNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsOcclusionQueryNVRawNV(uint id) => + uint IGL.IsOcclusionQueryRawNV(uint id) => ( (delegate* unmanaged)( _slots[1435] is not null and var loadedFnPtr @@ -524920,7 +524898,7 @@ _slots[1435] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsOcclusionQueryNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsOcclusionQueryNVRawNV(uint id) => ThisThread.IsOcclusionQueryNVRawNV(id); + public static uint IsOcclusionQueryRawNV(uint id) => ThisThread.IsOcclusionQueryRawNV(id); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -524928,8 +524906,7 @@ _slots[1435] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - MaybeBool IGL.IsPathNV(uint path) => - (MaybeBool)(uint)((IGL)this).IsPathNVRawNV(path); + MaybeBool IGL.IsPathNV(uint path) => (MaybeBool)(uint)((IGL)this).IsPathRawNV(path); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -524945,7 +524922,7 @@ MaybeBool IGL.IsPathNV(uint path) => [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsPathNVRawNV(uint path) => + uint IGL.IsPathRawNV(uint path) => ( (delegate* unmanaged)( _slots[1436] is not null and var loadedFnPtr @@ -524960,7 +524937,7 @@ _slots[1436] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsPathNVRawNV(uint path) => ThisThread.IsPathNVRawNV(path); + public static uint IsPathRawNV(uint path) => ThisThread.IsPathRawNV(path); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -524969,7 +524946,7 @@ _slots[1436] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsPointInFillPathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsPointInFillPathNV(uint path, uint mask, float x, float y) => - (MaybeBool)(uint)((IGL)this).IsPointInFillPathNVRawNV(path, mask, x, y); + (MaybeBool)(uint)((IGL)this).IsPointInFillPathRawNV(path, mask, x, y); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -524986,7 +524963,7 @@ public static MaybeBool IsPointInFillPathNV(uint path, uint mask, float x, [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInFillPathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y) => + uint IGL.IsPointInFillPathRawNV(uint path, uint mask, float x, float y) => ( (delegate* unmanaged)( _slots[1437] is not null and var loadedFnPtr @@ -525001,8 +524978,8 @@ _slots[1437] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInFillPathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y) => - ThisThread.IsPointInFillPathNVRawNV(path, mask, x, y); + public static uint IsPointInFillPathRawNV(uint path, uint mask, float x, float y) => + ThisThread.IsPointInFillPathRawNV(path, mask, x, y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -525011,7 +524988,7 @@ public static uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float [NativeFunction("opengl", EntryPoint = "glIsPointInStrokePathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsPointInStrokePathNV(uint path, float x, float y) => - (MaybeBool)(uint)((IGL)this).IsPointInStrokePathNVRawNV(path, x, y); + (MaybeBool)(uint)((IGL)this).IsPointInStrokePathRawNV(path, x, y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -525028,7 +525005,7 @@ public static MaybeBool IsPointInStrokePathNV(uint path, float x, float y) [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInStrokePathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsPointInStrokePathNVRawNV(uint path, float x, float y) => + uint IGL.IsPointInStrokePathRawNV(uint path, float x, float y) => ( (delegate* unmanaged)( _slots[1438] is not null and var loadedFnPtr @@ -525043,8 +525020,8 @@ _slots[1438] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInStrokePathNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsPointInStrokePathNVRawNV(uint path, float x, float y) => - ThisThread.IsPointInStrokePathNVRawNV(path, x, y); + public static uint IsPointInStrokePathRawNV(uint path, float x, float y) => + ThisThread.IsPointInStrokePathRawNV(path, x, y); [NativeName("glIsProgram")] [SupportedApiProfile( @@ -525148,7 +525125,7 @@ MaybeBool IGL.IsProgram(uint program) => [NativeFunction("opengl", EntryPoint = "glIsProgramARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsProgramARB(uint program) => - (MaybeBool)(uint)((IGL)this).IsProgramARBRawARB(program); + (MaybeBool)(uint)((IGL)this).IsProgramRawARB(program); [NativeName("glIsProgramARB")] [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] @@ -525160,7 +525137,7 @@ MaybeBool IGL.IsProgramARB(uint program) => [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsProgramARBRawARB(uint program) => + uint IGL.IsProgramRawARB(uint program) => ( (delegate* unmanaged)( _slots[1440] is not null and var loadedFnPtr @@ -525173,14 +525150,14 @@ _slots[1440] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsProgramARBRawARB(uint program) => ThisThread.IsProgramARBRawARB(program); + public static uint IsProgramRawARB(uint program) => ThisThread.IsProgramRawARB(program); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsProgramNV(uint id) => - (MaybeBool)(uint)((IGL)this).IsProgramNVRawNV(id); + (MaybeBool)(uint)((IGL)this).IsProgramRawNV(id); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] @@ -525192,7 +525169,7 @@ MaybeBool IGL.IsProgramNV(uint id) => [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsProgramNVRawNV(uint id) => + uint IGL.IsProgramRawNV(uint id) => ( (delegate* unmanaged)( _slots[1441] is not null and var loadedFnPtr @@ -525205,7 +525182,7 @@ _slots[1441] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsProgramNVRawNV(uint id) => ThisThread.IsProgramNVRawNV(id); + public static uint IsProgramRawNV(uint id) => ThisThread.IsProgramRawNV(id); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -525276,7 +525253,7 @@ public static MaybeBool IsProgramPipeline(uint pipeline) => [NativeFunction("opengl", EntryPoint = "glIsProgramPipelineEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsProgramPipelineEXT(uint pipeline) => - (MaybeBool)(uint)((IGL)this).IsProgramPipelineEXTRawEXT(pipeline); + (MaybeBool)(uint)((IGL)this).IsProgramPipelineRawEXT(pipeline); [NativeName("glIsProgramPipelineEXT")] [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] @@ -525289,7 +525266,7 @@ public static MaybeBool IsProgramPipelineEXT(uint pipeline) => [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] [NativeFunction("opengl", EntryPoint = "glIsProgramPipelineEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsProgramPipelineEXTRawEXT(uint pipeline) => + uint IGL.IsProgramPipelineRawEXT(uint pipeline) => ( (delegate* unmanaged)( _slots[1443] is not null and var loadedFnPtr @@ -525302,8 +525279,8 @@ _slots[1443] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] [NativeFunction("opengl", EntryPoint = "glIsProgramPipelineEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsProgramPipelineEXTRawEXT(uint pipeline) => - ThisThread.IsProgramPipelineEXTRawEXT(pipeline); + public static uint IsProgramPipelineRawEXT(uint pipeline) => + ThisThread.IsProgramPipelineRawEXT(pipeline); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -525572,8 +525549,7 @@ _slots[1439] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsQueryARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - MaybeBool IGL.IsQueryARB(uint id) => - (MaybeBool)(uint)((IGL)this).IsQueryARBRawARB(id); + MaybeBool IGL.IsQueryARB(uint id) => (MaybeBool)(uint)((IGL)this).IsQueryRawARB(id); [NativeName("glIsQueryARB")] [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] @@ -525585,7 +525561,7 @@ MaybeBool IGL.IsQueryARB(uint id) => [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsQueryARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsQueryARBRawARB(uint id) => + uint IGL.IsQueryRawARB(uint id) => ( (delegate* unmanaged)( _slots[1445] is not null and var loadedFnPtr @@ -525598,7 +525574,7 @@ _slots[1445] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsQueryARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsQueryARBRawARB(uint id) => ThisThread.IsQueryARBRawARB(id); + public static uint IsQueryRawARB(uint id) => ThisThread.IsQueryRawARB(id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -525607,8 +525583,7 @@ _slots[1445] is not null and var loadedFnPtr )] [NativeFunction("opengl", EntryPoint = "glIsQueryEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - MaybeBool IGL.IsQueryEXT(uint id) => - (MaybeBool)(uint)((IGL)this).IsQueryEXTRawEXT(id); + MaybeBool IGL.IsQueryEXT(uint id) => (MaybeBool)(uint)((IGL)this).IsQueryRawEXT(id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -525626,7 +525601,7 @@ MaybeBool IGL.IsQueryEXT(uint id) => )] [NativeFunction("opengl", EntryPoint = "glIsQueryEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsQueryEXTRawEXT(uint id) => + uint IGL.IsQueryRawEXT(uint id) => ( (delegate* unmanaged)( _slots[1446] is not null and var loadedFnPtr @@ -525642,7 +525617,7 @@ _slots[1446] is not null and var loadedFnPtr )] [NativeFunction("opengl", EntryPoint = "glIsQueryEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsQueryEXTRawEXT(uint id) => ThisThread.IsQueryEXTRawEXT(id); + public static uint IsQueryRawEXT(uint id) => ThisThread.IsQueryRawEXT(id); [NativeName("glIsQuery")] [SupportedApiProfile( @@ -525840,7 +525815,7 @@ public static MaybeBool IsRenderbuffer(uint renderbuffer) => [NativeFunction("opengl", EntryPoint = "glIsRenderbufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsRenderbufferEXT(uint renderbuffer) => - (MaybeBool)(uint)((IGL)this).IsRenderbufferEXTRawEXT(renderbuffer); + (MaybeBool)(uint)((IGL)this).IsRenderbufferRawEXT(renderbuffer); [NativeName("glIsRenderbufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] @@ -525853,7 +525828,7 @@ public static MaybeBool IsRenderbufferEXT(uint renderbuffer) => [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsRenderbufferEXTRawEXT(uint renderbuffer) => + uint IGL.IsRenderbufferRawEXT(uint renderbuffer) => ( (delegate* unmanaged)( _slots[1448] is not null and var loadedFnPtr @@ -525866,15 +525841,15 @@ _slots[1448] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsRenderbufferEXTRawEXT(uint renderbuffer) => - ThisThread.IsRenderbufferEXTRawEXT(renderbuffer); + public static uint IsRenderbufferRawEXT(uint renderbuffer) => + ThisThread.IsRenderbufferRawEXT(renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsRenderbufferOES(uint renderbuffer) => - (MaybeBool)(uint)((IGL)this).IsRenderbufferOESRawOES(renderbuffer); + (MaybeBool)(uint)((IGL)this).IsRenderbufferRawOES(renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -525887,7 +525862,7 @@ public static MaybeBool IsRenderbufferOES(uint renderbuffer) => [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsRenderbufferOESRawOES(uint renderbuffer) => + uint IGL.IsRenderbufferRawOES(uint renderbuffer) => ( (delegate* unmanaged)( _slots[1449] is not null and var loadedFnPtr @@ -525900,8 +525875,8 @@ _slots[1449] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsRenderbufferOESRawOES(uint renderbuffer) => - ThisThread.IsRenderbufferOESRawOES(renderbuffer); + public static uint IsRenderbufferRawOES(uint renderbuffer) => + ThisThread.IsRenderbufferRawOES(renderbuffer); [NativeName("glIsRenderbuffer")] [SupportedApiProfile( @@ -526177,7 +526152,7 @@ _slots[1450] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsSemaphoreEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsSemaphoreEXT(uint semaphore) => - (MaybeBool)(uint)((IGL)this).IsSemaphoreEXTRawEXT(semaphore); + (MaybeBool)(uint)((IGL)this).IsSemaphoreRawEXT(semaphore); [NativeName("glIsSemaphoreEXT")] [SupportedApiProfile("gl", ["GL_EXT_semaphore"])] @@ -526192,7 +526167,7 @@ public static MaybeBool IsSemaphoreEXT(uint semaphore) => [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])] [NativeFunction("opengl", EntryPoint = "glIsSemaphoreEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsSemaphoreEXTRawEXT(uint semaphore) => + uint IGL.IsSemaphoreRawEXT(uint semaphore) => ( (delegate* unmanaged)( _slots[1451] is not null and var loadedFnPtr @@ -526206,8 +526181,7 @@ _slots[1451] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])] [NativeFunction("opengl", EntryPoint = "glIsSemaphoreEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsSemaphoreEXTRawEXT(uint semaphore) => - ThisThread.IsSemaphoreEXTRawEXT(semaphore); + public static uint IsSemaphoreRawEXT(uint semaphore) => ThisThread.IsSemaphoreRawEXT(semaphore); [NativeName("glIsShader")] [SupportedApiProfile( @@ -526415,7 +526389,7 @@ _slots[1452] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsStateNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsStateNV(uint state) => - (MaybeBool)(uint)((IGL)this).IsStateNVRawNV(state); + (MaybeBool)(uint)((IGL)this).IsStateRawNV(state); [NativeName("glIsStateNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -526429,7 +526403,7 @@ MaybeBool IGL.IsStateNV(uint state) => [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsStateNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsStateNVRawNV(uint state) => + uint IGL.IsStateRawNV(uint state) => ( (delegate* unmanaged)( _slots[1453] is not null and var loadedFnPtr @@ -526443,7 +526417,7 @@ _slots[1453] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsStateNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsStateNVRawNV(uint state) => ThisThread.IsStateNVRawNV(state); + public static uint IsStateRawNV(uint state) => ThisThread.IsStateRawNV(state); [NativeName("glIsSync")] [SupportedApiProfile( @@ -526771,7 +526745,7 @@ MaybeBool IGL.IsTexture(uint texture) => [NativeFunction("opengl", EntryPoint = "glIsTextureEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsTextureEXT(uint texture) => - (MaybeBool)(uint)((IGL)this).IsTextureEXTRawEXT(texture); + (MaybeBool)(uint)((IGL)this).IsTextureRawEXT(texture); [NativeName("glIsTextureEXT")] [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] @@ -526783,7 +526757,7 @@ MaybeBool IGL.IsTextureEXT(uint texture) => [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] [NativeFunction("opengl", EntryPoint = "glIsTextureEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsTextureEXTRawEXT(uint texture) => + uint IGL.IsTextureRawEXT(uint texture) => ( (delegate* unmanaged)( _slots[1457] is not null and var loadedFnPtr @@ -526796,7 +526770,7 @@ _slots[1457] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] [NativeFunction("opengl", EntryPoint = "glIsTextureEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsTextureEXTRawEXT(uint texture) => ThisThread.IsTextureEXTRawEXT(texture); + public static uint IsTextureRawEXT(uint texture) => ThisThread.IsTextureRawEXT(texture); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -526804,7 +526778,7 @@ _slots[1457] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsTextureHandleResidentARB(ulong handle) => - (MaybeBool)(uint)((IGL)this).IsTextureHandleResidentARBRawARB(handle); + (MaybeBool)(uint)((IGL)this).IsTextureHandleResidentRawARB(handle); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -526819,7 +526793,7 @@ public static MaybeBool IsTextureHandleResidentARB(ulong handle) => [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsTextureHandleResidentARBRawARB(ulong handle) => + uint IGL.IsTextureHandleResidentRawARB(ulong handle) => ( (delegate* unmanaged)( _slots[1458] is not null and var loadedFnPtr @@ -526836,8 +526810,8 @@ _slots[1458] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentARB")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsTextureHandleResidentARBRawARB(ulong handle) => - ThisThread.IsTextureHandleResidentARBRawARB(handle); + public static uint IsTextureHandleResidentRawARB(ulong handle) => + ThisThread.IsTextureHandleResidentRawARB(handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -526846,7 +526820,7 @@ public static uint IsTextureHandleResidentARBRawARB(ulong handle) => [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsTextureHandleResidentNV(ulong handle) => - (MaybeBool)(uint)((IGL)this).IsTextureHandleResidentNVRawNV(handle); + (MaybeBool)(uint)((IGL)this).IsTextureHandleResidentRawNV(handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -526863,7 +526837,7 @@ public static MaybeBool IsTextureHandleResidentNV(ulong handle) => [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsTextureHandleResidentNVRawNV(ulong handle) => + uint IGL.IsTextureHandleResidentRawNV(ulong handle) => ( (delegate* unmanaged)( _slots[1459] is not null and var loadedFnPtr @@ -526881,8 +526855,8 @@ _slots[1459] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsTextureHandleResidentNVRawNV(ulong handle) => - ThisThread.IsTextureHandleResidentNVRawNV(handle); + public static uint IsTextureHandleResidentRawNV(ulong handle) => + ThisThread.IsTextureHandleResidentRawNV(handle); [NativeName("glIsTexture")] [SupportedApiProfile( @@ -527082,7 +527056,7 @@ public static MaybeBool IsTransformFeedback(uint id) => [NativeFunction("opengl", EntryPoint = "glIsTransformFeedbackNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsTransformFeedbackNV(uint id) => - (MaybeBool)(uint)((IGL)this).IsTransformFeedbackNVRawNV(id); + (MaybeBool)(uint)((IGL)this).IsTransformFeedbackRawNV(id); [NativeName("glIsTransformFeedbackNV")] [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] @@ -527095,7 +527069,7 @@ public static MaybeBool IsTransformFeedbackNV(uint id) => [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] [NativeFunction("opengl", EntryPoint = "glIsTransformFeedbackNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsTransformFeedbackNVRawNV(uint id) => + uint IGL.IsTransformFeedbackRawNV(uint id) => ( (delegate* unmanaged)( _slots[1461] is not null and var loadedFnPtr @@ -527108,8 +527082,7 @@ _slots[1461] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] [NativeFunction("opengl", EntryPoint = "glIsTransformFeedbackNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsTransformFeedbackNVRawNV(uint id) => - ThisThread.IsTransformFeedbackNVRawNV(id); + public static uint IsTransformFeedbackRawNV(uint id) => ThisThread.IsTransformFeedbackRawNV(id); [NativeName("glIsTransformFeedback")] [SupportedApiProfile( @@ -527308,7 +527281,7 @@ MaybeBool IGL.IsVertexArray(uint array) => [NativeFunction("opengl", EntryPoint = "glIsVertexArrayAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsVertexArrayAPPLE(uint array) => - (MaybeBool)(uint)((IGL)this).IsVertexArrayAppleRawAPPLE(array); + (MaybeBool)(uint)((IGL)this).IsVertexArrayRawAPPLE(array); [NativeName("glIsVertexArrayAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] @@ -527321,7 +527294,7 @@ public static MaybeBool IsVertexArrayAPPLE(uint array) => [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsVertexArrayAppleRawAPPLE(uint array) => + uint IGL.IsVertexArrayRawAPPLE(uint array) => ( (delegate* unmanaged)( _slots[1464] is not null and var loadedFnPtr @@ -527334,8 +527307,7 @@ _slots[1464] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsVertexArrayAppleRawAPPLE(uint array) => - ThisThread.IsVertexArrayAppleRawAPPLE(array); + public static uint IsVertexArrayRawAPPLE(uint array) => ThisThread.IsVertexArrayRawAPPLE(array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -527343,7 +527315,7 @@ public static uint IsVertexArrayAppleRawAPPLE(uint array) => [NativeFunction("opengl", EntryPoint = "glIsVertexArrayOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsVertexArrayOES(uint array) => - (MaybeBool)(uint)((IGL)this).IsVertexArrayOESRawOES(array); + (MaybeBool)(uint)((IGL)this).IsVertexArrayRawOES(array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -527358,7 +527330,7 @@ public static MaybeBool IsVertexArrayOES(uint array) => [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsVertexArrayOESRawOES(uint array) => + uint IGL.IsVertexArrayRawOES(uint array) => ( (delegate* unmanaged)( _slots[1465] is not null and var loadedFnPtr @@ -527372,8 +527344,7 @@ _slots[1465] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsVertexArrayOESRawOES(uint array) => - ThisThread.IsVertexArrayOESRawOES(array); + public static uint IsVertexArrayRawOES(uint array) => ThisThread.IsVertexArrayRawOES(array); [NativeName("glIsVertexArray")] [SupportedApiProfile( @@ -527469,7 +527440,7 @@ _slots[1463] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glIsVertexAttribEnabledAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.IsVertexAttribEnabledAPPLE(uint index, uint pname) => - (MaybeBool)(uint)((IGL)this).IsVertexAttribEnabledAppleRawAPPLE(index, pname); + (MaybeBool)(uint)((IGL)this).IsVertexAttribEnabledRawAPPLE(index, pname); [NativeName("glIsVertexAttribEnabledAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] @@ -527482,7 +527453,7 @@ public static MaybeBool IsVertexAttribEnabledAPPLE(uint index, uint pname) [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] [NativeFunction("opengl", EntryPoint = "glIsVertexAttribEnabledAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname) => + uint IGL.IsVertexAttribEnabledRawAPPLE(uint index, uint pname) => ( (delegate* unmanaged)( _slots[1466] is not null and var loadedFnPtr @@ -527498,8 +527469,8 @@ _slots[1466] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] [NativeFunction("opengl", EntryPoint = "glIsVertexAttribEnabledAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname) => - ThisThread.IsVertexAttribEnabledAppleRawAPPLE(index, pname); + public static uint IsVertexAttribEnabledRawAPPLE(uint index, uint pname) => + ThisThread.IsVertexAttribEnabledRawAPPLE(index, pname); [NativeName("glLabelObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_debug_label"])] @@ -533457,7 +533428,7 @@ Constant access [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] [NativeFunction("opengl", EntryPoint = "glMapObjectBufferATI")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - Ptr IGL.MapObjectBufferATI(uint buffer) => (void*)((IGL)this).MapObjectBufferATIRawATI(buffer); + Ptr IGL.MapObjectBufferATI(uint buffer) => (void*)((IGL)this).MapObjectBufferRawATI(buffer); [NativeName("glMapObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] @@ -533469,7 +533440,7 @@ Constant access [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] [NativeFunction("opengl", EntryPoint = "glMapObjectBufferATI")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void* IGL.MapObjectBufferATIRawATI(uint buffer) => + void* IGL.MapObjectBufferRawATI(uint buffer) => ( (delegate* unmanaged)( _slots[1550] is not null and var loadedFnPtr @@ -533482,8 +533453,8 @@ _slots[1550] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] [NativeFunction("opengl", EntryPoint = "glMapObjectBufferATI")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void* MapObjectBufferATIRawATI(uint buffer) => - ThisThread.MapObjectBufferATIRawATI(buffer); + public static void* MapObjectBufferRawATI(uint buffer) => + ThisThread.MapObjectBufferRawATI(buffer); [NativeName("glMapParameterfvNV")] [SupportedApiProfile("gl", ["GL_NV_evaluators"])] @@ -540635,23 +540606,7 @@ public static void MultiTexCoord1OES(Constant texture [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.MultiTexCoord1BvOOES(Constant texture, sbyte coords) => - ((IGL)this).MultiTexCoord1OES((uint)texture, (sbyte*)&coords); - - [NativeName("glMultiTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void MultiTexCoord1BvOOES( - Constant texture, - sbyte coords - ) => ThisThread.MultiTexCoord1BvOOES(texture, coords); - - [NativeName("glMultiTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.MultiTexCoord1OES(uint texture, sbyte* coords) => + void IGL.MultiTexCoord1bvOES(uint texture, sbyte* coords) => ( (delegate* unmanaged)( _slots[1650] is not null and var loadedFnPtr @@ -540664,18 +540619,18 @@ _slots[1650] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void MultiTexCoord1OES(uint texture, sbyte* coords) => - ThisThread.MultiTexCoord1OES(texture, coords); + public static void MultiTexCoord1bvOES(uint texture, sbyte* coords) => + ThisThread.MultiTexCoord1bvOES(texture, coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.MultiTexCoord1OES(Constant texture, Ref coords) + void IGL.MultiTexCoord1bvOES(Constant texture, Ref coords) { fixed (sbyte* __dsl_coords = coords) { - ((IGL)this).MultiTexCoord1OES((uint)texture, __dsl_coords); + ((IGL)this).MultiTexCoord1bvOES((uint)texture, __dsl_coords); } } @@ -540683,10 +540638,26 @@ void IGL.MultiTexCoord1OES(Constant texture, Ref texture, Ref coords - ) => ThisThread.MultiTexCoord1OES(texture, coords); + ) => ThisThread.MultiTexCoord1bvOES(texture, coords); + + [NativeName("glMultiTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.MultiTexCoord1bvOES(Constant texture, sbyte coords) => + ((IGL)this).MultiTexCoord1bvOES((uint)texture, (sbyte*)&coords); + + [NativeName("glMultiTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void MultiTexCoord1bvOES( + Constant texture, + sbyte coords + ) => ThisThread.MultiTexCoord1bvOES(texture, coords); [NativeName("glMultiTexCoord1d")] [SupportedApiProfile( @@ -542360,23 +542331,7 @@ public static void MultiTexCoord1XOES(Constant textur [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.MultiTexCoord1XvOOES(Constant texture, int coords) => - ((IGL)this).MultiTexCoord1XOES((uint)texture, (int*)&coords); - - [NativeName("glMultiTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void MultiTexCoord1XvOOES( - Constant texture, - int coords - ) => ThisThread.MultiTexCoord1XvOOES(texture, coords); - - [NativeName("glMultiTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.MultiTexCoord1XOES(uint texture, int* coords) => + void IGL.MultiTexCoord1XvOES(uint texture, int* coords) => ( (delegate* unmanaged)( _slots[1670] is not null and var loadedFnPtr @@ -542389,18 +542344,18 @@ _slots[1670] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void MultiTexCoord1XOES(uint texture, int* coords) => - ThisThread.MultiTexCoord1XOES(texture, coords); + public static void MultiTexCoord1XvOES(uint texture, int* coords) => + ThisThread.MultiTexCoord1XvOES(texture, coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.MultiTexCoord1XOES(Constant texture, Ref coords) + void IGL.MultiTexCoord1XvOES(Constant texture, Ref coords) { fixed (int* __dsl_coords = coords) { - ((IGL)this).MultiTexCoord1XOES((uint)texture, __dsl_coords); + ((IGL)this).MultiTexCoord1XvOES((uint)texture, __dsl_coords); } } @@ -542408,10 +542363,26 @@ void IGL.MultiTexCoord1XOES(Constant texture, Ref texture, Ref coords - ) => ThisThread.MultiTexCoord1XOES(texture, coords); + ) => ThisThread.MultiTexCoord1XvOES(texture, coords); + + [NativeName("glMultiTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.MultiTexCoord1XvOES(Constant texture, int coords) => + ((IGL)this).MultiTexCoord1XvOES((uint)texture, (int*)&coords); + + [NativeName("glMultiTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void MultiTexCoord1XvOES( + Constant texture, + int coords + ) => ThisThread.MultiTexCoord1XvOES(texture, coords); [NativeName("glMultiTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -583669,7 +583640,7 @@ public static void ReferencePlaneSGIX(Ref equation) => [NativeFunction("opengl", EntryPoint = "glReleaseKeyedMutexWin32EXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.ReleaseKeyedMutexWin32EXT(uint memory, ulong key) => - (MaybeBool)(uint)((IGL)this).ReleaseKeyedMutexWin32EXTRawEXT(memory, key); + (MaybeBool)(uint)((IGL)this).ReleaseKeyedMutexWin32RawEXT(memory, key); [NativeName("glReleaseKeyedMutexWin32EXT")] [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] @@ -583684,7 +583655,7 @@ public static MaybeBool ReleaseKeyedMutexWin32EXT(uint memory, ulong key) [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glReleaseKeyedMutexWin32EXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key) => + uint IGL.ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key) => ( (delegate* unmanaged)( _slots[2231] is not null and var loadedFnPtr @@ -583701,8 +583672,8 @@ _slots[2231] is not null and var loadedFnPtr [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glReleaseKeyedMutexWin32EXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key) => - ThisThread.ReleaseKeyedMutexWin32EXTRawEXT(memory, key); + public static uint ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key) => + ThisThread.ReleaseKeyedMutexWin32RawEXT(memory, key); [NativeName("glReleaseShaderCompiler")] [SupportedApiProfile( @@ -590529,20 +590500,6 @@ public static void ScissorArrayNV(uint first, uint count, Ref v) => [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static void ScissorArrayNV(uint first, int v) => ThisThread.ScissorArrayNV(first, v); - [NativeName("glScissorArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.ScissorArrayvOOES(uint first, int v) => - ((IGL)this).ScissorArrayOES(first, 1, (int*)&v); - - [NativeName("glScissorArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void ScissorArrayvOOES(uint first, int v) => - ThisThread.ScissorArrayvOOES(first, v); - [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] @@ -590582,6 +590539,18 @@ void IGL.ScissorArrayOES(uint first, uint count, Ref v) public static void ScissorArrayOES(uint first, uint count, Ref v) => ThisThread.ScissorArrayOES(first, count, v); + [NativeName("glScissorArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.ScissorArrayOES(uint first, int v) => ((IGL)this).ScissorArrayOES(first, 1, (int*)&v); + + [NativeName("glScissorArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void ScissorArrayOES(uint first, int v) => ThisThread.ScissorArrayOES(first, v); + [NativeName("glScissorExclusiveArrayvNV")] [SupportedApiProfile("gl", ["GL_NV_scissor_exclusive"])] [SupportedApiProfile("glcore", ["GL_NV_scissor_exclusive"])] @@ -598868,7 +598837,7 @@ _slots[2439] is not null and var loadedFnPtr [NativeFunction("opengl", EntryPoint = "glTestFenceAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.TestFenceAPPLE(uint fence) => - (MaybeBool)(uint)((IGL)this).TestFenceAppleRawAPPLE(fence); + (MaybeBool)(uint)((IGL)this).TestFenceRawAPPLE(fence); [NativeName("glTestFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -598880,7 +598849,7 @@ MaybeBool IGL.TestFenceAPPLE(uint fence) => [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.TestFenceAppleRawAPPLE(uint fence) => + uint IGL.TestFenceRawAPPLE(uint fence) => ( (delegate* unmanaged)( _slots[2440] is not null and var loadedFnPtr @@ -598893,8 +598862,7 @@ _slots[2440] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint TestFenceAppleRawAPPLE(uint fence) => - ThisThread.TestFenceAppleRawAPPLE(fence); + public static uint TestFenceRawAPPLE(uint fence) => ThisThread.TestFenceRawAPPLE(fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -598903,7 +598871,7 @@ public static uint TestFenceAppleRawAPPLE(uint fence) => [NativeFunction("opengl", EntryPoint = "glTestFenceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.TestFenceNV(uint fence) => - (MaybeBool)(uint)((IGL)this).TestFenceNVRawNV(fence); + (MaybeBool)(uint)((IGL)this).TestFenceRawNV(fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -598919,7 +598887,7 @@ MaybeBool IGL.TestFenceNV(uint fence) => [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.TestFenceNVRawNV(uint fence) => + uint IGL.TestFenceRawNV(uint fence) => ( (delegate* unmanaged)( _slots[2441] is not null and var loadedFnPtr @@ -598934,14 +598902,14 @@ _slots[2441] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint TestFenceNVRawNV(uint fence) => ThisThread.TestFenceNVRawNV(fence); + public static uint TestFenceRawNV(uint fence) => ThisThread.TestFenceRawNV(fence); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestObjectAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.TestObjectAPPLE(uint @object, uint name) => - (MaybeBool)(uint)((IGL)this).TestObjectAppleRawAPPLE(@object, name); + (MaybeBool)(uint)((IGL)this).TestObjectRawAPPLE(@object, name); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -598954,7 +598922,7 @@ public static MaybeBool TestObjectAPPLE(uint @object, uint name) => [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestObjectAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.TestObjectAppleRawAPPLE(uint @object, uint name) => + uint IGL.TestObjectRawAPPLE(uint @object, uint name) => ( (delegate* unmanaged)( _slots[2442] is not null and var loadedFnPtr @@ -598967,8 +598935,8 @@ _slots[2442] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestObjectAPPLE")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint TestObjectAppleRawAPPLE(uint @object, uint name) => - ThisThread.TestObjectAppleRawAPPLE(@object, name); + public static uint TestObjectRawAPPLE(uint @object, uint name) => + ThisThread.TestObjectRawAPPLE(@object, name); [NativeName("glTexAttachMemoryNV")] [SupportedApiProfile("gl", ["GL_NV_memory_attachment"])] @@ -599667,19 +599635,7 @@ _slots[2453] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.TexCoord1BvOOES(sbyte coords) => ((IGL)this).TexCoord1OES((sbyte*)&coords); - - [NativeName("glTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void TexCoord1BvOOES(sbyte coords) => ThisThread.TexCoord1BvOOES(coords); - - [NativeName("glTexCoord1bvOES")] - [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] - [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.TexCoord1OES(sbyte* coords) => + void IGL.TexCoord1bvOES(sbyte* coords) => ( (delegate* unmanaged)( _slots[2454] is not null and var loadedFnPtr @@ -599692,17 +599648,17 @@ _slots[2454] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void TexCoord1OES(sbyte* coords) => ThisThread.TexCoord1OES(coords); + public static void TexCoord1bvOES(sbyte* coords) => ThisThread.TexCoord1bvOES(coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.TexCoord1OES(Ref coords) + void IGL.TexCoord1bvOES(Ref coords) { fixed (sbyte* __dsl_coords = coords) { - ((IGL)this).TexCoord1OES(__dsl_coords); + ((IGL)this).TexCoord1bvOES(__dsl_coords); } } @@ -599710,7 +599666,19 @@ void IGL.TexCoord1OES(Ref coords) [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void TexCoord1OES(Ref coords) => ThisThread.TexCoord1OES(coords); + public static void TexCoord1bvOES(Ref coords) => ThisThread.TexCoord1bvOES(coords); + + [NativeName("glTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.TexCoord1bvOES(sbyte coords) => ((IGL)this).TexCoord1bvOES((sbyte*)&coords); + + [NativeName("glTexCoord1bvOES")] + [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] + [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void TexCoord1bvOES(sbyte coords) => ThisThread.TexCoord1bvOES(coords); [NativeName("glTexCoord1d")] [SupportedApiProfile( @@ -600843,19 +600811,7 @@ _slots[2465] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.TexCoord1XvOOES(int coords) => ((IGL)this).TexCoord1XOES((int*)&coords); - - [NativeName("glTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void TexCoord1XvOOES(int coords) => ThisThread.TexCoord1XvOOES(coords); - - [NativeName("glTexCoord1xvOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.TexCoord1XOES(int* coords) => + void IGL.TexCoord1XvOES(int* coords) => ( (delegate* unmanaged)( _slots[2466] is not null and var loadedFnPtr @@ -600868,17 +600824,17 @@ _slots[2466] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void TexCoord1XOES(int* coords) => ThisThread.TexCoord1XOES(coords); + public static void TexCoord1XvOES(int* coords) => ThisThread.TexCoord1XvOES(coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.TexCoord1XOES(Ref coords) + void IGL.TexCoord1XvOES(Ref coords) { fixed (int* __dsl_coords = coords) { - ((IGL)this).TexCoord1XOES(__dsl_coords); + ((IGL)this).TexCoord1XvOES(__dsl_coords); } } @@ -600886,7 +600842,19 @@ void IGL.TexCoord1XOES(Ref coords) [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void TexCoord1XOES(Ref coords) => ThisThread.TexCoord1XOES(coords); + public static void TexCoord1XvOES(Ref coords) => ThisThread.TexCoord1XvOES(coords); + + [NativeName("glTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.TexCoord1XvOES(int coords) => ((IGL)this).TexCoord1XvOES((int*)&coords); + + [NativeName("glTexCoord1xvOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void TexCoord1XvOES(int coords) => ThisThread.TexCoord1XvOES(coords); [NativeName("glTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -631782,7 +631750,7 @@ public static MaybeBool UnmapBufferARB(Constant IGL.UnmapBufferOES(uint target) => - (MaybeBool)(uint)((IGL)this).UnmapBufferOESRawOES(target); + (MaybeBool)(uint)((IGL)this).UnmapBufferRawOES(target); [NativeName("glUnmapBufferOES")] [SupportedApiProfile("gles2", ["GL_OES_mapbuffer"])] @@ -631796,7 +631764,7 @@ MaybeBool IGL.UnmapBufferOES(uint target) => [SupportedApiProfile("gles1", ["GL_OES_mapbuffer"])] [NativeFunction("opengl", EntryPoint = "glUnmapBufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.UnmapBufferOESRawOES(uint target) => + uint IGL.UnmapBufferRawOES(uint target) => ( (delegate* unmanaged)( _slots[2814] is not null and var loadedFnPtr @@ -631810,7 +631778,7 @@ _slots[2814] is not null and var loadedFnPtr [SupportedApiProfile("gles1", ["GL_OES_mapbuffer"])] [NativeFunction("opengl", EntryPoint = "glUnmapBufferOES")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint UnmapBufferOESRawOES(uint target) => ThisThread.UnmapBufferOESRawOES(target); + public static uint UnmapBufferRawOES(uint target) => ThisThread.UnmapBufferRawOES(target); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -631850,7 +631818,7 @@ public static MaybeBool UnmapNamedBuffer(uint buffer) => [NativeFunction("opengl", EntryPoint = "glUnmapNamedBufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.UnmapNamedBufferEXT(uint buffer) => - (MaybeBool)(uint)((IGL)this).UnmapNamedBufferEXTRawEXT(buffer); + (MaybeBool)(uint)((IGL)this).UnmapNamedBufferRawEXT(buffer); [NativeName("glUnmapNamedBufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])] @@ -631865,7 +631833,7 @@ public static MaybeBool UnmapNamedBufferEXT(uint buffer) => [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])] [NativeFunction("opengl", EntryPoint = "glUnmapNamedBufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.UnmapNamedBufferEXTRawEXT(uint buffer) => + uint IGL.UnmapNamedBufferRawEXT(uint buffer) => ( (delegate* unmanaged)( _slots[2816] is not null and var loadedFnPtr @@ -631879,8 +631847,8 @@ _slots[2816] is not null and var loadedFnPtr [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])] [NativeFunction("opengl", EntryPoint = "glUnmapNamedBufferEXT")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint UnmapNamedBufferEXTRawEXT(uint buffer) => - ThisThread.UnmapNamedBufferEXTRawEXT(buffer); + public static uint UnmapNamedBufferRawEXT(uint buffer) => + ThisThread.UnmapNamedBufferRawEXT(buffer); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -633212,7 +633180,7 @@ public static void VdpauInitNV(Ref vdpDevice, Ref getProcAddress) => [NativeFunction("opengl", EntryPoint = "glVDPAUIsSurfaceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] MaybeBool IGL.VdpauIsSurfaceNV(nint surface) => - (MaybeBool)(uint)((IGL)this).VdpauIsSurfaceNVRawNV(surface); + (MaybeBool)(uint)((IGL)this).VdpauIsSurfaceRawNV(surface); [NativeName("glVDPAUIsSurfaceNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] @@ -633225,7 +633193,7 @@ public static MaybeBool VdpauIsSurfaceNV(nint surface) => [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] [NativeFunction("opengl", EntryPoint = "glVDPAUIsSurfaceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - uint IGL.VdpauIsSurfaceNVRawNV(nint surface) => + uint IGL.VdpauIsSurfaceRawNV(nint surface) => ( (delegate* unmanaged)( _slots[2843] is not null and var loadedFnPtr @@ -633238,8 +633206,7 @@ _slots[2843] is not null and var loadedFnPtr [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] [NativeFunction("opengl", EntryPoint = "glVDPAUIsSurfaceNV")] [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static uint VdpauIsSurfaceNVRawNV(nint surface) => - ThisThread.VdpauIsSurfaceNVRawNV(surface); + public static uint VdpauIsSurfaceRawNV(nint surface) => ThisThread.VdpauIsSurfaceRawNV(surface); [NativeName("glVDPAUMapSurfacesNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] @@ -659038,20 +659005,6 @@ void IGL.ViewportArrayNV(uint first, float v) => [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static void ViewportArrayNV(uint first, float v) => ThisThread.ViewportArrayNV(first, v); - [NativeName("glViewportArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - void IGL.ViewportArrayvOOES(uint first, float v) => - ((IGL)this).ViewportArrayOES(first, 1, (float*)&v); - - [NativeName("glViewportArrayvOES")] - [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] - [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - public static void ViewportArrayvOOES(uint first, float v) => - ThisThread.ViewportArrayvOOES(first, v); - [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] @@ -659091,6 +659044,20 @@ void IGL.ViewportArrayOES(uint first, uint count, Ref v) public static void ViewportArrayOES(uint first, uint count, Ref v) => ThisThread.ViewportArrayOES(first, count, v); + [NativeName("glViewportArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + void IGL.ViewportArrayOES(uint first, float v) => + ((IGL)this).ViewportArrayOES(first, 1, (float*)&v); + + [NativeName("glViewportArrayvOES")] + [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] + [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static void ViewportArrayOES(uint first, float v) => + ThisThread.ViewportArrayOES(first, v); + [NativeName("glViewportIndexedf")] [SupportedApiProfile( "gl", diff --git a/sources/OpenGL/OpenGL/gl/IGL.gen.cs b/sources/OpenGL/OpenGL/gl/IGL.gen.cs index d1e943a6c3..6f4d3e5a24 100644 --- a/sources/OpenGL/OpenGL/gl/IGL.gen.cs +++ b/sources/OpenGL/OpenGL/gl/IGL.gen.cs @@ -88,7 +88,7 @@ uint timeout [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glAcquireKeyedMutexWin32EXT")] - static abstract uint AcquireKeyedMutexWin32EXTRawEXT(uint memory, ulong key, uint timeout); + static abstract uint AcquireKeyedMutexWin32RawEXT(uint memory, ulong key, uint timeout); [NativeName("glActiveProgramEXT")] [SupportedApiProfile("gl", ["GL_EXT_separate_shader_objects"])] @@ -3225,13 +3225,14 @@ byte bitmap [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] - static abstract void BitmapxOOES( + static abstract void BitmapxOES( + uint width, uint height, int xorig, int yorig, int xmove, int ymove, - byte bitmap + byte* bitmap ); [NativeName("glBitmapxOES")] @@ -3244,20 +3245,19 @@ static abstract void BitmapxOES( int yorig, int xmove, int ymove, - byte* bitmap + Ref bitmap ); [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] static abstract void BitmapxOES( - uint width, uint height, int xorig, int yorig, int xmove, int ymove, - Ref bitmap + byte bitmap ); [NativeName("glBlendBarrierKHR")] @@ -15222,17 +15222,17 @@ Ref points [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - static abstract void DeleteFramebuffersOOES(uint framebuffers); + static abstract void DeleteFramebuffersOES(uint n, uint* framebuffers); [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - static abstract void DeleteFramebuffersOES(uint n, uint* framebuffers); + static abstract void DeleteFramebuffersOES(uint n, Ref framebuffers); [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - static abstract void DeleteFramebuffersOES(uint n, Ref framebuffers); + static abstract void DeleteFramebuffersOES(uint framebuffers); [NativeName("glDeleteLists")] [SupportedApiProfile( @@ -15890,17 +15890,17 @@ Ref points [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - static abstract void DeleteRenderbuffersOOES(uint renderbuffers); + static abstract void DeleteRenderbuffersOES(uint n, uint* renderbuffers); [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - static abstract void DeleteRenderbuffersOES(uint n, uint* renderbuffers); + static abstract void DeleteRenderbuffersOES(uint n, Ref renderbuffers); [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - static abstract void DeleteRenderbuffersOES(uint n, Ref renderbuffers); + static abstract void DeleteRenderbuffersOES(uint renderbuffers); [NativeName("glDeleteSamplers")] [SupportedApiProfile( @@ -16640,19 +16640,19 @@ Ref points [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - static abstract void DeleteVertexArraysOOES(uint arrays); + static abstract void DeleteVertexArraysOES(uint n, uint* arrays); [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - static abstract void DeleteVertexArraysOES(uint n, uint* arrays); + static abstract void DeleteVertexArraysOES(uint n, Ref arrays); [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - static abstract void DeleteVertexArraysOES(uint n, Ref arrays); + static abstract void DeleteVertexArraysOES(uint arrays); [NativeName("glDeleteVertexShaderEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -21896,17 +21896,17 @@ uint index [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - static abstract void EvalCoord1XvOOES(int coords); + static abstract void EvalCoord1XvOES(int* coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - static abstract void EvalCoord1XOES(int* coords); + static abstract void EvalCoord1XvOES(Ref coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - static abstract void EvalCoord1XOES(Ref coords); + static abstract void EvalCoord1XvOES(int coords); [NativeName("glEvalCoord2d")] [SupportedApiProfile( @@ -22548,7 +22548,7 @@ Ref numTextures [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])] [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])] [NativeFunction("opengl", EntryPoint = "glExtIsProgramBinaryQCOM")] - static abstract uint ExtIsProgramBinaryQCOMRawQCOM(uint program); + static abstract uint ExtIsProgramBinaryRawQCOM(uint program); [NativeName("glExtractComponentEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -22665,17 +22665,17 @@ Ref buffer [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - static abstract void FeedbackBufferxOOES(uint type, int buffer); + static abstract void FeedbackBufferxOES(uint n, uint type, int* buffer); [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - static abstract void FeedbackBufferxOES(uint n, uint type, int* buffer); + static abstract void FeedbackBufferxOES(uint n, uint type, Ref buffer); [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - static abstract void FeedbackBufferxOES(uint n, uint type, Ref buffer); + static abstract void FeedbackBufferxOES(uint type, int buffer); [NativeName("glFenceSync")] [SupportedApiProfile( @@ -25980,17 +25980,17 @@ Constant target [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - static abstract uint GenFramebuffersOOES(); + static abstract void GenFramebuffersOES(uint n, uint* framebuffers); [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - static abstract void GenFramebuffersOES(uint n, uint* framebuffers); + static abstract void GenFramebuffersOES(uint n, Ref framebuffers); [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - static abstract void GenFramebuffersOES(uint n, Ref framebuffers); + static abstract uint GenFramebuffersOES(); [NativeName("glGenLists")] [SupportedApiProfile( @@ -26553,17 +26553,17 @@ Constant target [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - static abstract uint GenRenderbuffersOOES(); + static abstract void GenRenderbuffersOES(uint n, uint* renderbuffers); [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - static abstract void GenRenderbuffersOES(uint n, uint* renderbuffers); + static abstract void GenRenderbuffersOES(uint n, Ref renderbuffers); [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - static abstract void GenRenderbuffersOES(uint n, Ref renderbuffers); + static abstract uint GenRenderbuffersOES(); [NativeName("glGenSamplers")] [SupportedApiProfile( @@ -27174,19 +27174,19 @@ uint components [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - static abstract uint GenVertexArraysOOES(); + static abstract void GenVertexArraysOES(uint n, uint* arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - static abstract void GenVertexArraysOES(uint n, uint* arrays); + static abstract void GenVertexArraysOES(uint n, Ref arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - static abstract void GenVertexArraysOES(uint n, Ref arrays); + static abstract uint GenVertexArraysOES(); [NativeName("glGenVertexShadersEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -30686,17 +30686,17 @@ Ref @params [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - static abstract int GetConvolutionParameterxvOOES(uint target); + static abstract void GetConvolutionParameterxOES(uint target, uint pname, int* @params); [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - static abstract void GetConvolutionParameterxOES(uint target, uint pname, int* @params); + static abstract void GetConvolutionParameterxOES(uint target, uint pname, Ref @params); [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - static abstract void GetConvolutionParameterxOES(uint target, uint pname, Ref @params); + static abstract int GetConvolutionParameterxOES(uint target); [NativeName("glGetCoverageModulationTableNV")] [SupportedApiProfile("gl", ["GL_NV_framebuffer_mixed_samples"])] @@ -32313,7 +32313,7 @@ Constant target [SupportedApiProfile("gl", ["GL_ARB_robustness"])] [SupportedApiProfile("glcore", ["GL_ARB_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusARB")] - static abstract uint GetGraphicsResetStatusARBRawARB(); + static abstract uint GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] @@ -32325,7 +32325,7 @@ Constant target [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] [SupportedApiProfile("gles1", ["GL_EXT_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusEXT")] - static abstract uint GetGraphicsResetStatusEXTRawEXT(); + static abstract uint GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] @@ -32335,7 +32335,7 @@ Constant target [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusKHR")] - static abstract uint GetGraphicsResetStatusKHRRawKHR(); + static abstract uint GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatus")] [SupportedApiProfile( @@ -46713,7 +46713,7 @@ uint flags [NativeName("glImportSyncEXT")] [SupportedApiProfile("gl", ["GL_EXT_x11_sync_object"])] [NativeFunction("opengl", EntryPoint = "glImportSyncEXT")] - static abstract Sync* ImportSyncEXTRawEXT( + static abstract Sync* ImportSyncRawEXT( uint external_sync_type, nint external_sync, uint flags @@ -47456,17 +47456,17 @@ int ptrstride [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - static abstract void IndexxvOOES(int component); + static abstract void IndexxvOES(int* component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - static abstract void IndexxOES(int* component); + static abstract void IndexxvOES(Ref component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - static abstract void IndexxOES(Ref component); + static abstract void IndexxvOES(int component); [NativeName("glInitNames")] [SupportedApiProfile( @@ -48436,7 +48436,7 @@ uint depth [NativeName("glIsAsyncMarkerSGIX")] [SupportedApiProfile("gl", ["GL_SGIX_async"])] [NativeFunction("opengl", EntryPoint = "glIsAsyncMarkerSGIX")] - static abstract uint IsAsyncMarkerSGIXRawSGIX(uint marker); + static abstract uint IsAsyncMarkerRawSGIX(uint marker); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -48496,7 +48496,7 @@ uint depth [NativeName("glIsBufferARB")] [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsBufferARB")] - static abstract uint IsBufferARBRawARB(uint buffer); + static abstract uint IsBufferRawARB(uint buffer); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -48558,7 +48558,7 @@ uint depth [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsBufferResidentNV")] - static abstract uint IsBufferResidentNVRawNV(uint target); + static abstract uint IsBufferResidentRawNV(uint target); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -48570,7 +48570,7 @@ uint depth [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsCommandListNV")] - static abstract uint IsCommandListNVRawNV(uint list); + static abstract uint IsCommandListRawNV(uint list); [NativeName("glIsEnabled")] [SupportedApiProfile( @@ -48833,7 +48833,7 @@ uint index [NativeName("glIsFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceAPPLE")] - static abstract uint IsFenceAppleRawAPPLE(uint fence); + static abstract uint IsFenceRawAPPLE(uint fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -48847,7 +48847,7 @@ uint index [SupportedApiProfile("gles2", ["GL_NV_fence"])] [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceNV")] - static abstract uint IsFenceNVRawNV(uint fence); + static abstract uint IsFenceRawNV(uint fence); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -48902,7 +48902,7 @@ uint index [NativeName("glIsFramebufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferEXT")] - static abstract uint IsFramebufferEXTRawEXT(uint framebuffer); + static abstract uint IsFramebufferRawEXT(uint framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -48912,7 +48912,7 @@ uint index [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferOES")] - static abstract uint IsFramebufferOESRawOES(uint framebuffer); + static abstract uint IsFramebufferRawOES(uint framebuffer); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -48969,7 +48969,7 @@ uint index [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentARB")] - static abstract uint IsImageHandleResidentARBRawARB(ulong handle); + static abstract uint IsImageHandleResidentRawARB(ulong handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -48983,7 +48983,7 @@ uint index [SupportedApiProfile("glcore", ["GL_NV_bindless_texture"])] [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentNV")] - static abstract uint IsImageHandleResidentNVRawNV(ulong handle); + static abstract uint IsImageHandleResidentRawNV(ulong handle); [NativeName("glIsList")] [SupportedApiProfile( @@ -49053,7 +49053,7 @@ uint index [SupportedApiProfile("gl", ["GL_EXT_memory_object"])] [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])] [NativeFunction("opengl", EntryPoint = "glIsMemoryObjectEXT")] - static abstract uint IsMemoryObjectEXTRawEXT(uint memoryObject); + static abstract uint IsMemoryObjectRawEXT(uint memoryObject); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] @@ -49063,7 +49063,7 @@ uint index [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] [NativeFunction("opengl", EntryPoint = "glIsNameAMD")] - static abstract uint IsNameAMDRawAMD(uint identifier, uint name); + static abstract uint IsNameRawAMD(uint identifier, uint name); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -49075,7 +49075,7 @@ uint index [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsNamedBufferResidentNV")] - static abstract uint IsNamedBufferResidentNVRawNV(uint buffer); + static abstract uint IsNamedBufferResidentRawNV(uint buffer); [NativeName("glIsNamedStringARB")] [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])] @@ -49097,7 +49097,7 @@ uint index [NativeName("glIsObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsObjectBufferATI")] - static abstract uint IsObjectBufferATIRawATI(uint buffer); + static abstract uint IsObjectBufferRawATI(uint buffer); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] @@ -49107,7 +49107,7 @@ uint index [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsOcclusionQueryNV")] - static abstract uint IsOcclusionQueryNVRawNV(uint id); + static abstract uint IsOcclusionQueryRawNV(uint id); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -49121,7 +49121,7 @@ uint index [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPathNV")] - static abstract uint IsPathNVRawNV(uint path); + static abstract uint IsPathRawNV(uint path); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -49135,7 +49135,7 @@ uint index [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInFillPathNV")] - static abstract uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y); + static abstract uint IsPointInFillPathRawNV(uint path, uint mask, float x, float y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -49149,7 +49149,7 @@ uint index [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInStrokePathNV")] - static abstract uint IsPointInStrokePathNVRawNV(uint path, float x, float y); + static abstract uint IsPointInStrokePathRawNV(uint path, float x, float y); [NativeName("glIsProgram")] [SupportedApiProfile( @@ -49206,7 +49206,7 @@ uint index [NativeName("glIsProgramARB")] [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramARB")] - static abstract uint IsProgramARBRawARB(uint program); + static abstract uint IsProgramRawARB(uint program); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] @@ -49216,7 +49216,7 @@ uint index [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramNV")] - static abstract uint IsProgramNVRawNV(uint id); + static abstract uint IsProgramRawNV(uint id); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -49256,7 +49256,7 @@ uint index [NativeName("glIsProgramPipelineEXT")] [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] [NativeFunction("opengl", EntryPoint = "glIsProgramPipelineEXT")] - static abstract uint IsProgramPipelineEXTRawEXT(uint pipeline); + static abstract uint IsProgramPipelineRawEXT(uint pipeline); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -49387,7 +49387,7 @@ uint index [NativeName("glIsQueryARB")] [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsQueryARB")] - static abstract uint IsQueryARBRawARB(uint id); + static abstract uint IsQueryRawARB(uint id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -49403,7 +49403,7 @@ uint index ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"] )] [NativeFunction("opengl", EntryPoint = "glIsQueryEXT")] - static abstract uint IsQueryEXTRawEXT(uint id); + static abstract uint IsQueryRawEXT(uint id); [NativeName("glIsQuery")] [SupportedApiProfile( @@ -49502,7 +49502,7 @@ uint index [NativeName("glIsRenderbufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferEXT")] - static abstract uint IsRenderbufferEXTRawEXT(uint renderbuffer); + static abstract uint IsRenderbufferRawEXT(uint renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -49512,7 +49512,7 @@ uint index [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferOES")] - static abstract uint IsRenderbufferOESRawOES(uint renderbuffer); + static abstract uint IsRenderbufferRawOES(uint renderbuffer); [NativeName("glIsRenderbuffer")] [SupportedApiProfile( @@ -49657,7 +49657,7 @@ uint index [SupportedApiProfile("gl", ["GL_EXT_semaphore"])] [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])] [NativeFunction("opengl", EntryPoint = "glIsSemaphoreEXT")] - static abstract uint IsSemaphoreEXTRawEXT(uint semaphore); + static abstract uint IsSemaphoreRawEXT(uint semaphore); [NativeName("glIsShader")] [SupportedApiProfile( @@ -49763,7 +49763,7 @@ uint index [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsStateNV")] - static abstract uint IsStateNVRawNV(uint state); + static abstract uint IsStateRawNV(uint state); [NativeName("glIsSync")] [SupportedApiProfile( @@ -49915,7 +49915,7 @@ uint index [NativeName("glIsTextureEXT")] [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] [NativeFunction("opengl", EntryPoint = "glIsTextureEXT")] - static abstract uint IsTextureEXTRawEXT(uint texture); + static abstract uint IsTextureRawEXT(uint texture); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -49927,7 +49927,7 @@ uint index [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentARB")] - static abstract uint IsTextureHandleResidentARBRawARB(ulong handle); + static abstract uint IsTextureHandleResidentRawARB(ulong handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -49941,7 +49941,7 @@ uint index [SupportedApiProfile("glcore", ["GL_NV_bindless_texture"])] [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentNV")] - static abstract uint IsTextureHandleResidentNVRawNV(ulong handle); + static abstract uint IsTextureHandleResidentRawNV(ulong handle); [NativeName("glIsTexture")] [SupportedApiProfile( @@ -50041,7 +50041,7 @@ uint index [NativeName("glIsTransformFeedbackNV")] [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] [NativeFunction("opengl", EntryPoint = "glIsTransformFeedbackNV")] - static abstract uint IsTransformFeedbackNVRawNV(uint id); + static abstract uint IsTransformFeedbackRawNV(uint id); [NativeName("glIsTransformFeedback")] [SupportedApiProfile( @@ -50136,7 +50136,7 @@ Constant cap [NativeName("glIsVertexArrayAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayAPPLE")] - static abstract uint IsVertexArrayAppleRawAPPLE(uint array); + static abstract uint IsVertexArrayRawAPPLE(uint array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -50148,7 +50148,7 @@ Constant cap [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayOES")] - static abstract uint IsVertexArrayOESRawOES(uint array); + static abstract uint IsVertexArrayRawOES(uint array); [NativeName("glIsVertexArray")] [SupportedApiProfile( @@ -50198,7 +50198,7 @@ Constant cap [NativeName("glIsVertexAttribEnabledAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] [NativeFunction("opengl", EntryPoint = "glIsVertexAttribEnabledAPPLE")] - static abstract uint IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname); + static abstract uint IsVertexAttribEnabledRawAPPLE(uint index, uint pname); [NativeName("glLabelObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_debug_label"])] @@ -52579,7 +52579,7 @@ Constant access [NativeName("glMapObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] [NativeFunction("opengl", EntryPoint = "glMapObjectBufferATI")] - static abstract void* MapObjectBufferATIRawATI(uint buffer); + static abstract void* MapObjectBufferRawATI(uint buffer); [NativeName("glMapParameterfvNV")] [SupportedApiProfile("gl", ["GL_NV_evaluators"])] @@ -55093,22 +55093,22 @@ sbyte s [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - static abstract void MultiTexCoord1BvOOES( - Constant texture, - sbyte coords - ); + static abstract void MultiTexCoord1bvOES(uint texture, sbyte* coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - static abstract void MultiTexCoord1OES(uint texture, sbyte* coords); + static abstract void MultiTexCoord1bvOES( + Constant texture, + Ref coords + ); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - static abstract void MultiTexCoord1OES( + static abstract void MultiTexCoord1bvOES( Constant texture, - Ref coords + sbyte coords ); [NativeName("glMultiTexCoord1d")] @@ -55817,22 +55817,22 @@ short v [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - static abstract void MultiTexCoord1XvOOES( - Constant texture, - int coords - ); + static abstract void MultiTexCoord1XvOES(uint texture, int* coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - static abstract void MultiTexCoord1XOES(uint texture, int* coords); + static abstract void MultiTexCoord1XvOES( + Constant texture, + Ref coords + ); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - static abstract void MultiTexCoord1XOES( + static abstract void MultiTexCoord1XvOES( Constant texture, - Ref coords + int coords ); [NativeName("glMultiTexCoord2bOES")] @@ -72444,7 +72444,7 @@ Ref pixels [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glReleaseKeyedMutexWin32EXT")] - static abstract uint ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key); + static abstract uint ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key); [NativeName("glReleaseShaderCompiler")] [SupportedApiProfile( @@ -74984,17 +74984,17 @@ Ref param2 [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - static abstract void ScissorArrayvOOES(uint first, int v); + static abstract void ScissorArrayOES(uint first, uint count, int* v); [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - static abstract void ScissorArrayOES(uint first, uint count, int* v); + static abstract void ScissorArrayOES(uint first, uint count, Ref v); [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - static abstract void ScissorArrayOES(uint first, uint count, Ref v); + static abstract void ScissorArrayOES(uint first, int v); [NativeName("glScissorExclusiveArrayvNV")] [SupportedApiProfile("gl", ["GL_NV_scissor_exclusive"])] @@ -78088,7 +78088,7 @@ Ref pointer [NativeName("glTestFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceAPPLE")] - static abstract uint TestFenceAppleRawAPPLE(uint fence); + static abstract uint TestFenceRawAPPLE(uint fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -78102,7 +78102,7 @@ Ref pointer [SupportedApiProfile("gles2", ["GL_NV_fence"])] [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceNV")] - static abstract uint TestFenceNVRawNV(uint fence); + static abstract uint TestFenceRawNV(uint fence); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -78112,7 +78112,7 @@ Ref pointer [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestObjectAPPLE")] - static abstract uint TestObjectAppleRawAPPLE(uint @object, uint name); + static abstract uint TestObjectRawAPPLE(uint @object, uint name); [NativeName("glTexAttachMemoryNV")] [SupportedApiProfile("gl", ["GL_NV_memory_attachment"])] @@ -78396,17 +78396,17 @@ Ref param1 [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - static abstract void TexCoord1BvOOES(sbyte coords); + static abstract void TexCoord1bvOES(sbyte* coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - static abstract void TexCoord1OES(sbyte* coords); + static abstract void TexCoord1bvOES(Ref coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - static abstract void TexCoord1OES(Ref coords); + static abstract void TexCoord1bvOES(sbyte coords); [NativeName("glTexCoord1d")] [SupportedApiProfile( @@ -78900,17 +78900,17 @@ Ref param1 [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - static abstract void TexCoord1XvOOES(int coords); + static abstract void TexCoord1XvOES(int* coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - static abstract void TexCoord1XOES(int* coords); + static abstract void TexCoord1XvOES(Ref coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - static abstract void TexCoord1XOES(Ref coords); + static abstract void TexCoord1XvOES(int coords); [NativeName("glTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -90880,7 +90880,7 @@ uint indices [SupportedApiProfile("gles2", ["GL_OES_mapbuffer"])] [SupportedApiProfile("gles1", ["GL_OES_mapbuffer"])] [NativeFunction("opengl", EntryPoint = "glUnmapBufferOES")] - static abstract uint UnmapBufferOESRawOES(uint target); + static abstract uint UnmapBufferRawOES(uint target); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -90906,7 +90906,7 @@ uint indices [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])] [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])] [NativeFunction("opengl", EntryPoint = "glUnmapNamedBufferEXT")] - static abstract uint UnmapNamedBufferEXTRawEXT(uint buffer); + static abstract uint UnmapNamedBufferRawEXT(uint buffer); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -91389,7 +91389,7 @@ Ref values [NativeName("glVDPAUIsSurfaceNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] [NativeFunction("opengl", EntryPoint = "glVDPAUIsSurfaceNV")] - static abstract uint VdpauIsSurfaceNVRawNV(nint surface); + static abstract uint VdpauIsSurfaceRawNV(nint surface); [NativeName("glVDPAUMapSurfacesNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] @@ -101457,17 +101457,17 @@ int @params [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - static abstract void ViewportArrayvOOES(uint first, float v); + static abstract void ViewportArrayOES(uint first, uint count, float* v); [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - static abstract void ViewportArrayOES(uint first, uint count, float* v); + static abstract void ViewportArrayOES(uint first, uint count, Ref v); [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - static abstract void ViewportArrayOES(uint first, uint count, Ref v); + static abstract void ViewportArrayOES(uint first, float v); [NativeName("glViewportIndexedf")] [SupportedApiProfile( @@ -103004,7 +103004,7 @@ Constant outW [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glAcquireKeyedMutexWin32EXT")] - uint AcquireKeyedMutexWin32EXTRawEXT(uint memory, ulong key, uint timeout); + uint AcquireKeyedMutexWin32RawEXT(uint memory, ulong key, uint timeout); [NativeName("glActiveProgramEXT")] [SupportedApiProfile("gl", ["GL_EXT_separate_shader_objects"])] @@ -105983,11 +105983,6 @@ Ref bitmap [NativeFunction("opengl", EntryPoint = "glBitmap")] void Bitmap(uint height, float xorig, float yorig, float xmove, float ymove, byte bitmap); - [NativeName("glBitmapxOES")] - [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] - [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] - void BitmapxOOES(uint height, int xorig, int yorig, int xmove, int ymove, byte bitmap); - [NativeName("glBitmapxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] @@ -106014,6 +106009,11 @@ void BitmapxOES( Ref bitmap ); + [NativeName("glBitmapxOES")] + [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] + [NativeFunction("opengl", EntryPoint = "glBitmapxOES")] + void BitmapxOES(uint height, int xorig, int yorig, int xmove, int ymove, byte bitmap); + [NativeName("glBlendBarrierKHR")] [SupportedApiProfile("gl", ["GL_KHR_blend_equation_advanced"])] [SupportedApiProfile("glcore", ["GL_KHR_blend_equation_advanced"])] @@ -117587,17 +117587,17 @@ Ref points [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - void DeleteFramebuffersOOES(uint framebuffers); + void DeleteFramebuffersOES(uint n, uint* framebuffers); [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - void DeleteFramebuffersOES(uint n, uint* framebuffers); + void DeleteFramebuffersOES(uint n, Ref framebuffers); [NativeName("glDeleteFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")] - void DeleteFramebuffersOES(uint n, Ref framebuffers); + void DeleteFramebuffersOES(uint framebuffers); [NativeName("glDeleteLists")] [SupportedApiProfile( @@ -118255,17 +118255,17 @@ Ref points [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - void DeleteRenderbuffersOOES(uint renderbuffers); + void DeleteRenderbuffersOES(uint n, uint* renderbuffers); [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - void DeleteRenderbuffersOES(uint n, uint* renderbuffers); + void DeleteRenderbuffersOES(uint n, Ref renderbuffers); [NativeName("glDeleteRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")] - void DeleteRenderbuffersOES(uint n, Ref renderbuffers); + void DeleteRenderbuffersOES(uint renderbuffers); [NativeName("glDeleteSamplers")] [SupportedApiProfile( @@ -118990,19 +118990,19 @@ Ref points [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - void DeleteVertexArraysOOES(uint arrays); + void DeleteVertexArraysOES(uint n, uint* arrays); [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - void DeleteVertexArraysOES(uint n, uint* arrays); + void DeleteVertexArraysOES(uint n, Ref arrays); [NativeName("glDeleteVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")] - void DeleteVertexArraysOES(uint n, Ref arrays); + void DeleteVertexArraysOES(uint arrays); [NativeName("glDeleteVertexShaderEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -124052,17 +124052,17 @@ float t1 [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - void EvalCoord1XvOOES(int coords); + void EvalCoord1XvOES(int* coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - void EvalCoord1XOES(int* coords); + void EvalCoord1XvOES(Ref coords); [NativeName("glEvalCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glEvalCoord1xvOES")] - void EvalCoord1XOES(Ref coords); + void EvalCoord1XvOES(int coords); [NativeName("glEvalCoord2d")] [SupportedApiProfile( @@ -124663,7 +124663,7 @@ Ref texels [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])] [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])] [NativeFunction("opengl", EntryPoint = "glExtIsProgramBinaryQCOM")] - uint ExtIsProgramBinaryQCOMRawQCOM(uint program); + uint ExtIsProgramBinaryRawQCOM(uint program); [NativeName("glExtractComponentEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -124771,17 +124771,17 @@ Ref texels [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - void FeedbackBufferxOOES(uint type, int buffer); + void FeedbackBufferxOES(uint n, uint type, int* buffer); [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - void FeedbackBufferxOES(uint n, uint type, int* buffer); + void FeedbackBufferxOES(uint n, uint type, Ref buffer); [NativeName("glFeedbackBufferxOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")] - void FeedbackBufferxOES(uint n, uint type, Ref buffer); + void FeedbackBufferxOES(uint type, int buffer); [NativeName("glFenceSync")] [SupportedApiProfile( @@ -128014,17 +128014,17 @@ Constant target [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - uint GenFramebuffersOOES(); + void GenFramebuffersOES(uint n, uint* framebuffers); [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - void GenFramebuffersOES(uint n, uint* framebuffers); + void GenFramebuffersOES(uint n, Ref framebuffers); [NativeName("glGenFramebuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")] - void GenFramebuffersOES(uint n, Ref framebuffers); + uint GenFramebuffersOES(); [NativeName("glGenLists")] [SupportedApiProfile( @@ -128587,17 +128587,17 @@ Constant target [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - uint GenRenderbuffersOOES(); + void GenRenderbuffersOES(uint n, uint* renderbuffers); [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - void GenRenderbuffersOES(uint n, uint* renderbuffers); + void GenRenderbuffersOES(uint n, Ref renderbuffers); [NativeName("glGenRenderbuffersOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")] - void GenRenderbuffersOES(uint n, Ref renderbuffers); + uint GenRenderbuffersOES(); [NativeName("glGenSamplers")] [SupportedApiProfile( @@ -129188,19 +129188,19 @@ uint components [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - uint GenVertexArraysOOES(); + void GenVertexArraysOES(uint n, uint* arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - void GenVertexArraysOES(uint n, uint* arrays); + void GenVertexArraysOES(uint n, Ref arrays); [NativeName("glGenVertexArraysOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")] - void GenVertexArraysOES(uint n, Ref arrays); + uint GenVertexArraysOES(); [NativeName("glGenVertexShadersEXT")] [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])] @@ -132597,17 +132597,17 @@ Ref @params [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - int GetConvolutionParameterxvOOES(uint target); + void GetConvolutionParameterxOES(uint target, uint pname, int* @params); [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - void GetConvolutionParameterxOES(uint target, uint pname, int* @params); + void GetConvolutionParameterxOES(uint target, uint pname, Ref @params); [NativeName("glGetConvolutionParameterxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glGetConvolutionParameterxvOES")] - void GetConvolutionParameterxOES(uint target, uint pname, Ref @params); + int GetConvolutionParameterxOES(uint target); [NativeName("glGetCoverageModulationTableNV")] [SupportedApiProfile("gl", ["GL_NV_framebuffer_mixed_samples"])] @@ -134117,7 +134117,7 @@ Ref @params [SupportedApiProfile("gl", ["GL_ARB_robustness"])] [SupportedApiProfile("glcore", ["GL_ARB_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusARB")] - uint GetGraphicsResetStatusARBRawARB(); + uint GetGraphicsResetStatusRawARB(); [NativeName("glGetGraphicsResetStatusEXT")] [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] @@ -134129,7 +134129,7 @@ Ref @params [SupportedApiProfile("gles2", ["GL_EXT_robustness"])] [SupportedApiProfile("gles1", ["GL_EXT_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusEXT")] - uint GetGraphicsResetStatusEXTRawEXT(); + uint GetGraphicsResetStatusRawEXT(); [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] @@ -134139,7 +134139,7 @@ Ref @params [NativeName("glGetGraphicsResetStatusKHR")] [SupportedApiProfile("gles2", ["GL_KHR_robustness"])] [NativeFunction("opengl", EntryPoint = "glGetGraphicsResetStatusKHR")] - uint GetGraphicsResetStatusKHRRawKHR(); + uint GetGraphicsResetStatusRawKHR(); [NativeName("glGetGraphicsResetStatus")] [SupportedApiProfile( @@ -147592,7 +147592,7 @@ Ref name [NativeName("glImportSyncEXT")] [SupportedApiProfile("gl", ["GL_EXT_x11_sync_object"])] [NativeFunction("opengl", EntryPoint = "glImportSyncEXT")] - Sync* ImportSyncEXTRawEXT(uint external_sync_type, nint external_sync, uint flags); + Sync* ImportSyncRawEXT(uint external_sync_type, nint external_sync, uint flags); [NativeName("glIndexd")] [SupportedApiProfile( @@ -148322,17 +148322,17 @@ int ptrstride [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - void IndexxvOOES(int component); + void IndexxvOES(int* component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - void IndexxOES(int* component); + void IndexxvOES(Ref component); [NativeName("glIndexxvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glIndexxvOES")] - void IndexxOES(Ref component); + void IndexxvOES(int component); [NativeName("glInitNames")] [SupportedApiProfile( @@ -149283,7 +149283,7 @@ uint depth [NativeName("glIsAsyncMarkerSGIX")] [SupportedApiProfile("gl", ["GL_SGIX_async"])] [NativeFunction("opengl", EntryPoint = "glIsAsyncMarkerSGIX")] - uint IsAsyncMarkerSGIXRawSGIX(uint marker); + uint IsAsyncMarkerRawSGIX(uint marker); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -149343,7 +149343,7 @@ uint depth [NativeName("glIsBufferARB")] [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsBufferARB")] - uint IsBufferARBRawARB(uint buffer); + uint IsBufferRawARB(uint buffer); [NativeName("glIsBuffer")] [SupportedApiProfile( @@ -149405,7 +149405,7 @@ uint depth [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsBufferResidentNV")] - uint IsBufferResidentNVRawNV(uint target); + uint IsBufferResidentRawNV(uint target); [NativeName("glIsCommandListNV")] [SupportedApiProfile("gl", ["GL_NV_command_list"])] @@ -149417,7 +149417,7 @@ uint depth [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsCommandListNV")] - uint IsCommandListNVRawNV(uint list); + uint IsCommandListRawNV(uint list); [NativeName("glIsEnabled")] [SupportedApiProfile( @@ -149665,7 +149665,7 @@ uint depth [NativeName("glIsFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceAPPLE")] - uint IsFenceAppleRawAPPLE(uint fence); + uint IsFenceRawAPPLE(uint fence); [NativeName("glIsFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -149679,7 +149679,7 @@ uint depth [SupportedApiProfile("gles2", ["GL_NV_fence"])] [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glIsFenceNV")] - uint IsFenceNVRawNV(uint fence); + uint IsFenceRawNV(uint fence); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -149734,7 +149734,7 @@ uint depth [NativeName("glIsFramebufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferEXT")] - uint IsFramebufferEXTRawEXT(uint framebuffer); + uint IsFramebufferRawEXT(uint framebuffer); [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -149744,7 +149744,7 @@ uint depth [NativeName("glIsFramebufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsFramebufferOES")] - uint IsFramebufferOESRawOES(uint framebuffer); + uint IsFramebufferRawOES(uint framebuffer); [NativeName("glIsFramebuffer")] [SupportedApiProfile( @@ -149801,7 +149801,7 @@ uint depth [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentARB")] - uint IsImageHandleResidentARBRawARB(ulong handle); + uint IsImageHandleResidentRawARB(ulong handle); [NativeName("glIsImageHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -149815,7 +149815,7 @@ uint depth [SupportedApiProfile("glcore", ["GL_NV_bindless_texture"])] [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsImageHandleResidentNV")] - uint IsImageHandleResidentNVRawNV(ulong handle); + uint IsImageHandleResidentRawNV(ulong handle); [NativeName("glIsList")] [SupportedApiProfile( @@ -149885,7 +149885,7 @@ uint depth [SupportedApiProfile("gl", ["GL_EXT_memory_object"])] [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])] [NativeFunction("opengl", EntryPoint = "glIsMemoryObjectEXT")] - uint IsMemoryObjectEXTRawEXT(uint memoryObject); + uint IsMemoryObjectRawEXT(uint memoryObject); [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] @@ -149895,7 +149895,7 @@ uint depth [NativeName("glIsNameAMD")] [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])] [NativeFunction("opengl", EntryPoint = "glIsNameAMD")] - uint IsNameAMDRawAMD(uint identifier, uint name); + uint IsNameRawAMD(uint identifier, uint name); [NativeName("glIsNamedBufferResidentNV")] [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] @@ -149907,7 +149907,7 @@ uint depth [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])] [SupportedApiProfile("glcore", ["GL_NV_shader_buffer_load"])] [NativeFunction("opengl", EntryPoint = "glIsNamedBufferResidentNV")] - uint IsNamedBufferResidentNVRawNV(uint buffer); + uint IsNamedBufferResidentRawNV(uint buffer); [NativeName("glIsNamedStringARB")] [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])] @@ -149929,7 +149929,7 @@ uint depth [NativeName("glIsObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsObjectBufferATI")] - uint IsObjectBufferATIRawATI(uint buffer); + uint IsObjectBufferRawATI(uint buffer); [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] @@ -149939,7 +149939,7 @@ uint depth [NativeName("glIsOcclusionQueryNV")] [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsOcclusionQueryNV")] - uint IsOcclusionQueryNVRawNV(uint id); + uint IsOcclusionQueryRawNV(uint id); [NativeName("glIsPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -149953,7 +149953,7 @@ uint depth [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPathNV")] - uint IsPathNVRawNV(uint path); + uint IsPathRawNV(uint path); [NativeName("glIsPointInFillPathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -149967,7 +149967,7 @@ uint depth [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInFillPathNV")] - uint IsPointInFillPathNVRawNV(uint path, uint mask, float x, float y); + uint IsPointInFillPathRawNV(uint path, uint mask, float x, float y); [NativeName("glIsPointInStrokePathNV")] [SupportedApiProfile("gl", ["GL_NV_path_rendering"])] @@ -149981,7 +149981,7 @@ uint depth [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])] [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])] [NativeFunction("opengl", EntryPoint = "glIsPointInStrokePathNV")] - uint IsPointInStrokePathNVRawNV(uint path, float x, float y); + uint IsPointInStrokePathRawNV(uint path, float x, float y); [NativeName("glIsProgram")] [SupportedApiProfile( @@ -150038,7 +150038,7 @@ uint depth [NativeName("glIsProgramARB")] [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramARB")] - uint IsProgramARBRawARB(uint program); + uint IsProgramRawARB(uint program); [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] @@ -150048,7 +150048,7 @@ uint depth [NativeName("glIsProgramNV")] [SupportedApiProfile("gl", ["GL_NV_vertex_program"])] [NativeFunction("opengl", EntryPoint = "glIsProgramNV")] - uint IsProgramNVRawNV(uint id); + uint IsProgramRawNV(uint id); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -150088,7 +150088,7 @@ uint depth [NativeName("glIsProgramPipelineEXT")] [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])] [NativeFunction("opengl", EntryPoint = "glIsProgramPipelineEXT")] - uint IsProgramPipelineEXTRawEXT(uint pipeline); + uint IsProgramPipelineRawEXT(uint pipeline); [NativeName("glIsProgramPipeline")] [SupportedApiProfile( @@ -150219,7 +150219,7 @@ uint depth [NativeName("glIsQueryARB")] [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])] [NativeFunction("opengl", EntryPoint = "glIsQueryARB")] - uint IsQueryARBRawARB(uint id); + uint IsQueryRawARB(uint id); [NativeName("glIsQueryEXT")] [SupportedApiProfile( @@ -150235,7 +150235,7 @@ uint depth ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"] )] [NativeFunction("opengl", EntryPoint = "glIsQueryEXT")] - uint IsQueryEXTRawEXT(uint id); + uint IsQueryRawEXT(uint id); [NativeName("glIsQuery")] [SupportedApiProfile( @@ -150334,7 +150334,7 @@ uint depth [NativeName("glIsRenderbufferEXT")] [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferEXT")] - uint IsRenderbufferEXTRawEXT(uint renderbuffer); + uint IsRenderbufferRawEXT(uint renderbuffer); [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] @@ -150344,7 +150344,7 @@ uint depth [NativeName("glIsRenderbufferOES")] [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])] [NativeFunction("opengl", EntryPoint = "glIsRenderbufferOES")] - uint IsRenderbufferOESRawOES(uint renderbuffer); + uint IsRenderbufferRawOES(uint renderbuffer); [NativeName("glIsRenderbuffer")] [SupportedApiProfile( @@ -150479,7 +150479,7 @@ uint depth [SupportedApiProfile("gl", ["GL_EXT_semaphore"])] [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])] [NativeFunction("opengl", EntryPoint = "glIsSemaphoreEXT")] - uint IsSemaphoreEXTRawEXT(uint semaphore); + uint IsSemaphoreRawEXT(uint semaphore); [NativeName("glIsShader")] [SupportedApiProfile( @@ -150585,7 +150585,7 @@ uint depth [SupportedApiProfile("gl", ["GL_NV_command_list"])] [SupportedApiProfile("glcore", ["GL_NV_command_list"])] [NativeFunction("opengl", EntryPoint = "glIsStateNV")] - uint IsStateNVRawNV(uint state); + uint IsStateRawNV(uint state); [NativeName("glIsSync")] [SupportedApiProfile( @@ -150737,7 +150737,7 @@ uint depth [NativeName("glIsTextureEXT")] [SupportedApiProfile("gl", ["GL_EXT_texture_object"])] [NativeFunction("opengl", EntryPoint = "glIsTextureEXT")] - uint IsTextureEXTRawEXT(uint texture); + uint IsTextureRawEXT(uint texture); [NativeName("glIsTextureHandleResidentARB")] [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] @@ -150749,7 +150749,7 @@ uint depth [SupportedApiProfile("gl", ["GL_ARB_bindless_texture"])] [SupportedApiProfile("glcore", ["GL_ARB_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentARB")] - uint IsTextureHandleResidentARBRawARB(ulong handle); + uint IsTextureHandleResidentRawARB(ulong handle); [NativeName("glIsTextureHandleResidentNV")] [SupportedApiProfile("gl", ["GL_NV_bindless_texture"])] @@ -150763,7 +150763,7 @@ uint depth [SupportedApiProfile("glcore", ["GL_NV_bindless_texture"])] [SupportedApiProfile("gles2", ["GL_NV_bindless_texture"])] [NativeFunction("opengl", EntryPoint = "glIsTextureHandleResidentNV")] - uint IsTextureHandleResidentNVRawNV(ulong handle); + uint IsTextureHandleResidentRawNV(ulong handle); [NativeName("glIsTexture")] [SupportedApiProfile( @@ -150863,7 +150863,7 @@ uint depth [NativeName("glIsTransformFeedbackNV")] [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])] [NativeFunction("opengl", EntryPoint = "glIsTransformFeedbackNV")] - uint IsTransformFeedbackNVRawNV(uint id); + uint IsTransformFeedbackRawNV(uint id); [NativeName("glIsTransformFeedback")] [SupportedApiProfile( @@ -150955,7 +150955,7 @@ uint depth [NativeName("glIsVertexArrayAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayAPPLE")] - uint IsVertexArrayAppleRawAPPLE(uint array); + uint IsVertexArrayRawAPPLE(uint array); [NativeName("glIsVertexArrayOES")] [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] @@ -150967,7 +150967,7 @@ uint depth [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])] [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])] [NativeFunction("opengl", EntryPoint = "glIsVertexArrayOES")] - uint IsVertexArrayOESRawOES(uint array); + uint IsVertexArrayRawOES(uint array); [NativeName("glIsVertexArray")] [SupportedApiProfile( @@ -151017,7 +151017,7 @@ uint depth [NativeName("glIsVertexAttribEnabledAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_vertex_program_evaluators"])] [NativeFunction("opengl", EntryPoint = "glIsVertexAttribEnabledAPPLE")] - uint IsVertexAttribEnabledAppleRawAPPLE(uint index, uint pname); + uint IsVertexAttribEnabledRawAPPLE(uint index, uint pname); [NativeName("glLabelObjectEXT")] [SupportedApiProfile("gl", ["GL_EXT_debug_label"])] @@ -153310,7 +153310,7 @@ Constant access [NativeName("glMapObjectBufferATI")] [SupportedApiProfile("gl", ["GL_ATI_map_object_buffer"])] [NativeFunction("opengl", EntryPoint = "glMapObjectBufferATI")] - void* MapObjectBufferATIRawATI(uint buffer); + void* MapObjectBufferRawATI(uint buffer); [NativeName("glMapParameterfvNV")] [SupportedApiProfile("gl", ["GL_NV_evaluators"])] @@ -155670,17 +155670,17 @@ uint buffer [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - void MultiTexCoord1BvOOES(Constant texture, sbyte coords); + void MultiTexCoord1bvOES(uint texture, sbyte* coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - void MultiTexCoord1OES(uint texture, sbyte* coords); + void MultiTexCoord1bvOES(Constant texture, Ref coords); [NativeName("glMultiTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1bvOES")] - void MultiTexCoord1OES(Constant texture, Ref coords); + void MultiTexCoord1bvOES(Constant texture, sbyte coords); [NativeName("glMultiTexCoord1d")] [SupportedApiProfile( @@ -156340,17 +156340,17 @@ uint buffer [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - void MultiTexCoord1XvOOES(Constant texture, int coords); + void MultiTexCoord1XvOES(uint texture, int* coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - void MultiTexCoord1XOES(uint texture, int* coords); + void MultiTexCoord1XvOES(Constant texture, Ref coords); [NativeName("glMultiTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glMultiTexCoord1xvOES")] - void MultiTexCoord1XOES(Constant texture, Ref coords); + void MultiTexCoord1XvOES(Constant texture, int coords); [NativeName("glMultiTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -171428,7 +171428,7 @@ Ref pixels [SupportedApiProfile("gl", ["GL_EXT_win32_keyed_mutex"])] [SupportedApiProfile("gles2", ["GL_EXT_win32_keyed_mutex"])] [NativeFunction("opengl", EntryPoint = "glReleaseKeyedMutexWin32EXT")] - uint ReleaseKeyedMutexWin32EXTRawEXT(uint memory, ulong key); + uint ReleaseKeyedMutexWin32RawEXT(uint memory, ulong key); [NativeName("glReleaseShaderCompiler")] [SupportedApiProfile( @@ -173811,17 +173811,17 @@ Ref param2 [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - void ScissorArrayvOOES(uint first, int v); + void ScissorArrayOES(uint first, uint count, int* v); [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - void ScissorArrayOES(uint first, uint count, int* v); + void ScissorArrayOES(uint first, uint count, Ref v); [NativeName("glScissorArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glScissorArrayvOES")] - void ScissorArrayOES(uint first, uint count, Ref v); + void ScissorArrayOES(uint first, int v); [NativeName("glScissorExclusiveArrayvNV")] [SupportedApiProfile("gl", ["GL_NV_scissor_exclusive"])] @@ -176771,7 +176771,7 @@ Ref pointer [NativeName("glTestFenceAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceAPPLE")] - uint TestFenceAppleRawAPPLE(uint fence); + uint TestFenceRawAPPLE(uint fence); [NativeName("glTestFenceNV")] [SupportedApiProfile("gl", ["GL_NV_fence"])] @@ -176785,7 +176785,7 @@ Ref pointer [SupportedApiProfile("gles2", ["GL_NV_fence"])] [SupportedApiProfile("gles1", ["GL_NV_fence"])] [NativeFunction("opengl", EntryPoint = "glTestFenceNV")] - uint TestFenceNVRawNV(uint fence); + uint TestFenceRawNV(uint fence); [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] @@ -176795,7 +176795,7 @@ Ref pointer [NativeName("glTestObjectAPPLE")] [SupportedApiProfile("gl", ["GL_APPLE_fence"])] [NativeFunction("opengl", EntryPoint = "glTestObjectAPPLE")] - uint TestObjectAppleRawAPPLE(uint @object, uint name); + uint TestObjectRawAPPLE(uint @object, uint name); [NativeName("glTexAttachMemoryNV")] [SupportedApiProfile("gl", ["GL_NV_memory_attachment"])] @@ -177051,17 +177051,17 @@ nuint size [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - void TexCoord1BvOOES(sbyte coords); + void TexCoord1bvOES(sbyte* coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - void TexCoord1OES(sbyte* coords); + void TexCoord1bvOES(Ref coords); [NativeName("glTexCoord1bvOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1bvOES")] - void TexCoord1OES(Ref coords); + void TexCoord1bvOES(sbyte coords); [NativeName("glTexCoord1d")] [SupportedApiProfile( @@ -177555,17 +177555,17 @@ nuint size [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - void TexCoord1XvOOES(int coords); + void TexCoord1XvOES(int* coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - void TexCoord1XOES(int* coords); + void TexCoord1XvOES(Ref coords); [NativeName("glTexCoord1xvOES")] [SupportedApiProfile("gl", ["GL_OES_fixed_point"])] [NativeFunction("opengl", EntryPoint = "glTexCoord1xvOES")] - void TexCoord1XOES(Ref coords); + void TexCoord1XvOES(int coords); [NativeName("glTexCoord2bOES")] [SupportedApiProfile("gl", ["GL_OES_byte_coordinates"])] @@ -189110,7 +189110,7 @@ Ref indices [SupportedApiProfile("gles2", ["GL_OES_mapbuffer"])] [SupportedApiProfile("gles1", ["GL_OES_mapbuffer"])] [NativeFunction("opengl", EntryPoint = "glUnmapBufferOES")] - uint UnmapBufferOESRawOES(uint target); + uint UnmapBufferRawOES(uint target); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -189136,7 +189136,7 @@ Ref indices [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])] [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])] [NativeFunction("opengl", EntryPoint = "glUnmapNamedBufferEXT")] - uint UnmapNamedBufferEXTRawEXT(uint buffer); + uint UnmapNamedBufferRawEXT(uint buffer); [NativeName("glUnmapNamedBuffer")] [SupportedApiProfile( @@ -189590,7 +189590,7 @@ uint offset [NativeName("glVDPAUIsSurfaceNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] [NativeFunction("opengl", EntryPoint = "glVDPAUIsSurfaceNV")] - uint VdpauIsSurfaceNVRawNV(nint surface); + uint VdpauIsSurfaceRawNV(nint surface); [NativeName("glVDPAUMapSurfacesNV")] [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])] @@ -199412,17 +199412,17 @@ Ref @params [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - void ViewportArrayvOOES(uint first, float v); + void ViewportArrayOES(uint first, uint count, float* v); [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - void ViewportArrayOES(uint first, uint count, float* v); + void ViewportArrayOES(uint first, uint count, Ref v); [NativeName("glViewportArrayvOES")] [SupportedApiProfile("gles2", ["GL_OES_viewport_array"])] [NativeFunction("opengl", EntryPoint = "glViewportArrayvOES")] - void ViewportArrayOES(uint first, uint count, Ref v); + void ViewportArrayOES(uint first, float v); [NativeName("glViewportIndexedf")] [SupportedApiProfile( diff --git a/sources/SilkTouch/SilkTouch/Caching/CacheFlags.cs b/sources/SilkTouch/SilkTouch/Caching/CacheFlags.cs index 7f046508d7..5af2fd26df 100644 --- a/sources/SilkTouch/SilkTouch/Caching/CacheFlags.cs +++ b/sources/SilkTouch/SilkTouch/Caching/CacheFlags.cs @@ -1,4 +1,5 @@ -using System; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. namespace Silk.NET.SilkTouch.Caching; @@ -9,18 +10,22 @@ namespace Silk.NET.SilkTouch.Caching; public enum CacheFlags { /// - /// If the cache doesn't exist, allow it to be created and lock other callers from accessing the directory until it - /// is committed. + /// No flags set. /// - AllowNewLocked = 1, + None = 0, /// - /// Same as , but does not return a directory unless it is brand new. + /// If the cache doesn't exist, allow it to be created. /// - RequireNewLocked = 1 | (1 << 1), + AllowNew = 1, /// - /// Don't write cache files to disk. + /// Same as but the new cache will replace the old cache once committed. /// - NoHostDirectory = 1 << 2 + RequireNew = AllowNew | (1 << 1), + + /// + /// The cache provider needs the cache directory to reside on disk. + /// + RequireHostDirectory = 1 << 3, } diff --git a/sources/SilkTouch/SilkTouch/Caching/CacheUtils.cs b/sources/SilkTouch/SilkTouch/Caching/CacheUtils.cs new file mode 100644 index 0000000000..86985bd480 --- /dev/null +++ b/sources/SilkTouch/SilkTouch/Caching/CacheUtils.cs @@ -0,0 +1,21 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Silk.NET.SilkTouch.Caching; + +internal static class CacheUtils +{ + internal static void ThrowAccessException() => + throw new NotSupportedException( + "The cache directory has not been opened with the correct FileAccess for this operation." + ); + + internal static void ThrowRequireHostDirectoryNeedsWrite() => + throw new NotSupportedException( + "CacheFlags.RequireHostDirectory needs FileAccess.Write due to the cache accesses being uncontrolled by " + + "the cache system." + ); + + internal static string ToCacheEntryPath(this string s) => + s.Trim('\r', '\n', '\\', '/').Replace('\\', '/'); +} diff --git a/sources/SilkTouch/SilkTouch/Caching/FileSystemArchiveCacheDirectory.cs b/sources/SilkTouch/SilkTouch/Caching/FileSystemArchiveCacheDirectory.cs new file mode 100644 index 0000000000..c408dd9743 --- /dev/null +++ b/sources/SilkTouch/SilkTouch/Caching/FileSystemArchiveCacheDirectory.cs @@ -0,0 +1,229 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.IO.Compression; +using System.Text; +using Microsoft.Extensions.Logging; +using IOPath = System.IO.Path; + +namespace Silk.NET.SilkTouch.Caching; + +internal class FileSystemArchiveCacheDirectory( + string cacheKey, + string committedPath, + CacheIntent intent, + CacheFlags flags, + FileAccess access, + FileSystemCacheProvider parent +) : ICacheDirectory +{ + private ZipArchive? _committed; + private bool _hasCommitted; + private string? _newPath; + private ZipArchive? _new; + private HashSet? _newEntries; + private SemaphoreSlim _sema = new(1, 1); + + private async ValueTask GetOrCreateCommittedAsync() + { + if ( + !File.Exists(committedPath) + || (Flags & CacheFlags.RequireNew) == CacheFlags.RequireNew && !_hasCommitted + ) + { + parent.Logger.LogDebug( + "Cache miss with key \"{0}\"! Expected ZIP archive at {1}", + CacheKey, + committedPath + ); + return null; + } + + parent.Logger.LogDebug( + "Cache hit with key \"{0}\"! ZIP archive: {1}", + CacheKey, + committedPath + ); + return _committed = await ZipArchive.CreateAsync( + File.OpenRead(committedPath), + ZipArchiveMode.Read, + false, + Encoding.UTF8 + ); + } + + // [MemberNotNull(nameof(_new))] <-- TODO WHY IS THE COMPILER NOT HAPPY? + [MemberNotNull(nameof(_newEntries))] + private async ValueTask GetOrCreateNewAsync() + { + if (_new is not null) + { + Debug.Assert(_newEntries is not null); + return _new; + } + + if ((Access & FileAccess.Write) == 0) + { + CacheUtils.ThrowAccessException(); +#pragma warning disable CS8774 // Member must have a non-null value when exiting. + return null!; +#pragma warning restore CS8774 // Member must have a non-null value when exiting. + } + + _newPath = IOPath.GetTempFileName(); + parent.Logger.LogDebug( + "Opening cache for write with key \"{0}\"! Temporary ZIP archive path: {1}", + CacheKey, + _newPath + ); + _newEntries = []; + return _new = await ZipArchive.CreateAsync( + File.OpenWrite(_newPath), + ZipArchiveMode.Create, + false, + Encoding.UTF8 + ); + } + + public string CacheKey { get; } = cacheKey; + public CacheIntent Intent { get; } = intent; + public CacheFlags Flags { get; } = flags; + public FileAccess Access { get; } = access; + public string? Path => null; + + public async IAsyncEnumerable GetCommittedFilesAsync() + { + if ((Access & FileAccess.Read) == 0) + { + CacheUtils.ThrowAccessException(); + } + + foreach ( + var entry in (await GetOrCreateCommittedAsync())?.Entries + ?? Enumerable.Empty() + ) + { + yield return entry.FullName.ToCacheEntryPath(); + } + } + + public async ValueTask GetCommittedFileAsync(string filePath) + { + if ((Access & FileAccess.Read) == 0) + { + CacheUtils.ThrowAccessException(); + } + + parent.Logger.LogTrace("Cache hit (\"{0}\", ZIP): {1}", CacheKey, filePath); + var entry = + _committed?.GetEntry(filePath.ToCacheEntryPath()) ?? throw new FileNotFoundException(); + return await entry.OpenAsync(); + } + + public async ValueTask AddFileAsync(string filePath, Stream stream) + { + filePath = filePath.ToCacheEntryPath(); + if ((Access & FileAccess.Write) == 0) + { + CacheUtils.ThrowAccessException(); + } + + await _sema.WaitAsync(); + try + { + parent.Logger.LogTrace("Cache write (\"{0}\", ZIP): {1}", CacheKey, filePath); + await using var dst = await (await GetOrCreateNewAsync()) + .CreateEntry(filePath, CompressionLevel.SmallestSize) + .OpenAsync(); + await stream.CopyToAsync(dst); + _newEntries.Add(filePath); + } + finally + { + _sema.Release(); + } + } + + public async ValueTask CommitAsync() + { + if ((Access & FileAccess.Write) == 0) + { + CacheUtils.ThrowAccessException(); + } + + await _sema.WaitAsync(); + try + { + parent.Logger.LogDebug( + "Cache write with key \"{0}\"! ZIP archive: {1}", + CacheKey, + committedPath + ); + var @new = await GetOrCreateNewAsync(); + if (_committed is not null) + { + // Copy old entries that haven't been overwritten. + // If the user doesn't want this, they can use RequireNew. + foreach (var entry in _committed.Entries) + { + if (!_newEntries.Contains(entry.FullName.ToCacheEntryPath())) + { + parent.Logger.LogTrace( + "Cache unchanged (\"{0}\", ZIP): {1}", + CacheKey, + entry.FullName + ); + await using var src = await ( + _committed?.GetEntry(entry.FullName) + ?? throw new InvalidOperationException( + "Failed to open an entry that exists." + ) + ).OpenAsync(); + await using var dst = await @new.CreateEntry( + entry.FullName, + CompressionLevel.SmallestSize + ) + .OpenAsync(); + await src.CopyToAsync(dst); + } + } + + await _committed.DisposeAsync(); + _committed = null; + } + + await @new.DisposeAsync(); + _new = null; + _hasCommitted = true; + Debug.Assert(_newPath is not null); + File.Move(_newPath, committedPath, true); + } + finally + { + _sema.Release(); + } + } + + public async ValueTask DisposeAsync() + { + if (_new is not null) + { + parent.Logger.LogWarning( + "Cache update abandoned with key \"{0}\"! ZIP archive: {1}", + CacheKey, + committedPath + ); + } + + await (_committed?.DisposeAsync() ?? ValueTask.CompletedTask); + await (_new?.DisposeAsync() ?? ValueTask.CompletedTask); + if (_newPath is not null) + { + File.Delete(_newPath); + } + + await parent.FreeAsync(CacheKey); + } +} diff --git a/sources/SilkTouch/SilkTouch/Caching/FileSystemCacheProvider.cs b/sources/SilkTouch/SilkTouch/Caching/FileSystemCacheProvider.cs index 11c7b38005..db793a9143 100644 --- a/sources/SilkTouch/SilkTouch/Caching/FileSystemCacheProvider.cs +++ b/sources/SilkTouch/SilkTouch/Caching/FileSystemCacheProvider.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; +using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.Logging; namespace Silk.NET.SilkTouch.Caching; @@ -15,235 +8,101 @@ namespace Silk.NET.SilkTouch.Caching; /// public class FileSystemCacheProvider(ILogger logger) : ICacheProvider { - private readonly ConcurrentDictionary _semaphores = new(); - private readonly ConcurrentDictionary _noHostZips = new(); + private readonly SemaphoreSlim _accessSema = new(1, 1); + private readonly HashSet _openKeys = new(); internal static string CommonDir { get; set; } = Environment.CurrentDirectory; - - /// - public async Task<(string Path, bool IsNew)?> GetDirectory( - string cacheKey, - CacheIntent intent, - CacheFlags flags - ) => - await CoreGetDirectory(cacheKey, intent, intent == CacheIntent.ResolvedForeignInput, flags); + internal ILogger Logger { get; } = logger; static string GetCachePath(string cacheKey, CacheIntent intent) { + var outDir = Path.Combine(CommonDir, ".silktouch"); + if (!Directory.Exists(outDir)) + { + Directory.CreateDirectory(outDir); + } + cacheKey = cacheKey.ToLower(); var ext = intent switch { CacheIntent.ResolvedForeignInput => "stdownload", CacheIntent.StageIntermediateOutput => "stout", - _ => throw new ArgumentOutOfRangeException(nameof(intent), intent, null) + _ => throw new ArgumentOutOfRangeException(nameof(intent), intent, null), }; - return Path.Combine(CommonDir, ".silktouch", $"{cacheKey}.{ext}"); + return Path.Combine(outDir, $"{cacheKey}.{ext}"); } - async Task<(string Path, bool IsNew)?> CoreGetDirectory( + /// + public async ValueTask GetDirectoryAsync( string cacheKey, CacheIntent intent, - bool isUnstaged, - CacheFlags flags + CacheFlags flags, + FileAccess access ) { - var path = GetCachePath(cacheKey, intent); - var sema = _semaphores.GetOrAdd(path, _ => new SemaphoreSlim(1, 1)); - await (sema?.WaitAsync() ?? Task.CompletedTask); - - // If the cache file/directory doesn't exist, create it. - if ( - sema is not null - && ( - (isUnstaged && !Directory.Exists(path)) - || (!isUnstaged && !File.Exists(path)) - || (flags & CacheFlags.RequireNewLocked) == CacheFlags.RequireNewLocked - ) - ) + await _accessSema.WaitAsync(); + try { - if ((flags & CacheFlags.AllowNewLocked) == 0) + if (!_openKeys.Add(cacheKey)) { - sema.Release(); - return null; + throw new InvalidOperationException("Cache key is already open"); } - logger.LogDebug("Cache miss: {} for {}", cacheKey, intent); - if (isUnstaged) + try { - if (File.Exists(path)) + var committedPath = GetCachePath(cacheKey, intent); + if ( + (flags & CacheFlags.AllowNew) == 0 + && !Directory.Exists(committedPath) + && !File.Exists(committedPath) + ) { - File.Delete(path); + _openKeys.Remove(cacheKey); + return null; } - Directory.CreateDirectory(path); - } - else - { - if (Directory.Exists(path)) + if ( + (flags & CacheFlags.RequireHostDirectory) == 0 + && !Directory.Exists(committedPath) + ) { - Directory.Delete(path, true); + return new FileSystemArchiveCacheDirectory( + cacheKey, + committedPath, + intent, + flags, + access, + this + ); } - if (Path.GetDirectoryName(path) is { } dn && !Directory.Exists(dn)) - { - Directory.CreateDirectory(dn); - } - - if (File.Exists(path) && (flags & CacheFlags.NoHostDirectory) == 0) - { - File.Move(path, path + ".tmp"); - { - await using var fs = File.OpenRead(path); - using var arch = new ZipArchive(fs); - await Parallel.ForEachAsync( - arch.Entries, - async (entry, ct) => - { - var options = new FileStreamOptions - { - Access = FileAccess.Write, - Mode = FileMode.Create, - Share = FileShare.None, - BufferSize = 4096 - }; - var unixFileMode = (UnixFileMode)( - (entry.ExternalAttributes >> 16) & 511 - ); - if ( - unixFileMode != UnixFileMode.None - && !OperatingSystem.IsWindows() - ) - { - options.UnixCreateMode = unixFileMode; - } - - var dstPath = Path.Combine(path, entry.FullName); - Directory.CreateDirectory(Path.GetDirectoryName(dstPath) ?? path); - await using var destination = new FileStream(dstPath, options); - await using var stream = entry.Open(); - await stream.CopyToAsync(destination, ct); - await destination.FlushAsync(ct); - } - ); - } - File.Delete(path + ".tmp"); - } - else if ((flags & CacheFlags.NoHostDirectory) != 0) - { - if (File.Exists(path)) - { - File.Delete(path); - } - - var fs = File.OpenWrite(path); - var za = new ZipArchive(fs, ZipArchiveMode.Create, true); - _noHostZips.TryAdd(path, (fs, za)); - } + var ret = new FileSystemDiskCacheDirectory( + cacheKey, + committedPath, + intent, + flags, + access, + this + ); + await ret.InitAsync(); + return ret; + } + catch + { + _openKeys.Remove(cacheKey); + throw; } - - return (path, true); - } - - if ((flags & CacheFlags.RequireNewLocked) == CacheFlags.RequireNewLocked) - { - return null; - } - - if (sema is not null && (flags & CacheFlags.NoHostDirectory) != 0) - { - var fs = File.OpenRead(path); - var zip = new ZipArchive(fs, ZipArchiveMode.Read, true); - _noHostZips.TryAdd(path, (fs, zip)); - } - - if (sema is not null) - { - _semaphores[path] = null; - logger.LogInformation("Cache hit: {} for {}", cacheKey, intent); - sema.Release(); - } - - return (path, false); - } - - /// - public async Task CommitFile( - string cacheKey, - CacheIntent intent, - CacheFlags flags, - string filePath, - Stream stream - ) - { - var path = GetCachePath(cacheKey, intent); - if ((flags & CacheFlags.NoHostDirectory) != 0 && _noHostZips.TryGetValue(path, out var zip)) - { - var entry = zip.Item2.CreateEntry(filePath, CompressionLevel.SmallestSize); - await using var s = entry.Open(); - await stream.CopyToAsync(s); - } - else - { - await using var s = File.OpenWrite(Path.Combine(path, filePath)); - await stream.CopyToAsync(s); - } - } - - /// - public async Task CommitDirectory(string cacheKey, CacheIntent intent, CacheFlags flags) - { - var path = GetCachePath(cacheKey, intent); - if ( - (flags & CacheFlags.NoHostDirectory) != 0 - && _noHostZips.TryGetValue(path, out var nhzip) - ) - { - var (fs, zip) = nhzip; - zip.Dispose(); - await fs.FlushAsync(); - await fs.DisposeAsync(); - _noHostZips.TryRemove(new KeyValuePair(path, nhzip)); - } - else if (_semaphores.TryGetValue(path, out var sema)) - { - sema?.Release(); } - } - - /// - public Task> GetFiles(string cacheKey, CacheIntent intent, CacheFlags flags) - { - var path = GetCachePath(cacheKey, intent); - if ((flags & CacheFlags.NoHostDirectory) != 0 && _noHostZips.TryGetValue(path, out var zip)) + finally { - return Task.FromResult(zip.Item2.Entries.Select(x => x.FullName)); + _accessSema.Release(); } - - return Task.FromResult>( - Directory.GetFiles(path, "*", SearchOption.AllDirectories) - ); } - /// - public Task GetFile( - string cacheKey, - CacheIntent intent, - CacheFlags flags, - string filePath - ) + internal async ValueTask FreeAsync(string cacheKey) { - var path = GetCachePath(cacheKey, intent); - if ((flags & CacheFlags.NoHostDirectory) != 0 && _noHostZips.TryGetValue(path, out var zip)) - { - var file = zip.Item2.GetEntry(filePath); - if (file is null) - { - throw new FileNotFoundException(null, nameof(filePath)); - } - - return Task.FromResult(file.Open()); - } - - return Task.FromResult(File.OpenRead(Path.Combine(path, filePath))); + await _accessSema.WaitAsync(); + _openKeys.Remove(cacheKey); + _accessSema.Release(); } } diff --git a/sources/SilkTouch/SilkTouch/Caching/FileSystemDiskCacheDirectory.cs b/sources/SilkTouch/SilkTouch/Caching/FileSystemDiskCacheDirectory.cs new file mode 100644 index 0000000000..2e1e97d0e4 --- /dev/null +++ b/sources/SilkTouch/SilkTouch/Caching/FileSystemDiskCacheDirectory.cs @@ -0,0 +1,237 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.Extensions.Logging; +using IOPath = System.IO.Path; + +namespace Silk.NET.SilkTouch.Caching; + +internal class FileSystemDiskCacheDirectory( + string cacheKey, + string committedPath, + CacheIntent intent, + CacheFlags flags, + FileAccess access, + FileSystemCacheProvider parent +) : ICacheDirectory +{ + private string? _newPath; + private bool _committed; + + public async ValueTask InitAsync() + { + if ((Flags & CacheFlags.RequireHostDirectory) != 0 && (Access & FileAccess.Write) == 0) + { + CacheUtils.ThrowRequireHostDirectoryNeedsWrite(); + return; + } + + if (!Directory.Exists(committedPath)) + { + parent.Logger.LogDebug( + "Cache miss with key \"{0}\"! Expected directory at {1}", + CacheKey, + committedPath + ); + return; + } + + parent.Logger.LogDebug( + "Cache hit with key \"{0}\"! Directory: {1}", + CacheKey, + committedPath + ); + if ((Flags & CacheFlags.RequireHostDirectory) != 0) + { + // If they want to read the existing cache, do a defensive copy to ensure that we can fall back on the old + // cache if things fail. This only happens if RequireHostDirectory is set because in the case that it isn't + // set, we can just read from the old cache directory and write to the new path which is then copied into + // the old cache directory. + // TODO we should probably make this configurable i.e. "I am okay with this being clobbered on failure" + // TODO should probably check the file attributes to not copy unnecessarily + if ( + (Access & FileAccess.Read) != 0 + && (Flags & CacheFlags.RequireNew) != CacheFlags.RequireNew + ) + { + await Parallel.ForEachAsync( + Directory.GetFiles(committedPath, "*", SearchOption.AllDirectories), + async (x, ct) => + await Task.Run( + () => + File.Copy( + x, + IOPath.Combine( + NewPath, + IOPath.GetRelativePath(committedPath, x) + ) + ), + ct + ) + ); + } + } + } + + public string CacheKey { get; } = cacheKey; + public CacheIntent Intent { get; } = intent; + public CacheFlags Flags { get; } = flags; + public FileAccess Access { get; } = access; + + private string NewPath + { + get + { + if (_newPath is not null) + { + return _newPath; + } + + _newPath = IOPath.Combine(IOPath.GetTempPath(), IOPath.GetRandomFileName()); + parent.Logger.LogDebug( + "Opening cache for write with key \"{0}\"! Temporary directory: {1}", + CacheKey, + _newPath + ); + Directory.CreateDirectory(_newPath); + return _newPath; + } + } + public string? Path => (Flags & CacheFlags.RequireHostDirectory) != 0 ? NewPath : null; + + public IAsyncEnumerable GetCommittedFilesAsync() + { + if ((Access & FileAccess.Read) == 0) + { + CacheUtils.ThrowAccessException(); + } + + if ( + !Directory.Exists(committedPath) + || ((Flags & CacheFlags.RequireNew) == CacheFlags.RequireNew && !_committed) + ) + { + return AsyncEnumerable.Empty(); + } + + return Directory + .GetFiles(committedPath, "*", SearchOption.AllDirectories) + .Select(x => IOPath.GetRelativePath(committedPath, x).ToCacheEntryPath()) + .ToAsyncEnumerable(); + } + + public ValueTask GetCommittedFileAsync(string filePath) + { + if ((Access & FileAccess.Read) == 0) + { + CacheUtils.ThrowAccessException(); + } + + parent.Logger.LogTrace("Cache hit (\"{0}\", directory): {1}", CacheKey, filePath); + return ValueTask.FromResult(File.OpenRead(IOPath.Combine(committedPath, filePath))); + } + + public async ValueTask AddFileAsync(string filePath, Stream stream) + { + if ((Access & FileAccess.Write) == 0) + { + CacheUtils.ThrowAccessException(); + } + + parent.Logger.LogTrace("Cache write (\"{0}\", directory): {1}", CacheKey, filePath); + await using var dst = File.OpenWrite(IOPath.Combine(NewPath, filePath)); + await stream.CopyToAsync(dst); + } + + public async ValueTask CommitAsync() + { + if ((Access & FileAccess.Write) == 0) + { + CacheUtils.ThrowAccessException(); + } + + parent.Logger.LogDebug( + "Cache write with key \"{0}\"! Directory: {1}", + CacheKey, + committedPath + ); + + if ((Flags & CacheFlags.RequireNew) == CacheFlags.RequireNew) + { + parent.Logger.LogTrace("Erasing {0} as RequireNew is set", committedPath); + Directory.Delete(committedPath, true); + } + + if (!Directory.Exists(committedPath)) + { + Directory.CreateDirectory(committedPath); + } + + if (_newPath is null) + { + parent.Logger.LogTrace( + "There are no files for {0} as a result of this commit", + committedPath + ); + return; + } + + parent.Logger.LogTrace( + "Copying temporary directory {0} to {1} for cache key {2}", + _newPath, + committedPath, + CacheKey + ); + await Parallel.ForEachAsync( + Directory.GetFiles(_newPath, "*", SearchOption.AllDirectories), + async (x, ct) => + await Task.Run( + () => + { + if ((Flags & CacheFlags.RequireHostDirectory) != 0) + { + File.Copy( + x, + IOPath.Combine(committedPath, IOPath.GetRelativePath(_newPath, x)), + true + ); + } + else + { + File.Move( + x, + IOPath.Combine(committedPath, IOPath.GetRelativePath(_newPath, x)) + ); + } + }, + ct + ) + ); + if ((Flags & CacheFlags.RequireHostDirectory) == 0) + { + Directory.Delete(_newPath, true); + _newPath = null; + } + + _committed = true; + } + + public async ValueTask DisposeAsync() + { + if (!_committed) + { + parent.Logger.LogWarning( + "Cache update abandoned with key \"{0}\"! Directory: {1}", + CacheKey, + committedPath + ); + } + + if (_newPath is not null) + { + Directory.Delete(_newPath, true); + } + + await parent.FreeAsync(CacheKey); + } +} diff --git a/sources/SilkTouch/SilkTouch/Caching/ICacheDirectory.cs b/sources/SilkTouch/SilkTouch/Caching/ICacheDirectory.cs new file mode 100644 index 0000000000..e694a37797 --- /dev/null +++ b/sources/SilkTouch/SilkTouch/Caching/ICacheDirectory.cs @@ -0,0 +1,81 @@ +namespace Silk.NET.SilkTouch.Caching; + +/// +/// A cache directory opened by a . +/// +/// +/// Cache directories must always be disposed, even in exceptional circumstances and regardless of whether they're being +/// committed. Failing to do so may result in the cache being prematurely deleted, as SilkTouch contains protections to +/// ensure that caches from successful jobs aren't affected by writes from subsequent unsuccessful jobs. +/// +public interface ICacheDirectory : IAsyncDisposable +{ + /// + /// Gets the cache key the directory was opened with. + /// + public string CacheKey { get; } + + /// + /// Gets the intent the directory was opened with. + /// + public CacheIntent Intent { get; } + + /// + /// Gets the flags the directory was opened with. + /// + public CacheFlags Flags { get; } + + /// + /// Gets a value indicating the access level of this cache. + /// + public FileAccess Access { get; } + + /// + /// Gets the path of this cache directory on disk. null if does not have the + /// bit set. + /// + public string? Path { get; } + + /// + /// Gets the file paths of the committed files within the cache. + /// + /// The file paths asynchronously. + /// + /// If does not have the bit set. + /// + public IAsyncEnumerable GetCommittedFilesAsync(); + + /// + /// Gets the contents of the given committed file within the cache. + /// + /// + /// This can't be used to observe files that have been written + /// + /// The file path, as previously returned from + /// . + /// An asynchronous task. + /// + /// If does not have the bit set. + /// + /// + /// If the file does not exist in the cache or is not yet committed. + /// + public ValueTask GetCommittedFileAsync(string filePath); + + /// + /// Adds a file to be committed to the cache upon . + /// + /// The file path within the cache (i.e. not a filesystem path, or if it is, a relative + /// one). + /// The stream containing the data to be written. + /// An asynchronous task. + public ValueTask AddFileAsync(string filePath, Stream stream); + + /// + /// Commits the files added using to the cache. If is + /// , this makes the added files observable via + /// /. + /// + /// + public ValueTask CommitAsync(); +} diff --git a/sources/SilkTouch/SilkTouch/Caching/ICacheProvider.cs b/sources/SilkTouch/SilkTouch/Caching/ICacheProvider.cs index b0fb74edd1..2a716fbabb 100644 --- a/sources/SilkTouch/SilkTouch/Caching/ICacheProvider.cs +++ b/sources/SilkTouch/SilkTouch/Caching/ICacheProvider.cs @@ -1,7 +1,3 @@ -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; - namespace Silk.NET.SilkTouch.Caching; /// @@ -10,61 +6,20 @@ namespace Silk.NET.SilkTouch.Caching; public interface ICacheProvider { /// - /// Gets a directory in which previous outputs with the given cache key are stored, and where new outputs should be - /// written to. - /// - /// Cache key. - /// The intent behind the cache. - /// - /// The directory and whether it is new. - Task<(string Path, bool IsNew)?> GetDirectory( - string cacheKey, - CacheIntent intent, - CacheFlags flags - ); - - /// - /// Finalises the cache output. - /// - /// Cache key. - /// The intent behind the cache. - /// The cache flags. - /// An asynchronous task. - Task CommitDirectory(string cacheKey, CacheIntent intent, CacheFlags flags); - - /// - /// Adds a file to the cache. Use this if + /// Gets a directory in which previous outputs with the given cache key are stored. /// /// Cache key. /// The intent behind the cache. - /// The cache flags. - /// The file path within the cache. - /// The stream. - /// An asynchronous task. - Task CommitFile( + /// The flags determining how the cache is stored/accessed. + /// The level of access required. + /// + /// The directory, or null if the directory did not exist in the cache already and + /// was not set. + /// + ValueTask GetDirectoryAsync( string cacheKey, CacheIntent intent, CacheFlags flags, - string filePath, - Stream stream + FileAccess access ); - - /// - /// Gets the file paths within the cache. - /// - /// Cache key. - /// The intent behind the cache. - /// The cache flags. - /// The file paths asynchronously. - Task> GetFiles(string cacheKey, CacheIntent intent, CacheFlags flags); - - /// - /// Gets the contents of the given file within the cache. - /// - /// Cache key. - /// The intent behind the cache. - /// The cache flags. - /// The file path, as previously returned from . - /// An asynchronous task. - Task GetFile(string cacheKey, CacheIntent intent, CacheFlags flags, string filePath); } diff --git a/sources/SilkTouch/SilkTouch/Caching/ICacheReadableDirectory.cs b/sources/SilkTouch/SilkTouch/Caching/ICacheReadableDirectory.cs new file mode 100644 index 0000000000..75d0950323 --- /dev/null +++ b/sources/SilkTouch/SilkTouch/Caching/ICacheReadableDirectory.cs @@ -0,0 +1,17 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Silk.NET.SilkTouch.Caching; + +/// +/// A directory opened from a for reading. +/// +public interface ICacheReadableDirectory : ICacheDirectory +{ + /// + /// Returns a initially populated with the current contents of this directory + /// that can be used to write new data to the existing cache. + /// + /// The writable directory. + public ValueTask UpdateAsync(); +} diff --git a/sources/SilkTouch/SilkTouch/Caching/ICacheWritableDirectory.cs b/sources/SilkTouch/SilkTouch/Caching/ICacheWritableDirectory.cs new file mode 100644 index 0000000000..2a6c28098f --- /dev/null +++ b/sources/SilkTouch/SilkTouch/Caching/ICacheWritableDirectory.cs @@ -0,0 +1,9 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Silk.NET.SilkTouch.Caching; + +/// +/// A directory opened by for writing. +/// +public interface ICacheWritableDirectory : ICacheDirectory { } diff --git a/sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs b/sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs index 7451040f89..bd889440ae 100644 --- a/sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs +++ b/sources/SilkTouch/SilkTouch/Clang/ClangScraper.cs @@ -1,16 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.IO.Hashing; -using System.Linq; using System.Runtime.InteropServices; -using System.Threading; -using System.Threading.Tasks; using ClangSharp; using ClangSharp.Interop; using Microsoft.CodeAnalysis; @@ -35,8 +29,8 @@ namespace Silk.NET.SilkTouch.Clang; /// The configuration to use. /// The logger to use. /// The input resolver to use. -/// The cache provider into which ClangSharp outputs are cached. /// The mods that modify response files before they are fed to ClangSharp. +/// The cache provider into which ClangSharp outputs are cached. [ModConfiguration] public sealed class ClangScraper( ResponseFileHandler rspHandler, @@ -85,6 +79,11 @@ public record Configuration /// // TODO document public string[]? SkipScrapeIf { get; init; } + + /// + /// Forces the scraper to use cache. Best used on the command line. + /// + public bool ForceCache { get; init; } } /// @@ -161,7 +160,7 @@ out var handle CXDiagnostic_Warning => LogLevel.Warning, CXDiagnostic_Error => LogLevel.Error, CXDiagnostic_Fatal => LogLevel.Critical, - _ => LogLevel.Trace + _ => LogLevel.Trace, }, " {0}", diagnostic.Format(CXDiagnostic.DefaultDisplayOptions).ToString() @@ -227,7 +226,7 @@ private async Task ScrapeBindingsAsync( IReadOnlyList rsps, IModContext job, Configuration cfg, - string? cacheKey = null, + string cacheKey, CancellationToken ct = default ) { @@ -236,12 +235,6 @@ private async Task ScrapeBindingsAsync( { parallelism = Environment.ProcessorCount; } - if (cacheProvider is null) - { - cacheKey = null; - } - - string? cacheDir = null; // Figure out what the common root is so we can aggregate the file paths without collisions var srcRoot = @@ -260,116 +253,92 @@ private async Task ScrapeBindingsAsync( // Generate all the sources and tests. var aggregatedSources = new ConcurrentDictionary(); var aggregatedTests = new ConcurrentDictionary(); - try - { - await Parallel.ForEachAsync( - rsps, - new ParallelOptions - { - CancellationToken = ct, - MaxDegreeOfParallelism = parallelism - }, - async (rsp, innerCt) => - await Task.Run( - async () => + await using var cacheDir = await ( + cacheProvider?.GetDirectoryAsync( + cacheKey, + CacheIntent.StageIntermediateOutput, + CacheFlags.RequireNew, + FileAccess.Write + ) ?? ValueTask.FromResult(null) + ); + await Parallel.ForEachAsync( + rsps, + new ParallelOptions { CancellationToken = ct, MaxDegreeOfParallelism = parallelism }, + async (rsp, innerCt) => + await Task.Run( + async () => + { + // Generate the raw bindings. + var (sources, tests, hasErrors) = ScrapeRawBindings(rsp); + static MemoryStream Reopen(MemoryStream ms) => + ms.TryGetBuffer(out var buff) && buff.Array is not null + ? new MemoryStream(buff.Array, buff.Offset, buff.Count) + : new MemoryStream(buff.ToArray()); + + // Parse and optionally cache the files for the compilation. + foreach ( + var (isTest, (path, stream)) in sources + .Select(x => (false, x)) + .Concat(tests.Select(x => (true, x))) + .Select(x => (x.Item1, (x.x.Key, Reopen((MemoryStream)x.x.Value)))) + ) { - // Generate the raw bindings. - var (sources, tests, hasErrors) = ScrapeRawBindings(rsp); - - static MemoryStream Reopen(MemoryStream ms) => - ms.TryGetBuffer(out var buff) && buff.Array is not null - ? new MemoryStream(buff.Array, buff.Offset, buff.Count) - : new MemoryStream(buff.ToArray()); - - // Parse and optionally cache the files for the compilation. - foreach ( - var (isTest, (path, stream)) in sources - .Select(x => (false, x)) - .Concat(tests.Select(x => (true, x))) - .Select(x => - (x.Item1, (x.x.Key, Reopen((MemoryStream)x.x.Value))) - ) - ) + // Make the path relative as above. + var relativeKey = Path.GetRelativePath( + isTest ? testRoot : srcRoot, + path + ) + .Replace('\\', '/') + .TrimEnd('/'); + + // Cache the output. + if (!hasErrors) { - // Make the path relative as above. - var relativeKey = Path.GetRelativePath( - isTest ? testRoot : srcRoot, - path - ) - .Replace('\\', '/') - .TrimEnd('/'); - - // Cache the output. - if (cacheKey is not null && !hasErrors) - { - cacheDir ??= ( - await cacheProvider!.GetDirectory( - cacheKey, - CacheIntent.StageIntermediateOutput, - CacheFlags.RequireNewLocked | CacheFlags.NoHostDirectory - ) - )?.Path; - await cacheProvider!.CommitFile( - cacheKey, - CacheIntent.StageIntermediateOutput, - CacheFlags.RequireNewLocked | CacheFlags.NoHostDirectory, + await ( + cacheDir?.AddFileAsync( $"{(isTest ? "tests" : "sources")}/{relativeKey}", stream - ); - stream.Seek(0, SeekOrigin.Begin); - } - - // Add it to the dictionary. - if ( - !(isTest ? aggregatedTests : aggregatedSources).TryAdd( - relativeKey, - CSharpSyntaxTree.ParseText( - SourceText.From( - cfg.ManualOverrides?.TryGetValue( - $"{(isTest ? "tests" : "sources")}/{relativeKey}", - out var @override - ) ?? false - ? File.OpenRead( - await inputResolver.ResolvePath(@override) - ) - : stream - ), - path: relativeKey - ) + ) ?? ValueTask.CompletedTask + ); + stream.Seek(0, SeekOrigin.Begin); + } + + // Add it to the dictionary. + if ( + !(isTest ? aggregatedTests : aggregatedSources).TryAdd( + relativeKey, + CSharpSyntaxTree.ParseText( + SourceText.From( + cfg.ManualOverrides?.TryGetValue( + $"{(isTest ? "tests" : "sources")}/{relativeKey}", + out var @override + ) ?? false + ? File.OpenRead( + await inputResolver.ResolvePath(@override) + ) + : stream + ), + path: relativeKey ) ) - { - logger.LogError( - "Failed to add {0} - are the response file outputs conflicting?", - relativeKey - ); - } - else - { - logger.LogTrace("ClangSharp generated {0}", relativeKey); - } + ) + { + logger.LogError( + "Failed to add {0} - are the response file outputs conflicting?", + relativeKey + ); } - }, - innerCt - ) - ); - } - catch - { - cacheKey = null; - throw; - } - finally - { - if (cacheKey is not null) - { - await cacheProvider!.CommitDirectory( - cacheKey, - CacheIntent.StageIntermediateOutput, - CacheFlags.RequireNewLocked | CacheFlags.NoHostDirectory - ); - } - } + else + { + logger.LogTrace("ClangSharp generated {0}", relativeKey); + } + } + }, + innerCt + ) + ); + + await (cacheDir?.CommitAsync() ?? ValueTask.CompletedTask); var src = job.SourceProject; foreach (var (fname, tree) in aggregatedSources) @@ -429,7 +398,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) // Others VisualStudioResolver.TryGetVisualStudioInfo(out _) ? "vs" - : "!vs" + : "!vs", }; // Read the configuration. @@ -448,19 +417,12 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) rsps = await mod.BeforeScrapeAsync(ctx.JobKey, rsps); } - // If we're caching the outputs from the entire job, then obtain a cache key to use. - // We need to do this before we change the file paths using the input resolver. - var cacheKey = Convert.ToHexString( - XxHash3.Hash( - MemoryMarshal.Cast(rsps.Select(x => x.FileHash).Order().ToArray()) - ) - ); - // Resolve any foreign paths referenced in the response files await inputResolver.ResolveInPlace(rsps); // Should we completely skip running ClangSharp (e.g. we can't get Windows SDK bindings on macOS) var skip = (cfg.SkipScrapeIf?.Any(applicableSkipIfs.Contains)).GetValueOrDefault(); + var cacheKey = $"{ctx.JobKey}-ClangSharp"; Exception? innerException = null; try { @@ -478,9 +440,55 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) } finally { - if (skip) + if (skip && cacheProvider is not null) { - await AttemptToLoadCache(); + await using var cacheDir = await cacheProvider.GetDirectoryAsync( + cacheKey, + CacheIntent.StageIntermediateOutput, + CacheFlags.None, + FileAccess.Read + ); + var src = ctx.SourceProject; + var tst = ctx.TestProject; + await foreach ( + var file in ( + cacheDir?.GetCommittedFilesAsync() ?? AsyncEnumerable.Empty() + ).WithCancellation(ct) + ) + { + await cacheDir!.GetCommittedFileAsync(file); + var isSource = file.StartsWith("sources"); + var isTest = file.StartsWith("tests"); + if (!isSource && !isTest) + { + continue; + } + + // Have to do this if statement this way as we can't have a ref var over an await point + if ((isSource && src is null) || (isTest && tst is null)) + { + continue; + } + + var rel = file[(isSource ? "sources".Length : "tests".Length)..] + .TrimStart('/', '\\'); + var content = await cacheDir.GetCommittedFileAsync(file); + var root = await CSharpSyntaxTree + .ParseText(SourceText.From(content), path: rel, cancellationToken: ct) + .GetRootAsync(ct); + ref var proj = ref isSource ? ref src : ref tst; + var filePath = proj!.FullPath(rel); + proj = proj + ?.AddDocument(Path.GetFileName(file), root, filePath: filePath) + .Project; + } + + skip = cacheDir is not null; + if (!skip) + { + ctx.SourceProject = src; + ctx.TestProject = tst; + } } } @@ -501,83 +509,6 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) + "fall back on." ); } - - // Local function to improve readability - async Task AttemptToLoadCache() - { - var dirOpt = await cacheProvider!.GetDirectory( - cacheKey, - CacheIntent.StageIntermediateOutput, - CacheFlags.NoHostDirectory - ); - if (dirOpt is not null) - { - var files = ( - await cacheProvider.GetFiles( - cacheKey, - CacheIntent.StageIntermediateOutput, - CacheFlags.NoHostDirectory - ) - ).ToArray(); - - async Task GetSyntaxTree(string file, string startingWith) => - CSharpSyntaxTree.ParseText( - SourceText.From( - await cacheProvider.GetFile( - cacheKey, - CacheIntent.StageIntermediateOutput, - CacheFlags.NoHostDirectory, - file - ) - ), - path: file[(startingWith.Length + 1)..], - cancellationToken: ct - ); - - async Task> GetSyntaxTrees(string startingWith) => - await Task.WhenAll( - files - .Where(x => - x.StartsWith(startingWith) - && x.Length > startingWith.Length - && x[startingWith.Length] is '/' or '\\' - ) - .Select(x => GetSyntaxTree(x, startingWith)) - ); - - var src = ctx.SourceProject; - foreach (var tree in await GetSyntaxTrees("sources")) - { - src = src - ?.AddDocument( - Path.GetFileName(tree.FilePath), - await tree.GetRootAsync(ct), - filePath: src.FullPath(tree.FilePath) - ) - .Project; - } - - ctx.SourceProject = src; - var test = ctx.TestProject; - foreach (var tree in await GetSyntaxTrees("tests")) - { - test = test - ?.AddDocument( - Path.GetFileName(tree.FilePath), - await tree.GetRootAsync(ct), - filePath: test.FullPath(tree.FilePath) - ) - .Project; - } - - ctx.TestProject = test; - skip = false; - } - else - { - logger.LogError("Failed to retrieve cache."); - } - } } /// diff --git a/sources/SilkTouch/SilkTouch/Clang/ResponseFileHandler.cs b/sources/SilkTouch/SilkTouch/Clang/ResponseFileHandler.cs index 4a35d510b5..ec3bea265c 100644 --- a/sources/SilkTouch/SilkTouch/Clang/ResponseFileHandler.cs +++ b/sources/SilkTouch/SilkTouch/Clang/ResponseFileHandler.cs @@ -808,7 +808,7 @@ public ResponseFile ReadResponseFile( string? filePath = null ) { - logger.LogDebug("ClangSharp command line arguments: {0}", string.Join(" ", args)); + logger.LogTrace("ClangSharp command line arguments: {0}", string.Join(" ", args)); var context = (ParseResult: new Parser(s_rootCommand).Parse(args), Dummy: 0); // Begin verbatim ClangSharp code: https://github.com/dotnet/ClangSharp/blob/main/sources/ClangSharpPInvokeGenerator/Program.cs diff --git a/sources/SilkTouch/SilkTouch/Mods/AddIncludes.cs b/sources/SilkTouch/SilkTouch/Mods/AddIncludes.cs index 11de1ecadb..b20ff3b186 100644 --- a/sources/SilkTouch/SilkTouch/Mods/AddIncludes.cs +++ b/sources/SilkTouch/SilkTouch/Mods/AddIncludes.cs @@ -64,8 +64,13 @@ public async Task> BeforeScrapeAsync(string key, List $"--include-directory={x}") ?? []); - cmdLineArgs.AddRange(cfg.AdditionalIncludes?.Select(x => $"--include-directory={x}") ?? []); + cmdLineArgs.InsertRange( + 0, + cfg.PriorityIncludes?.Select(x => $"--include-directory={x}") ?? [] + ); + cmdLineArgs.AddRange( + cfg.AdditionalIncludes?.Select(x => $"--include-directory={x}") ?? [] + ); if (!cfg.SuppressStdIncludes) { diff --git a/sources/SilkTouch/SilkTouch/Mods/AddVTables.cs b/sources/SilkTouch/SilkTouch/Mods/AddVTables.cs index e1ad5d8d85..e3d3326dfd 100644 --- a/sources/SilkTouch/SilkTouch/Mods/AddVTables.cs +++ b/sources/SilkTouch/SilkTouch/Mods/AddVTables.cs @@ -777,9 +777,13 @@ out var callConv x.WithAttributes( SeparatedList( x.Attributes.Where(y => - !y.IsAttribute("System.Runtime.InteropServices.DllImport") + !y.IsAttribute( + "System.Runtime.InteropServices.DllImport" + ) && !y.IsAttribute("Silk.NET.Core.NativeFunction") - && !y.IsAttribute("System.Runtime.CompilerServices.MethodImpl") + && !y.IsAttribute( + "System.Runtime.CompilerServices.MethodImpl" + ) ) ) ) diff --git a/sources/SilkTouch/SilkTouch/Mods/Bakery/DefaultBakeStrategy.cs b/sources/SilkTouch/SilkTouch/Mods/Bakery/DefaultBakeStrategy.cs index 40d609aeda..63972d762d 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Bakery/DefaultBakeStrategy.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Bakery/DefaultBakeStrategy.cs @@ -197,7 +197,9 @@ node is BaseMethodDeclarationSyntax meth node.AttributeLists.Select(x => x.WithAttributes( SeparatedList( - x.Attributes.Where(y => y.IsAttribute("Silk.NET.Core.SupportedApiAttribute")) + x.Attributes.Where(y => + y.IsAttribute("Silk.NET.Core.SupportedApiAttribute") + ) ) ) ) diff --git a/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs b/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs index 33dd125185..ef3a5f71d7 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs @@ -29,9 +29,9 @@ public static bool IsAttribute(this AttributeSyntax node, string fullNameWithout var sep = node.Name.ToString().Split("::").Last(); var name = fullNameWithoutSuffix.Split('.').Last(); return sep == name - || sep == $"{name}Attribute" - || sep.EndsWith(fullNameWithoutSuffix) - || sep.EndsWith($"{fullNameWithoutSuffix}Attribute"); + || sep == $"{name}Attribute" + || sep.EndsWith(fullNameWithoutSuffix) + || sep.EndsWith($"{fullNameWithoutSuffix}Attribute"); } /// @@ -41,8 +41,13 @@ public static bool IsAttribute(this AttributeSyntax node, string fullNameWithout /// /// The fully-qualified attribute name including the namespace but without the Attribute suffix. /// - public static bool ContainsAttribute(this IEnumerable attributeLists, string fullNameWithoutSuffix) => - attributeLists.Any(list => list.Attributes.Any(attribute => attribute.IsAttribute(fullNameWithoutSuffix))); + public static bool ContainsAttribute( + this IEnumerable attributeLists, + string fullNameWithoutSuffix + ) => + attributeLists.Any(list => + list.Attributes.Any(attribute => attribute.IsAttribute(fullNameWithoutSuffix)) + ); /// /// Modifies the s the method may have to make them resistant to method identifier @@ -201,41 +206,64 @@ out _ /// /// Adds a name prefix attribute to the given attribute list. /// - /// - /// See for what the parameters do. - /// - public static SyntaxList AddNamePrefix(this IEnumerable attributeLists, string prefix, int order, int discriminatorPriority = -1) - => attributeLists.AddNamePrefixOrSuffix("Prefix", prefix, order, discriminatorPriority); + /// The attribute lists to add the attribute to. + /// The affix category. + /// The value of the affix. + /// + /// Use true if the affix comes from the inside of the name. + /// Use false if not (outside or appended to end). + /// True means that the attribute is added to the start of the attribute list, meaning that the affix is re-appended earlier. + /// + public static SyntaxList AddNamePrefix( + this IEnumerable attributeLists, + string category, + string prefix, + bool addToInner = false + ) => attributeLists.AddNamePrefixOrSuffix("Prefix", category, prefix, addToInner); /// /// Adds a name suffix attribute to the given attribute list. /// - /// - /// See for what the parameters do. - /// - public static SyntaxList AddNameSuffix(this IEnumerable attributeLists, string suffix, int order, int discriminatorPriority = -1) - => attributeLists.AddNamePrefixOrSuffix("Suffix", suffix, order, discriminatorPriority); - - private static SyntaxList AddNamePrefixOrSuffix(this IEnumerable attributeLists, string type, string affix, int order, int discriminatorPriority) + /// The attribute lists to add the attribute to. + /// The affix category. + /// The value of the affix. + /// + /// Use true if the affix comes from the inside of the name. + /// Use false if not (outside or appended to end). + /// True means that the attribute is added to the start of the attribute list, meaning that the affix is re-appended earlier. + /// + public static SyntaxList AddNameSuffix( + this IEnumerable attributeLists, + string category, + string suffix, + bool addToInner = false + ) => attributeLists.AddNamePrefixOrSuffix("Suffix", category, suffix, addToInner); + + private static SyntaxList AddNamePrefixOrSuffix( + this IEnumerable attributeLists, + string type, + string category, + string affix, + bool addToInner = false + ) { - var typeArgument = AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{type}\"", type))); - var affixArgument = AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{affix}\"", affix))); - var orderArgument = AttributeArgument(LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(order))); - var discriminatorPriorityArgument = AttributeArgument(LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(discriminatorPriority))); - var argumentList = AttributeArgumentList([typeArgument, affixArgument, orderArgument, discriminatorPriorityArgument]); - - var attribute = AttributeList([ - Attribute(IdentifierName("NameAffix"), argumentList), - ]); - - return [ - // Add attribute to the top of the attribute lists - // This is important and ensures that affixes added later are applied first - // Affixes that are added later are usually affixes on the inside of the name - // This ensures we apply affixes of the same priority starting from the inside first - attribute, - ..attributeLists, - ]; + var typeArgument = AttributeArgument( + LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{type}\"", type)) + ); + var categoryArgument = AttributeArgument( + LiteralExpression( + SyntaxKind.StringLiteralExpression, + Literal($"\"{category}\"", category) + ) + ); + var affixArgument = AttributeArgument( + LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{affix}\"", affix)) + ); + var argumentList = AttributeArgumentList([typeArgument, categoryArgument, affixArgument]); + + var attribute = AttributeList([Attribute(IdentifierName("NameAffix"), argumentList)]); + + return addToInner ? [attribute, .. attributeLists] : [.. attributeLists, attribute]; } /// @@ -244,7 +272,10 @@ private static SyntaxList AddNamePrefixOrSuffix(this IEnume /// /// The default usually should be the node's identifier. /// - public static string GetNativeNameOrDefault(this IEnumerable attributeLists, SyntaxToken identifier) + public static string GetNativeNameOrDefault( + this IEnumerable attributeLists, + SyntaxToken identifier + ) { if (TryGetNativeName(attributeLists, out var nativeName)) { @@ -260,7 +291,10 @@ public static string GetNativeNameOrDefault(this IEnumerable /// The default usually should be the node's identifier. /// - public static string GetNativeNameOrDefault(this IEnumerable attributeLists, string defaultName) + public static string GetNativeNameOrDefault( + this IEnumerable attributeLists, + string defaultName + ) { if (TryGetNativeName(attributeLists, out var nativeName)) { @@ -273,9 +307,14 @@ public static string GetNativeNameOrDefault(this IEnumerable /// Gets the value of the native name attribute from the given attribute list. /// - public static bool TryGetNativeName(this IEnumerable attributeLists, [NotNullWhen(true)] out string? nativeName) + public static bool TryGetNativeName( + this IEnumerable attributeLists, + [NotNullWhen(true)] out string? nativeName + ) { - var nativeNameAttribute = attributeLists.SelectMany(list => list.Attributes).FirstOrDefault(attribute => attribute.IsAttribute("Silk.NET.Core.NativeName")); + var nativeNameAttribute = attributeLists + .SelectMany(list => list.Attributes) + .FirstOrDefault(attribute => attribute.IsAttribute("Silk.NET.Core.NativeName")); if (nativeNameAttribute == null) { nativeName = null; @@ -291,25 +330,47 @@ public static bool TryGetNativeName(this IEnumerable attrib /// /// Sets or replaces the native name attribute in the given attribute list. /// - public static SyntaxList WithNativeName(this IEnumerable attributeLists, string nativeName) + public static SyntaxList WithNativeName( + this IEnumerable attributeLists, + string nativeName + ) { - var nativeNameAttribute = AttributeList([ - Attribute( - IdentifierName("NativeName"), - AttributeArgumentList([ - AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{nativeName}\"", nativeName))), - ])), - ]); - - return List(attributeLists.Select(list => { - var attributes = list.Attributes; - attributes = [..attributes.Where(attribute => !attribute.IsAttribute("Silk.NET.Core.NativeName"))]; - - return attributes.Count == 0 ? null : list.WithAttributes(attributes); - }) - .Where(list => list != null) - .Cast() - .Prepend(nativeNameAttribute)); + var nativeNameAttribute = AttributeList( + [ + Attribute( + IdentifierName("NativeName"), + AttributeArgumentList( + [ + AttributeArgument( + LiteralExpression( + SyntaxKind.StringLiteralExpression, + Literal($"\"{nativeName}\"", nativeName) + ) + ), + ] + ) + ), + ] + ); + + return List( + attributeLists + .Select(list => + { + var attributes = list.Attributes; + attributes = + [ + .. attributes.Where(attribute => + !attribute.IsAttribute("Silk.NET.Core.NativeName") + ), + ]; + + return attributes.Count == 0 ? null : list.WithAttributes(attributes); + }) + .Where(list => list != null) + .Cast() + .Prepend(nativeNameAttribute) + ); } /// @@ -364,7 +425,7 @@ out NativeTypeNameInfo info switch (nativeTypeName) { // Handle case: "#define NAME VALUE" - case {} when nativeTypeName.StartsWith("#define "): + case { } when nativeTypeName.StartsWith("#define "): { // Trim off the #define var nativeTypeSpan = nativeTypeName["#define ".Length..].Trim(); @@ -400,7 +461,7 @@ out NativeTypeNameInfo info } // Handle cases: "const NAME **", "NAME **" - case {}: + case { }: { // Trim off the const var isConst = false; diff --git a/sources/SilkTouch/SilkTouch/Mods/Common/IModContext.cs b/sources/SilkTouch/SilkTouch/Mods/Common/IModContext.cs index b7fc0ee8f1..4adca0ae1a 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Common/IModContext.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Common/IModContext.cs @@ -16,12 +16,6 @@ public interface IModContext : IAsyncDisposable /// public string JobKey { get; } - /// - /// A cache key that can be used for the current job. Use of this key shall mean that if the job configuration - /// changes in any way, the cache is invalidated. - /// - public string JobCacheKey { get; } - /// /// Gets the directory in which the configuration file is contained. May be null if I/O is banned in the current /// generator form factor (e.g. the SilkTouch framework is running as a source generator). diff --git a/sources/SilkTouch/SilkTouch/Mods/Common/MSBuildModContext.cs b/sources/SilkTouch/SilkTouch/Mods/Common/MSBuildModContext.cs index 66639e3075..793a0ed1c7 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Common/MSBuildModContext.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Common/MSBuildModContext.cs @@ -28,13 +28,11 @@ internal class MSBuildModContext( ILogger logger ) : IModContext { - private string? _cacheKey; private Project? _srcProject, _testProject; private SilkTouchConfiguration? _cfg = cfg.Get(); public string JobKey { get; } = cfg.Key; - public string JobCacheKey => _cacheKey ??= ObtainCacheKey(); public string ConfigurationDirectory { get; init; } = Environment.CurrentDirectory; public Project? SourceProject diff --git a/sources/SilkTouch/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs b/sources/SilkTouch/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs index 1e6cf120f8..d7abbd6397 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Common/ModCSharpSyntaxRewriter.cs @@ -37,7 +37,9 @@ public Dictionary UsingsToAdd return ret; } - foreach (var use in comp.Usings.Where(use => !use.GlobalKeyword.IsKind(SyntaxKind.GlobalKeyword))) + foreach ( + var use in comp.Usings.Where(use => !use.GlobalKeyword.IsKind(SyntaxKind.GlobalKeyword)) + ) { AddUsing(use); } @@ -68,7 +70,9 @@ and not SyntaxKind.MultiLineCommentTrivia FileScopedNamespaceDeclarationSyntax node ) { - foreach (var use in node.Usings.Where(use => !use.GlobalKeyword.IsKind(SyntaxKind.GlobalKeyword))) + foreach ( + var use in node.Usings.Where(use => !use.GlobalKeyword.IsKind(SyntaxKind.GlobalKeyword)) + ) { AddUsing(use); } diff --git a/sources/SilkTouch/SilkTouch/Mods/Common/ModUtils.cs b/sources/SilkTouch/SilkTouch/Mods/Common/ModUtils.cs index cbdb8ee0c2..a0a8133a80 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Common/ModUtils.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Common/ModUtils.cs @@ -187,14 +187,20 @@ public static string FullPath(this Project proj, string relativePath) => /// /// Searches and replaces all occurrences of the with the in the document name and project *relative* file path. /// - public static Document ReplaceNameAndPath(this Document document, string oldValue, string newValue) + public static Document ReplaceNameAndPath( + this Document document, + string oldValue, + string newValue + ) { document = document.WithName(document.Name.Replace(oldValue, newValue)); var relativePath = document.RelativePath(); if (relativePath != null) { - document = document.WithFilePath(FullPath(document.Project, relativePath.Replace(oldValue, newValue))); + document = document.WithFilePath( + FullPath(document.Project, relativePath.Replace(oldValue, newValue)) + ); } return document; diff --git a/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs b/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs index 7c2966b839..b8f063e7ec 100644 --- a/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs +++ b/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs @@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using Silk.NET.SilkTouch.Naming; using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory; @@ -35,27 +34,13 @@ namespace Silk.NET.SilkTouch.Mods; /// /// /// -[ModConfiguration] -public partial class ExtractNestedTyping(ILogger logger, IOptionsSnapshot cfg) : Mod +public partial class ExtractNestedTyping(ILogger logger) : Mod { - /// - /// ExtractNestedTyping configuration. - /// - public record Configuration - { - /// - /// The order with which the -Delegate suffix is applied. - /// - public int DelegateSuffixOrder { get; init; } = 0; - } - /// public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) { await base.ExecuteAsync(ctx, ct); - var config = cfg.Get(ctx.JobKey); - var project = ctx.SourceProject; if (project == null) { @@ -77,7 +62,7 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = } // Second pass to modify existing files as per our discovery. - var rewriter = new Rewriter(logger, config.DelegateSuffixOrder); + var rewriter = new Rewriter(logger); // rewriter.FunctionPointerTypes = walker.GetFunctionPointerTypes(); var (enums, constants) = walker.GetExtractedEnums(); rewriter.ConstantsToRemove = constants; @@ -85,7 +70,8 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = foreach (var docId in project.DocumentIds) { var doc = - project.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + project.GetDocument(docId) + ?? throw new InvalidOperationException("Document missing"); var (fname, node) = (doc.RelativePath(), await doc.GetSyntaxRootAsync(ct)); if (fname is null) { @@ -107,26 +93,30 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = foreach (var newStruct in rewriter.ExtractedNestedStructs) { // Add new documents for each nested struct - project = project.AddDocument( - $"{newStruct.Identifier}.gen.cs", - CompilationUnit() - .WithMembers( - rewriter.Namespace is not null - ? SingletonList( - FileScopedNamespaceDeclaration( - ModUtils.NamespaceIntoIdentifierName(rewriter.Namespace) - ) - .WithMembers( - SingletonList(newStruct) - ) - ) - : SingletonList(newStruct) + project = project + .AddDocument( + $"{newStruct.Identifier}.gen.cs", + CompilationUnit() + .WithMembers( + rewriter.Namespace is not null + ? SingletonList( + FileScopedNamespaceDeclaration( + ModUtils.NamespaceIntoIdentifierName( + rewriter.Namespace + ) + ) + .WithMembers( + SingletonList(newStruct) + ) + ) + : SingletonList(newStruct) + ) + .NormalizeWhitespace(), + filePath: project.FullPath( + $"{fname.AsSpan()[..fname.LastIndexOf('/')]}/{newStruct.Identifier}.gen.cs" ) - .NormalizeWhitespace(), - filePath: project.FullPath( - $"{fname.AsSpan()[..fname.LastIndexOf('/')]}/{newStruct.Identifier}.gen.cs" ) - ).Project; + .Project; } rewriter.File = null; @@ -139,25 +129,21 @@ rewriter.Namespace is not null var extractedFunctionPointers = rewriter .FunctionPointerTypes.Values //.Where(x => x.IsUnique) .SelectMany(x => - (IEnumerable<( - MemberDeclarationSyntax, - string, - HashSet, - HashSet - )>) [ - ( - x.Delegate, - x.Delegate.Identifier.ToString(), - x.ReferencingFileDirs, - x.ReferencingNamespaces - ), - ( - x.Pfn, - x.Pfn.Identifier.ToString(), - x.ReferencingFileDirs, - x.ReferencingNamespaces - ), - ] + (IEnumerable<(MemberDeclarationSyntax, string, HashSet, HashSet)>) + [ + ( + x.Delegate, + x.Delegate.Identifier.ToString(), + x.ReferencingFileDirs, + x.ReferencingNamespaces + ), + ( + x.Pfn, + x.Pfn.Identifier.ToString(), + x.ReferencingFileDirs, + x.ReferencingNamespaces + ), + ] ) .Concat( enums.Select(x => @@ -168,7 +154,8 @@ rewriter.Namespace is not null x.Value.Item3 ) ) - ).ToList(); + ) + .ToList(); foreach (var (typeDecl, identifier, fileDirs, namespaces) in extractedFunctionPointers) { @@ -251,7 +238,7 @@ string nativeTypeName } } - partial class Rewriter(ILogger logger, int delegateSuffixPriority) : CSharpSyntaxRewriter + partial class Rewriter(ILogger logger) : CSharpSyntaxRewriter { private Dictionary _typeRenames = []; @@ -523,15 +510,26 @@ _fallbackFromOuterFunctionPointer is not null var (pfn, @delegate) = CreateFunctionPointerTypes( currentNativeTypeName, $"{currentNativeTypeName}Delegate", - (currentNativeTypeName == fallback - ? SingletonList(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("Transformed"))))) - : default) - .WithNativeName(currentNativeTypeName), - (currentNativeTypeName == fallback - ? SingletonList(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("Transformed"))))) - : default) + ( + currentNativeTypeName == fallback + ? SingletonList( + AttributeList( + SingletonSeparatedList(Attribute(IdentifierName("Transformed"))) + ) + ) + : default + ).WithNativeName(currentNativeTypeName), + ( + currentNativeTypeName == fallback + ? SingletonList( + AttributeList( + SingletonSeparatedList(Attribute(IdentifierName("Transformed"))) + ) + ) + : default + ) .WithNativeName(currentNativeTypeName) - .AddNameSuffix("Delegate", delegateSuffixPriority), + .AddNameSuffix("FunctionPointerDelegateType", "Delegate"), node ); FunctionPointerTypes[currentNativeTypeName] = pfnInfo = (pfn, @delegate, [], []); diff --git a/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs b/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs index 43e92627cd..ada83e3b00 100644 --- a/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs +++ b/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs @@ -113,7 +113,7 @@ .. node.Modifiers.Where(x => x.Kind() is not SyntaxKind.ExternKeyword), .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)) ); - return node.WithRenameSafeAttributeLists() + node = node.WithRenameSafeAttributeLists() .WithIdentifier(Identifier($"{node.Identifier}Internal")) .WithModifiers( [ @@ -129,6 +129,10 @@ or SyntaxKind.ProtectedKeyword ), ] ); + + return node.WithAttributeLists( + node.AttributeLists.AddNameSuffix("InterceptedFunction", "Internal") + ); } } } diff --git a/sources/SilkTouch/SilkTouch/Mods/MarkNativeNames.cs b/sources/SilkTouch/SilkTouch/Mods/MarkNativeNames.cs index d3c6ccf53d..ebf68b4b0e 100644 --- a/sources/SilkTouch/SilkTouch/Mods/MarkNativeNames.cs +++ b/sources/SilkTouch/SilkTouch/Mods/MarkNativeNames.cs @@ -34,10 +34,11 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) var rewriter = new Rewriter(); foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); proj = doc.WithSyntaxRoot( rewriter.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace() - ?? throw new InvalidOperationException("Visit returned null.") + ?? throw new InvalidOperationException("Visit returned null.") ).Project; } @@ -46,7 +47,10 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) private class Rewriter : ModCSharpSyntaxRewriter { - private SyntaxList TryAddNativeNameAttribute(SyntaxList attributeLists, SyntaxToken identifier) + private SyntaxList TryAddNativeNameAttribute( + SyntaxList attributeLists, + SyntaxToken identifier + ) { if (attributeLists.TryGetNativeName(out _)) { @@ -61,7 +65,9 @@ private SyntaxList TryAddNativeNameAttribute(SyntaxList public override SyntaxNode VisitStructDeclaration(StructDeclarationSyntax node) { - node = node.WithAttributeLists(TryAddNativeNameAttribute(node.AttributeLists, node.Identifier)); + node = node.WithAttributeLists( + TryAddNativeNameAttribute(node.AttributeLists, node.Identifier) + ); node = (StructDeclarationSyntax)base.VisitStructDeclaration(node)!; return node; } @@ -69,7 +75,9 @@ public override SyntaxNode VisitStructDeclaration(StructDeclarationSyntax node) /// public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) { - node = node.WithAttributeLists(TryAddNativeNameAttribute(node.AttributeLists, node.Identifier)); + node = node.WithAttributeLists( + TryAddNativeNameAttribute(node.AttributeLists, node.Identifier) + ); node = (EnumDeclarationSyntax)base.VisitEnumDeclaration(node)!; return node; } @@ -79,7 +87,9 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) /// public override SyntaxNode VisitEnumMemberDeclaration(EnumMemberDeclarationSyntax node) { - node = node.WithAttributeLists(TryAddNativeNameAttribute(node.AttributeLists, node.Identifier)); + node = node.WithAttributeLists( + TryAddNativeNameAttribute(node.AttributeLists, node.Identifier) + ); node = (EnumMemberDeclarationSyntax)base.VisitEnumMemberDeclaration(node)!; return node; } @@ -87,7 +97,9 @@ public override SyntaxNode VisitEnumMemberDeclaration(EnumMemberDeclarationSynta /// public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node) { - node = node.WithAttributeLists(TryAddNativeNameAttribute(node.AttributeLists, node.Identifier)); + node = node.WithAttributeLists( + TryAddNativeNameAttribute(node.AttributeLists, node.Identifier) + ); node = (PropertyDeclarationSyntax)base.VisitPropertyDeclaration(node)!; return node; } @@ -95,7 +107,9 @@ public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax no /// public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node) { - node = node.WithAttributeLists(TryAddNativeNameAttribute(node.AttributeLists, node.Identifier)); + node = node.WithAttributeLists( + TryAddNativeNameAttribute(node.AttributeLists, node.Identifier) + ); node = (MethodDeclarationSyntax)base.VisitMethodDeclaration(node)!; return node; } @@ -105,7 +119,12 @@ public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node) { // This just uses the first declared field's identifier in cases where a field declares multiple variables // Eg: int a, b; - node = node.WithAttributeLists(TryAddNativeNameAttribute(node.AttributeLists, node.Declaration.Variables.First().Identifier)); + node = node.WithAttributeLists( + TryAddNativeNameAttribute( + node.AttributeLists, + node.Declaration.Variables.First().Identifier + ) + ); node = (FieldDeclarationSyntax)base.VisitFieldDeclaration(node)!; return node; } diff --git a/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs b/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs index 66692f52b5..d6d9f4e20d 100644 --- a/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs +++ b/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs @@ -168,11 +168,6 @@ public record Configuration /// public List? Vendors { get; init; } - /// - /// The order with which vendor suffixes are applied. - /// - public int VendorSuffixOrder { get; init; } = 0; - /// /// The set of identifiers that should be excluded from vendor suffix identification. /// @@ -183,24 +178,25 @@ public record Configuration /// /// Additional suffixes that may follow a data type suffix but precede a vendor suffix that should be ignored - /// when determining a data type suffix to trim when is on. For example, + /// when determining a data type suffix to trim when is on. For example, /// Direct for OpenAL. + /// + /// Identified suffixes will be categorized as a "KhronosNonVendor" affix. /// public List NonVendorSuffixes { get; init; } = []; /// - /// The order with which non-vendor suffixes are applied. - /// - public int NonVendorSuffixOrder { get; init; } = 0; - - /// - /// Whether OpenGL-style data type suffixes should be trimmed. + /// Whether OpenGL-style data type suffixes should be identified. + /// + /// Identified suffixes will be categorized as a "KhronosFunctionDataType" affix. /// - public bool TrimFunctionDataTypes { get; init; } + public bool IdentifyFunctionDataTypes { get; init; } /// - /// Whether enum type vendor suffixes should be identified and trimmed + /// Whether enum type vendor suffixes should be identified /// if the enum type contains members that don't match the exclusive vendor. + /// + /// Identified suffixes will be categorized as a "KhronosNonExclusiveVendor" affix. /// /// /// For context, OpenGL has a problem where an enum group starts out as ARB but never gets promoted, @@ -210,13 +206,17 @@ public record Configuration /// BufferUsageARB in OpenGL is an ARB suffixed enum that contains GL_STREAM_DRAW which is a core enum. /// In this case, ARB is the exclusive vendor suffix, but it is contradicted by the existence of a non-suffixed enum member. /// This implies that BufferUsageARB was incorrectly promoted and that we should remove its vendor suffix. - /// Enabling this option will trim BufferUsageARB as BufferUsage. + /// + /// Enabling this option will identify these types of suffixes, + /// allowing BufferUsageARB to be trimmed as BufferUsage. /// - public bool TrimEnumTypeNonExclusiveVendors { get; init; } = false; + public bool IdentifyEnumTypeNonExclusiveVendors { get; init; } = false; /// - /// Whether enum members should have their vendor suffixes trimmed + /// Whether enum members should have their vendor suffixes identified /// if they share a vendor suffix with the containing type. + /// + /// Identified suffixes will be categorized as a "KhronosImpliedVendor" affix. /// /// /// VkPresentModeKHR in Vulkan is a KHR suffixed enum that contains VK_PRESENT_MODE_IMMEDIATE_KHR. @@ -224,9 +224,10 @@ public record Configuration /// However, in C#, enum members are always part of an enum type, and as such, we can assume that if an enum member belongs /// to a KHR enum type, then the non-suffixed enum member is also a KHR enum member. /// - /// Enabling this option will trim VK_PRESENT_MODE_IMMEDIATE_KHR as VK_PRESENT_MODE_IMMEDIATE. + /// Enabling this option will identify these types of suffixes, + /// allowing VK_PRESENT_MODE_IMMEDIATE_KHR to be trimmed as VK_PRESENT_MODE_IMMEDIATE. /// - public bool TrimEnumMemberImpliedVendors { get; init; } = false; + public bool IdentifyEnumMemberImpliedVendors { get; init; } = false; } /// @@ -273,36 +274,45 @@ public async Task InitializeAsync(IModContext ctx, CancellationToken ct = defaul job.ApiSets = apiSets; job.SupportedApiProfiles = supportedApiProfiles; - var profiles = supportedApiProfiles.SelectMany(x => x.Value).Select(x => x.Profile).ToHashSet(); - - job.Vendors.UnionWith([ - .. xml.Element("registry") - ?.Element("tags") - ?.Elements("tag") - .Attributes("name") - .Select(x => x.Value) ?? [], - .. currentConfig.NonStandardExtensionNomenclature - ? [] - : xml.Element("registry") - ?.Element("extensions") - ?.Elements("extension") - // Only include vendors who have extensions that match a declared profile - // This is mainly to exclude extensions that are declared as supported="disabled" - .Where(ext => - { - var supportedProfiles = ext.Attribute("supported")?.Value.Split("|") ?? []; - return profiles.Intersect(supportedProfiles).Any(); - }) + var profiles = supportedApiProfiles + .SelectMany(x => x.Value) + .Select(x => x.Profile) + .ToHashSet(); + + job.Vendors.UnionWith( + [ + .. xml.Element("registry") + ?.Element("tags") + ?.Elements("tag") .Attributes("name") - // Extract the second part from the extension name - // Eg: GL_NV_command_list -> NV - .Select(name => name.Value.Split('_')[1].ToUpper()) ?? [], - .. currentConfig.Vendors ?? [], - ]); + .Select(x => x.Value) ?? [], + .. currentConfig.NonStandardExtensionNomenclature + ? [] + : xml.Element("registry") + ?.Element("extensions") + ?.Elements("extension") + // Only include vendors who have extensions that match a declared profile + // This is mainly to exclude extensions that are declared as supported="disabled" + .Where(ext => + { + var supportedProfiles = + ext.Attribute("supported")?.Value.Split("|") ?? []; + return profiles.Intersect(supportedProfiles).Any(); + }) + .Attributes("name") + // Extract the second part from the extension name + // Eg: GL_NV_command_list -> NV + .Select(name => name.Value.Split('_')[1].ToUpper()) ?? [], + .. currentConfig.Vendors ?? [], + ] + ); job.DeprecatedAliases = xml.Descendants() - .Where(x => x.Attribute("deprecated")?.Value == "aliased" && x.Attribute("name") != null) - .Select(x => x.Attribute("name")!.Value).ToHashSet(); + .Where(x => + x.Attribute("deprecated")?.Value == "aliased" && x.Attribute("name") != null + ) + .Select(x => x.Attribute("name")!.Value) + .ToHashSet(); ReadGroups(xml, job, job.Vendors); @@ -359,33 +369,33 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) var rewriter1 = new RewriterPhase1(jobData, logger); foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); proj = doc.WithSyntaxRoot( rewriter1.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace() - ?? throw new InvalidOperationException("Visit returned null.") + ?? throw new InvalidOperationException("Visit returned null.") ).Project; } // Add missing enum types foreach (var (filePath, node) in rewriter1.GetMissingEnums()) { - proj = proj - .AddDocument( - Path.GetFileName(filePath), - node.NormalizeWhitespace(), - filePath: proj.FullPath(filePath) - ) - .Project; + proj = proj.AddDocument( + Path.GetFileName(filePath), + node.NormalizeWhitespace(), + filePath: proj.FullPath(filePath) + ).Project; } // Rewrite phase 2 var rewriter2 = new RewriterPhase2(jobData, rewriter1); foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); proj = doc.WithSyntaxRoot( rewriter2.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace() - ?? throw new InvalidOperationException("Visit returned null.") + ?? throw new InvalidOperationException("Visit returned null.") ).Project; } @@ -393,17 +403,19 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) var rewriter3 = new RewriterPhase3(jobData, currentConfig); foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); proj = doc.WithSyntaxRoot( rewriter3.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace() - ?? throw new InvalidOperationException("Visit returned null.") + ?? throw new InvalidOperationException("Visit returned null.") ).Project; } // Rename documents to account for FlagBits/Flags differences foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); if (doc.FilePath == null) { continue; @@ -420,12 +432,20 @@ public Task> BeforeScrapeAsync(string key, List { var job = Jobs[key]; - rsps = rsps.Select(rsp => rsp with - { - GeneratorConfiguration = rsp.GeneratorConfiguration.ToWrapper() with { - RemappedNames = rsp.GeneratorConfiguration.RemappedNames.Concat(job.AdditionalTypeRemappings).ToDictionary(), - }, - }).ToList(); + rsps = rsps.Select(rsp => + rsp with + { + GeneratorConfiguration = rsp.GeneratorConfiguration.ToWrapper() with + { + RemappedNames = rsp + .GeneratorConfiguration.RemappedNames.Concat( + job.AdditionalTypeRemappings + ) + .ToDictionary(), + }, + } + ) + .ToList(); return Task.FromResult(rsps); } @@ -1221,8 +1241,10 @@ public void Trim(NameTrimmerContext context) { foreach (var name in (IEnumerable)[current, .. previous]) { - if (job.Groups.TryGetValue(name, out var group) - && name == $"{group.Namespace}Enum") + if ( + job.Groups.TryGetValue(name, out var group) + && name == $"{group.Namespace}Enum" + ) { context.Names[original] = new CandidateNames(name, []); break; @@ -1490,7 +1512,11 @@ public bool TryGetSymbolMetadata( [NotNullWhen(true)] out IEnumerable? metadata ) { - if (jobKey is null || !Jobs.TryGetValue(jobKey, out var job) || job.SupportedApiProfiles is null) + if ( + jobKey is null + || !Jobs.TryGetValue(jobKey, out var job) + || job.SupportedApiProfiles is null + ) { metadata = null; return false; @@ -1603,8 +1629,8 @@ private class RewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter AllKnownEnums.Add(groupName); var attributes = SingletonList( - AttributeList( - [Attribute(IdentifierName("Transformed"))])); + AttributeList([Attribute(IdentifierName("Transformed"))]) + ); if (groupInfo.NativeName != null) { @@ -1613,44 +1639,60 @@ private class RewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter var baseTypeSyntax = ParseTypeName(baseType); - results.Add(( - $"Enums/{groupName}.gen.cs", - CompilationUnit() - .WithMembers( - SingletonList( - FileScopedNamespaceDeclaration(ModUtils.NamespaceIntoIdentifierName(ns)) - .WithMembers( - SingletonList( - EnumDeclaration(groupName) - .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword))) - .WithAttributeLists(attributes) - .WithBaseList(BaseList([SimpleBaseType(baseTypeSyntax)])) - .WithMembers( - SeparatedList( - groupInfo.Enums.Select(x => - EnumMemberDeclaration(x.Identifier.ToString()) - .WithAttributeLists( - new SyntaxList() - .WithNativeName(x.Identifier.Text)) - .WithEqualsValue( - x.Initializer?.WithValue( - CheckedExpression( - SyntaxKind.UncheckedExpression, - CastExpression( - baseTypeSyntax, - x.Initializer.Value + results.Add( + ( + $"Enums/{groupName}.gen.cs", + CompilationUnit() + .WithMembers( + SingletonList( + FileScopedNamespaceDeclaration( + ModUtils.NamespaceIntoIdentifierName(ns) + ) + .WithMembers( + SingletonList( + EnumDeclaration(groupName) + .WithModifiers( + TokenList( + Token(SyntaxKind.PublicKeyword) + ) + ) + .WithAttributeLists(attributes) + .WithBaseList( + BaseList( + [SimpleBaseType(baseTypeSyntax)] + ) + ) + .WithMembers( + SeparatedList( + groupInfo.Enums.Select(x => + EnumMemberDeclaration( + x.Identifier.ToString() + ) + .WithAttributeLists( + new SyntaxList().WithNativeName( + x.Identifier.Text + ) + ) + .WithEqualsValue( + x.Initializer?.WithValue( + CheckedExpression( + SyntaxKind.UncheckedExpression, + CastExpression( + baseTypeSyntax, + x.Initializer.Value + ) ) ) ) - ) + ) ) ) - ) + ) ) - ) + ) ) - ) - )); + ) + ); } } @@ -1672,8 +1714,10 @@ private class RewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter AllKnownEnums.Add(identifier); - if (job.Groups.TryGetValue(identifier, out _) - && !node.Ancestors().OfType().Any()) + if ( + job.Groups.TryGetValue(identifier, out _) + && !node.Ancestors().OfType().Any() + ) { AlreadyPresentGroups.Add(identifier); } @@ -1684,8 +1728,10 @@ private class RewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter public override SyntaxNode? VisitFieldDeclaration(FieldDeclarationSyntax node) { // Only match constant fields - if (node.Declaration.Variables.Count != 1 - || !node.Modifiers.Any(SyntaxKind.ConstKeyword)) + if ( + node.Declaration.Variables.Count != 1 + || !node.Modifiers.Any(SyntaxKind.ConstKeyword) + ) { return base.VisitFieldDeclaration(node); } @@ -1739,7 +1785,8 @@ private class RewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter /// private class RewriterPhase2(JobData job, RewriterPhase1 phase1) : CSharpSyntaxRewriter(true) { - public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node) => IdentifierName(node.Identifier.ToString().Replace("FlagBits", "Flags")); + public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node) => + IdentifierName(node.Identifier.ToString().Replace("FlagBits", "Flags")); public override SyntaxNode? VisitEnumDeclaration(EnumDeclarationSyntax node) { @@ -1748,17 +1795,21 @@ private class RewriterPhase2(JobData job, RewriterPhase1 phase1) : CSharpSyntaxR if (node.Members.Any(m => job.DeprecatedAliases.Contains(m.Identifier.ValueText))) { // Remove deprecated aliases - node = node.WithMembers([ - ..node.Members.Where(m => !job.DeprecatedAliases.Contains(m.Identifier.ValueText)), - ]); + node = node.WithMembers( + [ + .. node.Members.Where(m => + !job.DeprecatedAliases.Contains(m.Identifier.ValueText) + ), + ] + ); } if (job.Groups.TryGetValue(identifier, out var group) && group.KnownBitmask) { // Add [Flags] attribute var flagsAttribute = AttributeList( - SingletonSeparatedList( - Attribute(IdentifierName("Flags")))); + SingletonSeparatedList(Attribute(IdentifierName("Flags"))) + ); node = node.WithAttributeLists(node.AttributeLists.Add(flagsAttribute)); } @@ -1768,12 +1819,22 @@ private class RewriterPhase2(JobData job, RewriterPhase1 phase1) : CSharpSyntaxR public override SyntaxNode? VisitFieldDeclaration(FieldDeclarationSyntax node) { - if (node.Declaration.Variables.Any(v => job.DeprecatedAliases.Contains(v.Identifier.ValueText))) + if ( + node.Declaration.Variables.Any(v => + job.DeprecatedAliases.Contains(v.Identifier.ValueText) + ) + ) { // Remove deprecated aliases - node = node.WithDeclaration(node.Declaration.WithVariables([ - ..node.Declaration.Variables.Where(v => !job.DeprecatedAliases.Contains(v.Identifier.ValueText)), - ])); + node = node.WithDeclaration( + node.Declaration.WithVariables( + [ + .. node.Declaration.Variables.Where(v => + !job.DeprecatedAliases.Contains(v.Identifier.ValueText) + ), + ] + ) + ); if (node.Declaration.Variables.Count == 0) { @@ -1815,7 +1876,10 @@ private class RewriterPhase2(JobData job, RewriterPhase1 phase1) : CSharpSyntaxR /// /// This method is intentionally implemented in a naive manner to keep things simple. /// - private bool TryGetManagedEnumType(SyntaxList attributes, [NotNullWhen(true)] out string? managedName) + private bool TryGetManagedEnumType( + SyntaxList attributes, + [NotNullWhen(true)] out string? managedName + ) { managedName = null; @@ -1852,7 +1916,12 @@ private bool TryGetManagedEnumType(SyntaxList attributes, [ /// private class RewriterPhase3(JobData job, Configuration config) : CSharpSyntaxRewriter { - private SyntaxList ProcessAndGetNewAttributes(SyntaxList attributeLists, SyntaxToken identifier, bool trimHandleSuffix, MethodDeclarationSyntax? methodDeclaration = null) + private SyntaxList ProcessAndGetNewAttributes( + SyntaxList attributeLists, + SyntaxToken identifier, + bool trimHandleSuffix, + MethodDeclarationSyntax? methodDeclaration = null + ) { // Get the name of the identifier, preferring the native one if available // This name will be modified by the code below as different suffixes are identified @@ -1865,7 +1934,7 @@ private SyntaxList ProcessAndGetNewAttributes(SyntaxList ProcessAndGetNewAttributes(SyntaxList ProcessAndGetNewAttributes(SyntaxList ProcessAndGetNewAttributes(SyntaxList ProcessAndGetNewAttributes(SyntaxList - node.WithAttributeLists(ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false)); + node.WithAttributeLists( + ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false) + ); // Special case for enums since this code needs information about // the enum type name and its member names at the same time - // in order to properly trim the type name and member name + // in order to properly identify the affix types of the enum type and member names + // + // Note that this code identifies affixes for trimming, but does not actually trim them + // Trimming is done by PrettifyNames, if PrettifyNames is configured to do so public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) { var typeName = node.AttributeLists.GetNativeNameOrDefault(node.Identifier); @@ -1943,11 +2034,14 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) var typeVendor = job.Vendors.FirstOrDefault(typeName.EndsWith); var hasTypeSuffix = typeVendor != null; - var vendorFromTypeNameOrder = config.VendorSuffixOrder; + var vendorAffixType = "KhronosVendor"; // Figure out the enum's exclusive vendor var exclusiveVendor = groupInfo?.ExclusiveVendor ?? typeVendor; - if (exclusiveVendor == null || !node.Members.All(member => member.Identifier.Text.EndsWith(exclusiveVendor))) + if ( + exclusiveVendor == null + || !node.Members.All(member => member.Identifier.Text.EndsWith(exclusiveVendor)) + ) { // Not all enum members share the exclusive vendor // This means the vendor suffix isn't actually exclusive @@ -1955,25 +2049,25 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) } // See config option for more info and examples on what this does - if (config.TrimEnumTypeNonExclusiveVendors && typeVendor != null) + if (config.IdentifyEnumTypeNonExclusiveVendors && typeVendor != null) { - // Trim if the type vendor suffix does not match the identified exclusive vendor suffix - var shouldTrimType = typeVendor != exclusiveVendor; - // Check if there are other versions of the enum (this includes the core variant and other vendor variants) // // For example, SamplePatternEXT and SamplePatternSGIS are both enum types. // Trimming both would cause conflicts. // Trimming one but not the other would imply one is core and the other is not. - var hasMultipleVersions = job.Groups.Count(x => x.Key.StartsWith(typeName[..^typeVendor.Length])) > 1; + var hasMultipleVersions = + job.Groups.Count(x => x.Key.StartsWith(typeName[..^typeVendor.Length])) > 1; var isSafeToTrimType = !hasMultipleVersions; - if (shouldTrimType && isSafeToTrimType) + // Identify the affix for trimming if the type vendor suffix does not match the identified exclusive vendor suffix + var isVendorMismatch = typeVendor != exclusiveVendor; + if (isVendorMismatch && isSafeToTrimType) { - // Remove the exclusive vendor since it isn't actually exclusive - vendorFromTypeNameOrder = -1; + // Identify the affix as a non exclusive vendor since it isn't actually exclusive + vendorAffixType = "KhronosNonExclusiveVendor"; - // Type suffix has been removed + // Assume that non exclusive vendor suffixes are trimmed hasTypeSuffix = false; } } @@ -1981,7 +2075,9 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) if (typeVendor != null) { // Mark the type vendor suffix as identified - node = node.WithAttributeLists(node.AttributeLists.AddNameSuffix(typeVendor, vendorFromTypeNameOrder)); + node = node.WithAttributeLists( + node.AttributeLists.AddNameSuffix(vendorAffixType, typeVendor, true) + ); } // Check if the enum contains unsuffixed members @@ -1996,7 +2092,7 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) return false; }); - // We should not trim member suffixes if the enum type already contains unsuffixed members + // We should not identify member suffixes for trimming if the enum type already contains unsuffixed members // We also should not trim member suffixes if the type suffix was removed // // For example (direct conflict with existing): @@ -2008,25 +2104,48 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) // If we trim SOFT from ALC_DONT_CARE_SOFT, it is not immediately obvious that the enum members have different promotion statuses. var canTrimImpliedVendors = hasTypeSuffix && !containsUnsuffixedMembers; - // Trim the enum members if needed // See config option for more info and examples on what this does - if (config.TrimEnumMemberImpliedVendors && typeVendor != null && canTrimImpliedVendors) + if ( + config.IdentifyEnumMemberImpliedVendors + && typeVendor != null + && canTrimImpliedVendors + ) { - node = node.WithMembers([ - ..node.Members.Select(member => { - if (member.AttributeLists.GetNativeNameOrDefault(member.Identifier).EndsWith(typeVendor)) + node = node.WithMembers( + [ + .. node.Members.Select(member => { - return member.WithAttributeLists(member.AttributeLists.AddNameSuffix(typeVendor, -1)); - } + if ( + member + .AttributeLists.GetNativeNameOrDefault(member.Identifier) + .EndsWith(typeVendor) + ) + { + // Identify for trimming + return member.WithAttributeLists( + member.AttributeLists.AddNameSuffix( + "KhronosImpliedVendor", + typeVendor, + true + ) + ); + } - // Default behavior - Identify, but keep the member suffixes - return member.WithAttributeLists(ProcessAndGetNewAttributes(member.AttributeLists, member.Identifier, false)); - }), - ]); + // Default behavior - Identify, but not for trimming + return member.WithAttributeLists( + ProcessAndGetNewAttributes( + member.AttributeLists, + member.Identifier, + false + ) + ); + }), + ] + ); } else { - // Default behavior - Identify, but keep the member suffixes + // Default behavior - Identify, but not for trimming node = (EnumDeclarationSyntax)base.VisitEnumDeclaration(node)!; } @@ -2036,13 +2155,19 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node) // ----- Members ----- public override SyntaxNode VisitEnumMemberDeclaration(EnumMemberDeclarationSyntax node) => - node.WithAttributeLists(ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false)); + node.WithAttributeLists( + ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false) + ); public override SyntaxNode VisitPropertyDeclaration(PropertyDeclarationSyntax node) => - node.WithAttributeLists(ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false)); + node.WithAttributeLists( + ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false) + ); public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node) => - node.WithAttributeLists(ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false, node)); + node.WithAttributeLists( + ProcessAndGetNewAttributes(node.AttributeLists, node.Identifier, false, node) + ); } [SuppressMessage("ReSharper", "MoveLocalFunctionAfterJumpStatement")] @@ -2187,7 +2312,11 @@ var group in (groupName is null ? Enumerable.Empty() : [groupName]) } // Some enum groups don't have members, meaning that the code above won't catch them - if (groupName != null && !data.Groups.ContainsKey(groupName)) + if ( + groupName != null + && !IsUngroupable(groupName) + && !data.Groups.ContainsKey(groupName) + ) { data.Groups[groupName] = new EnumGroup( groupName, diff --git a/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs b/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs index 08efbb7a80..0706fc13be 100644 --- a/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs +++ b/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs @@ -53,6 +53,51 @@ IEnumerable> trimmerProviders /// Multiple candidate name prefixes that may apply across all of the bindings generated. /// public IReadOnlyList? GlobalPrefixHints { get; init; } + + /// + /// The configuration for each category of name affixes. + /// The key specifies the category name. + /// + public Dictionary Affixes { get; init; } = []; + } + + /// + /// Specifies how a category of name affixes are to be processed by . + /// + public record NameAffixConfiguration + { + /// + /// Whether the affix should be removed. + /// + public bool Remove { get; init; } = false; + + /// + /// The order with which the affix is applied. + /// + /// Does nothing if is true. + /// + /// Higher means the affix is applied first, meaning it will be closer to the inside of the name. + /// Affixes with the same order have ties broken using the order the s are declared on the identifier. + /// First declared are applied first. + /// + public int Order { get; init; } = 0; + + /// + /// Whether the affix will be used to create secondary + /// names that will be used in case of name conflicts. + /// + public bool IsDiscriminator { get; init; } = false; + + /// + /// The priority with which the affix will be used to create secondary + /// names that will be used in case of name conflicts. + /// + /// Does nothing if is false. + /// + /// Higher means the name created using the affix is tried first. + /// Affixes with the same priority are applied together as a group. + /// + public int DiscriminatorPriority { get; init; } = 0; } /// @@ -80,6 +125,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) // The dictionary containing mappings from the original type names to the new names of the type and its members var newNames = new Dictionary(); + var nameAffixer = new NameAffixer(visitor.AffixTypes, cfg.Affixes); var nameTransformer = new NameUtils.NameTransformer(cfg.LongAcronymThreshold ?? 3); // TODO: Change to 2 in next PR to match framework design guidelines // Trim the trimmable names if the trimmer baseline is set @@ -90,9 +136,35 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) foreach (var (name, (nonFunctions, functions)) in visitor.TrimmableTypes) { newNames[name] = new RenamedType( - ApplyPrettifyOnlyPipeline(null, name, cfg.NameOverrides, visitor.AffixTypes, nameTransformer), - nonFunctions.ToDictionary(x => x, x => ApplyPrettifyOnlyPipeline(name, x, cfg.NameOverrides, visitor.AffixTypes, nameTransformer)), - functions.ToDictionary(x => x.Name, x => ApplyPrettifyOnlyPipeline(name, x.Name, cfg.NameOverrides, visitor.AffixTypes, nameTransformer)) + ApplyPrettifyOnlyPipeline( + null, + name, + cfg.NameOverrides, + nameAffixer, + nameTransformer + ), + nonFunctions.ToDictionary( + x => x, + x => + ApplyPrettifyOnlyPipeline( + name, + x, + cfg.NameOverrides, + nameAffixer, + nameTransformer + ) + ), + functions.ToDictionary( + x => x.Name, + x => + ApplyPrettifyOnlyPipeline( + name, + x.Name, + cfg.NameOverrides, + nameAffixer, + nameTransformer + ) + ) ); } } @@ -106,8 +178,8 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) // old logic. var trimmers = trimmerProviders .SelectMany(x => x.Get(ctx.JobKey)) - .Append(new NameAffixerEarlyTrimmer(visitor.AffixTypes)) - .Append(new NameAffixerLateTrimmer(visitor.AffixTypes)) + .Append(new NameAffixerEarlyTrimmer(nameAffixer)) + .Append(new NameAffixerLateTrimmer(nameAffixer)) .Append(new PrettifyNamesTrimmer(nameTransformer)) .OrderBy(x => x.Order) .ToArray(); @@ -142,10 +214,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) // Rename the "constants" i.e. all the consts/static readonlys in this type. These are treated // individually because everything that isn't a constant or a function is only prettified instead of prettified & trimmed. - var constNames = consts.ToDictionary( - x => x, - x => new CandidateNames(x, []) - ); + var constNames = consts.ToDictionary(x => x, x => new CandidateNames(x, [])); // Trim the constants. Trim( @@ -200,12 +269,28 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) { if (!newNames.TryGetValue(typeName, out var renamedType)) { - renamedType = new RenamedType(ApplyPrettifyOnlyPipeline(null, typeName, cfg.NameOverrides, visitor.AffixTypes, nameTransformer), [], []); + renamedType = new RenamedType( + ApplyPrettifyOnlyPipeline( + null, + typeName, + cfg.NameOverrides, + nameAffixer, + nameTransformer + ), + [], + [] + ); } foreach (var memberName in memberNames) { - renamedType.NonFunctions[memberName] = ApplyPrettifyOnlyPipeline(typeName, memberName, cfg.NameOverrides, visitor.AffixTypes, nameTransformer); + renamedType.NonFunctions[memberName] = ApplyPrettifyOnlyPipeline( + typeName, + memberName, + cfg.NameOverrides, + nameAffixer, + nameTransformer + ); } newNames[typeName] = renamedType; @@ -255,16 +340,16 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) var comp = await proj.GetCompilationAsync(ct) - ?? throw new InvalidOperationException("Failed to obtain compilation for source project!"); + ?? throw new InvalidOperationException( + "Failed to obtain compilation for source project!" + ); await NameUtils.RenameAllAsync( ctx, newNames.SelectMany(x => { var nonFunctionConflicts = x - .Value.NonFunctions.Values.Where(y => - x.Value.Functions.ContainsValue(y) - ) + .Value.NonFunctions.Values.Where(y => x.Value.Functions.ContainsValue(y)) .ToHashSet(); return comp.GetSymbolsWithName(x.Key, SymbolFilter.Type, ct) .OfType() @@ -352,7 +437,9 @@ z.MethodKind is MethodKind.Constructor or MethodKind.Destructor if (found) { - logger.LogError($"{originalName} -> {doc.Name} failed to rename file as a file already exists at {doc.FilePath}"); + logger.LogError( + $"{originalName} -> {doc.Name} failed to rename file as a file already exists at {doc.FilePath}" + ); } else { @@ -373,8 +460,9 @@ private string ApplyPrettifyOnlyPipeline( string? container, string name, Dictionary nameOverrides, - Dictionary affixTypes, - ICulturedStringTransformer nameTransformer) + NameAffixer nameAffixer, + ICulturedStringTransformer nameTransformer + ) { // Check for overrides foreach (var (nativeName, overriddenName) in nameOverrides) @@ -390,7 +478,10 @@ private string ApplyPrettifyOnlyPipeline( // Check whether the override is for this type. var span = nativeName.AsSpan(); var containerSpan = span[..span.IndexOf('.')]; - if (!containerSpan.Equals("*", StringComparison.Ordinal) && !containerSpan.Equals(container, StringComparison.Ordinal)) + if ( + !containerSpan.Equals("*", StringComparison.Ordinal) + && !containerSpan.Equals(container, StringComparison.Ordinal) + ) { continue; } @@ -411,9 +502,9 @@ private string ApplyPrettifyOnlyPipeline( var allowAllCaps = container == null; var result = name; - result = RemoveAffixes(result, container, name, affixTypes, null); + result = nameAffixer.RemoveAffixes(result, container, name, null); result = result.Prettify(nameTransformer, allowAllCaps); - result = ApplyAffixes(result, container, name, affixTypes, null); + result = nameAffixer.ApplyAffixes(result, container, name, null); return result; } @@ -441,7 +532,10 @@ private void Trim( // Check whether the override is for this type. var span = nativeName.AsSpan(); var containerSpan = span[..span.IndexOf('.')]; - if (containerSpan.Equals("*", StringComparison.Ordinal) || containerSpan.Equals(context.Container, StringComparison.Ordinal)) + if ( + containerSpan.Equals("*", StringComparison.Ordinal) + || containerSpan.Equals(context.Container, StringComparison.Ordinal) + ) { nameToAdd = span[(span.IndexOf('.') + 1)..].ToString(); } @@ -513,7 +607,11 @@ private void Trim( // Keep track of the method discriminators to determine whether we have incompatible overloads that need to be // renamed. We keep track of the first trimming name so that we can add it to conflictingTrimmingNames when we // do discover a conflict (along with the trimming name of the actual conflict). - var methDiscrims = new Dictionary Methods)>(); + var methDiscrims = + new Dictionary< + string, + (string? FirstTrimmingName, List Methods) + >(); var conflictingTrimmingNames = new HashSet(); while (namesToEval.GetEnumerator() is var e && e.MoveNext() && e.Current is var primary) { @@ -653,7 +751,9 @@ var conflictingTrimmingName in ( // Update the output name. var firstSecondary = context.Names[first].Secondary - ?? throw new InvalidOperationException("More than one trimming name without secondary names."); + ?? throw new InvalidOperationException( + "More than one trimming name without secondary names." + ); var firstNextPrimary = firstSecondary[^1]; firstSecondary.RemoveAt(firstSecondary.Count - 1); context.Names[first] = new CandidateNames(firstNextPrimary, firstSecondary); @@ -693,7 +793,9 @@ out var tnff // Conflict resolution! Update the output name. var secondary = context.Names[conflictingTrimmingName].Secondary - ?? throw new InvalidOperationException("More than one trimming name without secondary names."); + ?? throw new InvalidOperationException( + "More than one trimming name without secondary names." + ); var nextPrimary = secondary[^1]; secondary.RemoveAt(secondary.Count - 1); context.Names[conflictingTrimmingName] = new CandidateNames(nextPrimary, secondary); @@ -725,219 +827,6 @@ out var tnff } } - /// - /// Gets affix data for the specified container and original name of the identifier. - /// - /// The container name. Either null or the containing type. - /// The original name of the identifier. Either the type name or the member name. - /// The affix data retrieved by the . - /// The name affixes for the specified identifier. - private static NameAffix[] GetAffixes(string? container, string originalName, Dictionary affixTypes) - { - TypeAffixData typeAffixData; - if (container == null) - { - if (!affixTypes.TryGetValue(originalName, out typeAffixData)) - { - return []; - } - - return typeAffixData.TypeAffixes; - } - - if (affixTypes.TryGetValue(container, out typeAffixData)) - { - if (typeAffixData.MemberAffixes?.TryGetValue(originalName, out var affixes) ?? false) - { - return affixes; - } - } - - return []; - } - - /// - /// Removes affixes from the specified primary name and adds the original specified primary to the secondary list if provided. - /// - /// - /// Designed to be used by either or . - /// - /// The current primary name. - /// The container name. Either null or the containing type. - /// The original name of the identifier. Either the type name or the member name. - /// The affix data retrieved by the . - /// The list of secondary names. This should be null if used by . - /// The new primary name. - private static string RemoveAffixes(string primary, string? container, string originalName, Dictionary affixTypes, List? secondary) - { - var affixes = GetAffixes(container, originalName, affixTypes); - if (affixes.Length == 0) - { - return primary; - } - - var originalPrimary = primary; - - // Sort affixes so that the outer affixes are first - affixes.Sort(static (a, b) => - { - // Sort by ascending order - // Higher order means the affix is closer to the inside of the name - if (a.Order != b.Order) - { - return a.Order.CompareTo(b.Order); - } - - // Then by descending declaration order - // Lower declaration order means the affix is closer to the inside of the name - return -a.DeclarationOrder.CompareTo(b.DeclarationOrder); - }); - - var prefixes = affixes.Where(x => x.IsPrefix).ToList(); - var suffixes = affixes.Where(x => !x.IsPrefix).ToList(); - - RemoveSide(true, prefixes); - RemoveSide(false, suffixes); - - if (originalPrimary != primary) - { - secondary?.Add(originalPrimary); - } - - return primary; - - void RemoveSide(bool isPrefix, List nameAffixes) - { - while (nameAffixes.Count > 0) - { - var removedAffix = false; - for (var i = 0; i < nameAffixes.Count; i++) - { - var affix = nameAffixes[i]; - if (isPrefix ? primary.StartsWith(affix.Affix) : primary.EndsWith(affix.Affix)) - { - primary = isPrefix ? primary[affix.Affix.Length..] : primary[..^affix.Affix.Length]; - - nameAffixes.RemoveAt(i); - removedAffix = true; - break; - } - } - - if (!removedAffix) - { - break; - } - } - } - } - - /// - /// Applies affixes to the specified primary name and adds fallbacks to the secondary list if provided. - /// - /// - /// Designed to be used by either or . - /// - /// The current primary name. - /// The container name. Either null or the containing type. - /// The original name of the identifier. Either the type name or the member name. - /// The affix data retrieved by the . - /// The list of secondary names. This should be null if used by . - /// The new primary name. - private static string ApplyAffixes(string primary, string? container, string originalName, Dictionary affixTypes, List? secondary) - { - var affixes = GetAffixes(container, originalName, affixTypes); - if (affixes.Length == 0) - { - return primary; - } - - // Sort affixes by priority - // Negative priority is first, followed by highest non-negative priority - // This groups the required affixes at the start and each group of fallback affixes together - affixes.Sort(static (a, b) => - { - // Negative priority first - // These are our required affixes - if (int.Sign(a.DiscriminatorPriority) != 1 || int.Sign(b.DiscriminatorPriority) != 1) - { - return a.DiscriminatorPriority.CompareTo(b.DiscriminatorPriority); - } - - // Then sort the remaining by descending priority - return -a.DiscriminatorPriority.CompareTo(b.DiscriminatorPriority); - }); - - // This is guaranteed to be non-null when this method returns if there is at least one affix - string? newPrimary = null; - - var currentPriority = -1; - for (var affixI = 0; affixI < affixes.Length; affixI++) - { - var affix = affixes[affixI]; - if (currentPriority == -1 && affix.DiscriminatorPriority < 0) - { - continue; - } - - if (currentPriority == -1 || affix.DiscriminatorPriority < currentPriority) - { - currentPriority = affix.DiscriminatorPriority; - CreateName(primary, affixes.AsSpan()[..affixI], ref newPrimary, secondary); - if (secondary == null) - { - return newPrimary!; - } - } - } - - CreateName(primary, affixes, ref newPrimary, secondary); - - return newPrimary!; - - static void CreateName(string name, Span currentAffixes, ref string? newPrimary, List? secondary) - { - // Sort affixes so that the inner affixes are first - currentAffixes.Sort(static (a, b) => - { - // Sort by descending order - // Higher order means the affix is closer to the inside of the name - if (a.Order != b.Order) - { - return -a.Order.CompareTo(b.Order); - } - - // Then by ascending declaration order - // Lower declaration order means the affix is closer to the inside of the name - return a.DeclarationOrder.CompareTo(b.DeclarationOrder); - }); - - foreach (var affix in currentAffixes) - { - if (affix.Order >= 0) - { - if (affix.IsPrefix) - { - name = affix.Affix + name; - } - else - { - name += affix.Affix; - } - } - } - - if (newPrimary == null) - { - newPrimary = name; - } - else - { - secondary?.Add(name); - } - } - } - /// public Task> BeforeScrapeAsync(string key, List rsps) { @@ -947,7 +836,7 @@ public Task> BeforeScrapeAsync(string key, List { logger.LogWarning( "{} (for {}) should use exclude-using-statics-for-enums as PrettifyNames does not resolve " - + "conflicts with members of other types.", + + "conflicts with members of other types.", responseFile.FilePath, key ); @@ -956,7 +845,7 @@ public Task> BeforeScrapeAsync(string key, List { logger.LogWarning( "{} (for {}) should use exclude-using-statics-for-guid-members as PrettifyNames does not resolve " - + "conflicts with members of other types.", + + "conflicts with members of other types.", responseFile.FilePath, key ); @@ -972,13 +861,27 @@ public Task> BeforeScrapeAsync(string key, List /// The new name of the type. /// The mappings from original names to new names of the type's non-function members. /// The mappings from original names to new names of the type's function members. - private record struct RenamedType(string NewName, Dictionary NonFunctions, Dictionary Functions); - - private record struct NameAffix(bool IsPrefix, string Affix, int Order, int DiscriminatorPriority, int DeclarationOrder); + private record struct RenamedType( + string NewName, + Dictionary NonFunctions, + Dictionary Functions + ); + + private record struct NameAffix( + bool IsPrefix, + string Category, + string Affix, + int DeclarationOrder + ); private record struct TypeData(List NonFunctions, List Functions); + private record struct FunctionData(string Name, MethodDeclarationSyntax Syntax); - private record struct TypeAffixData(NameAffix[] TypeAffixes, Dictionary? MemberAffixes); + + private record struct TypeAffixData( + NameAffix[] TypeAffixes, + Dictionary? MemberAffixes + ); private class Visitor : CSharpSyntaxWalker { @@ -1026,7 +929,11 @@ private class Visitor : CSharpSyntaxWalker /// The class or struct's declaration syntax node. /// The names of the non-function members directly contained by the type. /// The names of the function members directly contained by the type. - private record struct TypeInProgress(TypeDeclarationSyntax Type, List NonFunctions, List Functions); + private record struct TypeInProgress( + TypeDeclarationSyntax Type, + List NonFunctions, + List Functions + ); /// /// Represents an enum. @@ -1048,7 +955,10 @@ _typeInProgress is not null || _enumInProgress is not null || node.Ancestors().OfType().Any(); - private bool TryGetAffixData(SyntaxList attributeLists, out NameAffix[] affixes) + private bool TryGetAffixData( + SyntaxList attributeLists, + out NameAffix[] affixes + ) { affixes = []; var declarationOrder = 0; @@ -1061,18 +971,23 @@ private bool TryGetAffixData(SyntaxList attributeLists, out continue; } - if (attribute.ArgumentList != null) + var argumentList = attribute.ArgumentList; + if ( + argumentList != null + && argumentList.Arguments[0].Expression + is LiteralExpressionSyntax { Token.Value: string type } + && argumentList.Arguments[1].Expression + is LiteralExpressionSyntax { Token.Value: string category } + && argumentList.Arguments[2].Expression + is LiteralExpressionSyntax { Token.Value: string affix } + ) { - var type = (attribute.ArgumentList.Arguments[0].Expression as LiteralExpressionSyntax)?.Token.Value as string; - var affix = (attribute.ArgumentList.Arguments[1].Expression as LiteralExpressionSyntax)?.Token.Value as string; - var order = (attribute.ArgumentList.Arguments[2].Expression as LiteralExpressionSyntax)?.Token.Value as int? ?? -1; - var discriminatorPriority = (attribute.ArgumentList.Arguments[3].Expression as LiteralExpressionSyntax)?.Token.Value as int? ?? -1; - - if (affix != null) - { - affixes = [..affixes, new NameAffix(type == "Prefix", affix, order, discriminatorPriority, declarationOrder)]; - declarationOrder++; - } + affixes = + [ + .. affixes, + new NameAffix(type == "Prefix", category, affix, declarationOrder), + ]; + declarationOrder++; } } } @@ -1080,7 +995,10 @@ private bool TryGetAffixData(SyntaxList attributeLists, out return affixes.Length != 0; } - private void ReportTypeAffixData(string typeIdentifier, SyntaxList attributeLists) + private void ReportTypeAffixData( + string typeIdentifier, + SyntaxList attributeLists + ) { if (!TryGetAffixData(attributeLists, out var affixes)) { @@ -1094,11 +1012,15 @@ private void ReportTypeAffixData(string typeIdentifier, SyntaxList attributeLists) + private void ReportMemberAffixData( + string typeIdentifier, + string memberIdentifier, + SyntaxList attributeLists + ) { if (!TryGetAffixData(attributeLists, out var affixData)) { @@ -1144,7 +1066,11 @@ public override void VisitClassDeclaration(ClassDeclarationSyntax node) TrimmableTypes.Add(identifier, typeData); } - typeData.NonFunctions.AddRange(_typeInProgress.Value.NonFunctions.Where(nonFunction => !typeData.NonFunctions.Contains(nonFunction))); + typeData.NonFunctions.AddRange( + _typeInProgress.Value.NonFunctions.Where(nonFunction => + !typeData.NonFunctions.Contains(nonFunction) + ) + ); typeData.Functions.AddRange(_typeInProgress.Value.Functions); _typeInProgress = null; @@ -1176,7 +1102,11 @@ public override void VisitStructDeclaration(StructDeclarationSyntax node) TrimmableTypes.Add(identifier, typeData); } - typeData.NonFunctions.AddRange(_typeInProgress.Value.NonFunctions.Where(nonFunction => !typeData.NonFunctions.Contains(nonFunction))); + typeData.NonFunctions.AddRange( + _typeInProgress.Value.NonFunctions.Where(nonFunction => + !typeData.NonFunctions.Contains(nonFunction) + ) + ); typeData.Functions.AddRange(_typeInProgress.Value.Functions); _typeInProgress = null; @@ -1252,7 +1182,9 @@ public override void VisitFieldDeclaration(FieldDeclarationSyntax node) { // If it's not a constant then we only prettify // C constants are globally scoped and typically prefixed, so we trim in addition to prettifying - var prettifyOnly = !node.Modifiers.Any(SyntaxKind.ConstKeyword) && !node.Modifiers.Any(SyntaxKind.StaticKeyword); + var prettifyOnly = + !node.Modifiers.Any(SyntaxKind.ConstKeyword) + && !node.Modifiers.Any(SyntaxKind.StaticKeyword); if (node.Parent == _typeInProgress?.Type) { @@ -1318,7 +1250,11 @@ public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node) ReportMemberAffixData(typeIdentifier, memberIdentifier, node.AttributeLists); // If it's not a constant then we only prettify. - var hasSetter = node.AccessorList?.Accessors.Any(a => a.IsKind(SyntaxKind.SetAccessorDeclaration) || a.IsKind(SyntaxKind.InitAccessorDeclaration)) ?? false; + var hasSetter = + node.AccessorList?.Accessors.Any(a => + a.IsKind(SyntaxKind.SetAccessorDeclaration) + || a.IsKind(SyntaxKind.InitAccessorDeclaration) + ) ?? false; if (hasSetter) { if (!PrettifyOnlyTypes.TryGetValue(typeIdentifier, out var typeData)) @@ -1340,11 +1276,272 @@ public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node) private class RenameSafeAttributeListsRewriter : CSharpSyntaxRewriter { public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node) => - ((MethodDeclarationSyntax)base.VisitMethodDeclaration(node)!) - .WithRenameSafeAttributeLists(); + ( + (MethodDeclarationSyntax)base.VisitMethodDeclaration(node)! + ).WithRenameSafeAttributeLists(); + } + + /// The affix data retrieved by the . + /// The configuration from . + private class NameAffixer( + Dictionary affixTypes, + Dictionary config + ) + { + private static readonly NameAffixConfiguration _defaultConfig = new(); + + /// + /// Removes affixes from the specified primary name and adds the original specified primary to the secondary list if provided. + /// + /// + /// Designed to be used by either or . + /// + /// The current primary name. + /// The container name. Either null or the containing type. + /// The original name of the identifier. Either the type name or the member name. + /// The list of secondary names. This should be null if used by . + /// The new primary name. + public string RemoveAffixes( + string primary, + string? container, + string originalName, + List? secondary + ) + { + var affixes = GetAffixes(container, originalName); + if (affixes.Length == 0) + { + return primary; + } + + var originalPrimary = primary; + + // Sort affixes so that the outer affixes are first + affixes.Sort( + static (a, b) => + { + // Sort by descending declaration order + // Lower declaration order means the affix is closer to the inside of the name + return -a.DeclarationOrder.CompareTo(b.DeclarationOrder); + } + ); + + var prefixes = affixes.Where(x => x.IsPrefix).ToList(); + var suffixes = affixes.Where(x => !x.IsPrefix).ToList(); + + RemoveSide(true, prefixes); + RemoveSide(false, suffixes); + + if (originalPrimary != primary) + { + secondary?.Add(originalPrimary); + } + + return primary; + + void RemoveSide(bool isPrefix, List nameAffixes) + { + while (nameAffixes.Count > 0) + { + var removedAffix = false; + for (var i = 0; i < nameAffixes.Count; i++) + { + var affix = nameAffixes[i]; + if ( + isPrefix + ? primary.StartsWith(affix.Affix) + : primary.EndsWith(affix.Affix) + ) + { + primary = isPrefix + ? primary[affix.Affix.Length..] + : primary[..^affix.Affix.Length]; + + nameAffixes.RemoveAt(i); + removedAffix = true; + break; + } + } + + if (!removedAffix) + { + break; + } + } + } + } + + /// + /// Applies affixes to the specified primary name and adds fallbacks to the secondary list if provided. + /// + /// + /// Designed to be used by either or . + /// + /// The current primary name. + /// The container name. Either null or the containing type. + /// The original name of the identifier. Either the type name or the member name. + /// The list of secondary names. This should be null if used by . + /// The new primary name. + public string ApplyAffixes( + string primary, + string? container, + string originalName, + List? secondary + ) + { + var affixes = GetAffixes(container, originalName); + if (affixes.Length == 0) + { + return primary; + } + + // Sort affixes by priority + // Negative priority is first, followed by highest non-negative priority + // This groups the non-discriminator affixes at the start and each group of discriminator affixes together + // For example: If we have [..A, ..B, ..C] where A are non-discriminator affixes; B and C are grouped discriminator affixes + // Processing [..A] will give us our primary name + // Processing [..A, ..B] will give us the first secondary name + // Processing [..A, ..B, ..C] will give us the second secondary name + affixes.Sort( + (a, b) => + { + // Sort so that non-discriminator affixes are first + if (GetConfiguration(a).IsDiscriminator != GetConfiguration(b).IsDiscriminator) + { + return GetConfiguration(a) + .IsDiscriminator.CompareTo(GetConfiguration(b).IsDiscriminator); + } + + // Then sort the remaining by descending priority + return -GetConfiguration(a) + .DiscriminatorPriority.CompareTo(GetConfiguration(b).DiscriminatorPriority); + } + ); + + // This is guaranteed to be non-null when this method returns if there is at least one affix + string? newPrimary = null; + + // Process each group of affixes + var hasProcessedNonDiscriminator = false; + var currentPriority = int.MaxValue; + for (var affixI = 0; affixI < affixes.Length; affixI++) + { + var affix = affixes[affixI]; + if (!GetConfiguration(affix).IsDiscriminator) + { + continue; + } + + // Process group if we reached the end of the non-discriminator affixes or if the priority changes + if ( + !hasProcessedNonDiscriminator + || GetConfiguration(affix).DiscriminatorPriority < currentPriority + ) + { + hasProcessedNonDiscriminator = true; + currentPriority = GetConfiguration(affix).DiscriminatorPriority; + CreateName(primary, affixes.AsSpan()[..affixI]); + if (secondary == null) + { + return newPrimary!; + } + } + } + + // Process final group since the loop above skips the final group + CreateName(primary, affixes); + + return newPrimary!; + + void CreateName(string name, Span currentAffixes) + { + // Sort affixes so that the inner affixes are first + currentAffixes.Sort( + (a, b) => + { + // Sort by descending order + // Higher order means the affix is closer to the inside of the name + if (GetConfiguration(a).Order != GetConfiguration(b).Order) + { + return -GetConfiguration(a).Order.CompareTo(GetConfiguration(b).Order); + } + + // Then by ascending declaration order + // Lower declaration order means the affix is closer to the inside of the name + return a.DeclarationOrder.CompareTo(b.DeclarationOrder); + } + ); + + foreach (var affix in currentAffixes) + { + if (!GetConfiguration(affix).Remove) + { + if (affix.IsPrefix) + { + name = affix.Affix + name; + } + else + { + name += affix.Affix; + } + } + } + + if (newPrimary == null) + { + newPrimary = name; + } + else + { + secondary?.Add(name); + } + } + } + + /// + /// Gets affix data for the specified container and original name of the identifier. + /// + /// The container name. Either null or the containing type. + /// The original name of the identifier. Either the type name or the member name. + /// The name affixes for the specified identifier. + private NameAffix[] GetAffixes(string? container, string originalName) + { + TypeAffixData typeAffixData; + if (container == null) + { + if (!affixTypes.TryGetValue(originalName, out typeAffixData)) + { + return []; + } + + return typeAffixData.TypeAffixes; + } + + if (affixTypes.TryGetValue(container, out typeAffixData)) + { + if ( + typeAffixData.MemberAffixes?.TryGetValue(originalName, out var affixes) ?? false + ) + { + return affixes; + } + } + + return []; + } + + private NameAffixConfiguration GetConfiguration(NameAffix affix) => + GetConfiguration(affix.Category); + + private NameAffixConfiguration GetConfiguration(string category) => + config.GetValueOrDefault(category, _defaultConfig); } - private class NameAffixerEarlyTrimmer(Dictionary affixTypes) : INameTrimmer + /// + /// Removes identified affixes so that other trimmers can process the base name separately. + /// These affixes should be reapplied by . + /// + private class NameAffixerEarlyTrimmer(NameAffixer affixer) : INameTrimmer { /// public Version Version => new(0, 0, 0); @@ -1359,7 +1556,7 @@ public void Trim(NameTrimmerContext context) foreach (var (original, (primary, secondary)) in context.Names) { var secondaries = secondary; - var newPrimary = RemoveAffixes(primary, null, original, affixTypes, secondaries); + var newPrimary = affixer.RemoveAffixes(primary, null, original, secondaries); context.Names[original] = new CandidateNames(newPrimary, secondaries); } @@ -1369,13 +1566,21 @@ public void Trim(NameTrimmerContext context) foreach (var (original, (primary, secondary)) in context.Names) { var secondaries = secondary; - var newPrimary = RemoveAffixes(primary, context.Container, original, affixTypes, secondaries); + var newPrimary = affixer.RemoveAffixes( + primary, + context.Container, + original, + secondaries + ); context.Names[original] = new CandidateNames(newPrimary, secondaries); } } } - private class NameAffixerLateTrimmer(Dictionary affixTypes) : INameTrimmer + /// + /// Reapplies and transforms identified affixes based on . + /// + private class NameAffixerLateTrimmer(NameAffixer affixer) : INameTrimmer { /// public Version Version => new(0, 0, 0); @@ -1390,7 +1595,7 @@ public void Trim(NameTrimmerContext context) foreach (var (original, (primary, secondary)) in context.Names) { var secondaries = secondary; - var newPrimary = ApplyAffixes(primary, null, original, affixTypes, secondaries); + var newPrimary = affixer.ApplyAffixes(primary, null, original, secondaries); context.Names[original] = new CandidateNames(newPrimary, secondaries); } @@ -1400,7 +1605,12 @@ public void Trim(NameTrimmerContext context) foreach (var (original, (primary, secondary)) in context.Names) { var secondaries = secondary; - var newPrimary = ApplyAffixes(primary, context.Container, original, affixTypes, secondaries); + var newPrimary = affixer.ApplyAffixes( + primary, + context.Container, + original, + secondaries + ); context.Names[original] = new CandidateNames(newPrimary, secondaries); } } @@ -1426,7 +1636,10 @@ public void Trim(NameTrimmerContext context) secondary[i] = secondary[i].Prettify(nameTransformer, allowAllCaps); } - context.Names[original] = new CandidateNames(primary.Prettify(nameTransformer, allowAllCaps), secondary); + context.Names[original] = new CandidateNames( + primary.Prettify(nameTransformer, allowAllCaps), + secondary + ); } } } diff --git a/sources/SilkTouch/SilkTouch/Mods/StripAttributes.cs b/sources/SilkTouch/SilkTouch/Mods/StripAttributes.cs index 09e2e10091..9bf511bf3b 100644 --- a/sources/SilkTouch/SilkTouch/Mods/StripAttributes.cs +++ b/sources/SilkTouch/SilkTouch/Mods/StripAttributes.cs @@ -45,10 +45,11 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) var rewriter = new Rewriter(config); foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); proj = doc.WithSyntaxRoot( rewriter.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace() - ?? throw new InvalidOperationException("Visit returned null.") + ?? throw new InvalidOperationException("Visit returned null.") ).Project; } @@ -57,13 +58,20 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) private class Rewriter(Configuration config) : ModCSharpSyntaxRewriter { - private SyntaxList StripAttributes(SyntaxList attributeLists) + private SyntaxList StripAttributes( + SyntaxList attributeLists + ) { var results = attributeLists .Select(list => { var attributes = list.Attributes; - attributes = [..attributes.Where(attribute => !config.Remove.Contains(attribute.Name.ToString()))]; + attributes = + [ + .. attributes.Where(attribute => + !config.Remove.Contains(attribute.Name.ToString()) + ), + ]; return attributes.Count == 0 ? null : list.WithAttributes(attributes); }) diff --git a/sources/SilkTouch/SilkTouch/Mods/TransformEnums.cs b/sources/SilkTouch/SilkTouch/Mods/TransformEnums.cs index 81c6c91f37..e3fa94640f 100644 --- a/sources/SilkTouch/SilkTouch/Mods/TransformEnums.cs +++ b/sources/SilkTouch/SilkTouch/Mods/TransformEnums.cs @@ -65,7 +65,8 @@ public record Configuration /// The strategy to use when coercing backing types. /// Defaults to not modify the backing types at all. /// - public EnumBackingTypePreference CoerceBackingTypes { get; init; } = EnumBackingTypePreference.None; + public EnumBackingTypePreference CoerceBackingTypes { get; init; } = + EnumBackingTypePreference.None; /// /// Whether to rewrite enum member values or not. @@ -116,7 +117,10 @@ public EnumMemberFilter(EnumMemberFilterConfiguration configuration) { if (configuration.MemberValue.StartsWith("0x")) { - MemberValue = long.Parse(configuration.MemberValue["0x".Length..], NumberStyles.AllowHexSpecifier); + MemberValue = long.Parse( + configuration.MemberValue["0x".Length..], + NumberStyles.AllowHexSpecifier + ); } else { @@ -163,7 +167,9 @@ public bool IsMemberMatch(ISymbol? enumMember) public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) { var config = cfg.Get(ctx.JobKey); - var removeMemberFilters = config.RemoveMembers.Select(c => new EnumMemberFilter(c)).ToList(); + var removeMemberFilters = config + .RemoveMembers.Select(c => new EnumMemberFilter(c)) + .ToList(); var proj = ctx.SourceProject; if (proj == null) @@ -181,17 +187,23 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default) var rewriter = new Rewriter(config, removeMemberFilters, compilation, memberRewriteDecider); foreach (var docId in proj.DocumentIds) { - var doc = proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); + var doc = + proj.GetDocument(docId) ?? throw new InvalidOperationException("Document missing"); proj = doc.WithSyntaxRoot( rewriter.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace() - ?? throw new InvalidOperationException("Visit returned null.") + ?? throw new InvalidOperationException("Visit returned null.") ).Project; } ctx.SourceProject = proj; } - private class Rewriter(Configuration config, List removeMemberFilters, Compilation compilation, MemberRewriteDecider memberRewriteDecider) : CSharpSyntaxRewriter + private class Rewriter( + Configuration config, + List removeMemberFilters, + Compilation compilation, + MemberRewriteDecider memberRewriteDecider + ) : CSharpSyntaxRewriter { public override SyntaxNode? VisitEnumDeclaration(EnumDeclarationSyntax node) { @@ -223,31 +235,34 @@ private class Rewriter(Configuration config, List removeMember if (isFlagsEnum && config.AddNoneMemberToFlags) { // Add None member if it doesn't exist yet - var hasNoneMember = symbol.Members().Any(member => - { - if (member is not IFieldSymbol fieldSymbol) + var hasNoneMember = symbol + .Members() + .Any(member => { - return false; - } + if (member is not IFieldSymbol fieldSymbol) + { + return false; + } - if (member.Name == "None") - { - return true; - } + if (member.Name == "None") + { + return true; + } - if (fieldSymbol.ConstantValue == null) - { - // We don't know the constant value for sure - // Return false as a default - return false; - } + if (fieldSymbol.ConstantValue == null) + { + // We don't know the constant value for sure + // Return false as a default + return false; + } - return Convert.ToInt64(fieldSymbol.ConstantValue) == 0; - }); + return Convert.ToInt64(fieldSymbol.ConstantValue) == 0; + }); if (!hasNoneMember) { - var noneMember = EnumMemberDeclaration("None").WithEqualsValue(CreateEqualsValueClause(0, isFlagsEnum)); + var noneMember = EnumMemberDeclaration("None") + .WithEqualsValue(CreateEqualsValueClause(0, isFlagsEnum)); members.Insert(0, noneMember); } } @@ -263,14 +278,26 @@ private class Rewriter(Configuration config, List removeMember { var type = semanticModel.GetTypeInfo(t.Type).Type; - if (SymbolEqualityComparer.Default.Equals(type, compilation.GetSpecialType(SpecialType.System_UInt32))) + if ( + SymbolEqualityComparer.Default.Equals( + type, + compilation.GetSpecialType(SpecialType.System_UInt32) + ) + ) { return null; } - if (SymbolEqualityComparer.Default.Equals(type, compilation.GetSpecialType(SpecialType.System_UInt64))) + if ( + SymbolEqualityComparer.Default.Equals( + type, + compilation.GetSpecialType(SpecialType.System_UInt64) + ) + ) { - return SimpleBaseType(PredefinedType(Token(SyntaxKind.LongKeyword))); + return SimpleBaseType( + PredefinedType(Token(SyntaxKind.LongKeyword)) + ); } return t; @@ -285,7 +312,7 @@ private class Rewriter(Configuration config, List removeMember } else { - node = node.WithBaseList(BaseList([..baseTypes])); + node = node.WithBaseList(BaseList([.. baseTypes])); } break; @@ -293,7 +320,8 @@ private class Rewriter(Configuration config, List removeMember case EnumBackingTypePreference.PreferUnsigned: { - var hasNegativeValues = members.Any(m => { + var hasNegativeValues = members.Any(m => + { if (m.Parent == null) { return false; @@ -321,14 +349,28 @@ private class Rewriter(Configuration config, List removeMember { var type = semanticModel.GetTypeInfo(t.Type).Type; - if (SymbolEqualityComparer.Default.Equals(type, compilation.GetSpecialType(SpecialType.System_Int32))) + if ( + SymbolEqualityComparer.Default.Equals( + type, + compilation.GetSpecialType(SpecialType.System_Int32) + ) + ) { - return SimpleBaseType(PredefinedType(Token(SyntaxKind.UIntKeyword))); + return SimpleBaseType( + PredefinedType(Token(SyntaxKind.UIntKeyword)) + ); } - if (SymbolEqualityComparer.Default.Equals(type, compilation.GetSpecialType(SpecialType.System_Int64))) + if ( + SymbolEqualityComparer.Default.Equals( + type, + compilation.GetSpecialType(SpecialType.System_Int64) + ) + ) { - return SimpleBaseType(PredefinedType(Token(SyntaxKind.ULongKeyword))); + return SimpleBaseType( + PredefinedType(Token(SyntaxKind.ULongKeyword)) + ); } return t; @@ -339,11 +381,15 @@ private class Rewriter(Configuration config, List removeMember if (baseTypes.Count == 0) { - node = node.WithBaseList(BaseList([SimpleBaseType(PredefinedType(Token(SyntaxKind.UIntKeyword)))])); + node = node.WithBaseList( + BaseList( + [SimpleBaseType(PredefinedType(Token(SyntaxKind.UIntKeyword)))] + ) + ); } else { - node = node.WithBaseList(BaseList([..baseTypes])); + node = node.WithBaseList(BaseList([.. baseTypes])); } break; @@ -386,7 +432,7 @@ private class Rewriter(Configuration config, List removeMember .ToList(); } - node = node.WithMembers([..members]); + node = node.WithMembers([.. members]); return base.VisitEnumDeclaration(node); } @@ -395,8 +441,11 @@ private EqualsValueClauseSyntax CreateEqualsValueClause(long value, bool useHex) { var stringValue = useHex ? $"0x{value:X}" : $"{value}"; return EqualsValueClause( - LiteralExpression(SyntaxKind.NumericLiteralExpression, - Literal([], stringValue, value, []))); + LiteralExpression( + SyntaxKind.NumericLiteralExpression, + Literal([], stringValue, value, []) + ) + ); } } diff --git a/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs b/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs index afe9d46e77..dd21eb2e6e 100644 --- a/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs +++ b/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs @@ -31,7 +31,10 @@ namespace Silk.NET.SilkTouch.Mods; /// Program, Program must be declared in Silk.NET.OpenGL, Silk.NET, or Silk. /// [ModConfiguration] -public class TransformHandles(IOptionsSnapshot config, ILogger logger) : Mod +public class TransformHandles( + IOptionsSnapshot config, + ILogger logger +) : Mod { /// /// The configuration for the mod. @@ -48,11 +51,6 @@ public class Config /// Whether the DSL (i.e. nullptr) should be usable with handle types. /// public bool UseDSL { get; init; } - - /// - /// The order with which the -Handle suffix is applied. - /// - public int HandleSuffixOrder { get; init; } = 0; } /// @@ -87,10 +85,13 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = foreach (var (fullyQualifiedName, node) in syntaxNodes) { var relativePath = $"Handles/{PathForFullyQualified(fullyQualifiedName)}"; - project = project.AddDocument( - Path.GetFileName(relativePath), - node.NormalizeWhitespace(), - filePath: project.FullPath(relativePath)).Project; + project = project + .AddDocument( + Path.GetFileName(relativePath), + node.NormalizeWhitespace(), + filePath: project.FullPath(relativePath) + ) + .Project; } // Update compilation @@ -114,7 +115,9 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = { // The struct is defined in multiple places (eg: partial keyword) // This means we don't know which of the parts to rewrite - throw new InvalidOperationException("Struct has more than 1 declaring syntax reference"); + throw new InvalidOperationException( + "Struct has more than 1 declaring syntax reference" + ); } var declaringSyntaxReference = handleTypeSymbol.DeclaringSyntaxReferences.Single(); @@ -128,16 +131,22 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct = // Do the two following transformation to all references of the handle types: // 2. Reduce pointer dimensions ctx.SourceProject = project; - await LocationTransformationUtils.ModifyAllReferencesAsync(ctx, handleTypes, [ - new PointerDimensionReductionTransformer(), - ], logger, ct); + await LocationTransformationUtils.ModifyAllReferencesAsync( + ctx, + handleTypes, + [new PointerDimensionReductionTransformer()], + logger, + ct + ); project = ctx.SourceProject; // Use document IDs from earlier - var handleTypeRewriter = new HandleTypeRewriter(cfg.UseDSL, cfg.HandleSuffixOrder); + var handleTypeRewriter = new HandleTypeRewriter(cfg.UseDSL); foreach (var (originalName, documentId) in handleTypeDocumentIds) { - var document = project.GetDocument(documentId) ?? throw new InvalidOperationException("Failed to find document"); + var document = + project.GetDocument(documentId) + ?? throw new InvalidOperationException("Failed to find document"); var syntaxTree = await document.GetSyntaxTreeAsync(ct); if (syntaxTree == null) @@ -148,7 +157,9 @@ await LocationTransformationUtils.ModifyAllReferencesAsync(ctx, handleTypes, [ var syntaxRoot = await syntaxTree.GetRootAsync(ct); // Rewrite handle struct to include handle members - document = document.WithSyntaxRoot(handleTypeRewriter.Visit(syntaxRoot).NormalizeWhitespace()); + document = document.WithSyntaxRoot( + handleTypeRewriter.Visit(syntaxRoot).NormalizeWhitespace() + ); project = document.Project; } @@ -158,10 +169,16 @@ await LocationTransformationUtils.ModifyAllReferencesAsync(ctx, handleTypes, [ return; } - private class MissingHandleTypeDiscoverer(ILogger logger, Compilation compilation, CancellationToken ct) : SymbolVisitor + private class MissingHandleTypeDiscoverer( + ILogger logger, + Compilation compilation, + CancellationToken ct + ) : SymbolVisitor { - private readonly HashSet _nonHandleTypes = new(SymbolEqualityComparer.Default); - private readonly Dictionary _missingTypes = new(SymbolEqualityComparer.Default); + private readonly HashSet _nonHandleTypes = + new(SymbolEqualityComparer.Default); + private readonly Dictionary _missingTypes = + new(SymbolEqualityComparer.Default); private string? _currentNamespace = null; private int _pointerTypeDepth = 0; @@ -174,7 +191,8 @@ public Dictionary GetMissingHandleTypes() // We need to find and generate all missing handle types // Handle types are types that are only referenced through a pointer // We do this by parsing through the list of type errors - var typeErrors = compilation.GetDiagnostics(ct) + var typeErrors = compilation + .GetDiagnostics(ct) .Where(d => d.Id == "CS0246") // Type errors .ToList(); @@ -220,7 +238,10 @@ public Dictionary GetMissingHandleTypes() } case MemberDeclarationSyntax memberDeclarationSyntax: { - var symbol = semanticModel.GetDeclaredSymbol(memberDeclarationSyntax, ct); + var symbol = semanticModel.GetDeclaredSymbol( + memberDeclarationSyntax, + ct + ); if (symbol != null) { symbolsFound.Add(symbol); @@ -244,7 +265,9 @@ public Dictionary GetMissingHandleTypes() if (!isSuccess) { // This is to warn of unhandled cases - logger.LogWarning("Failed to find corresponding symbol for type error. There may be an unhandled case in the code"); + logger.LogWarning( + "Failed to find corresponding symbol for type error. There may be an unhandled case in the code" + ); } } @@ -254,7 +277,10 @@ public Dictionary GetMissingHandleTypes() Visit(symbol); } - return new Dictionary(_missingTypes.Where(kvp => !_nonHandleTypes.Contains(kvp.Key)), SymbolEqualityComparer.Default); + return new Dictionary( + _missingTypes.Where(kvp => !_nonHandleTypes.Contains(kvp.Key)), + SymbolEqualityComparer.Default + ); } public override void VisitMethod(IMethodSymbol symbol) @@ -322,7 +348,9 @@ public override void VisitNamedType(INamedTypeSymbol symbol) { if (_currentNamespace == null) { - throw new InvalidOperationException($"{nameof(_currentNamespace)} should not be null"); + throw new InvalidOperationException( + $"{nameof(_currentNamespace)} should not be null" + ); } if (_pointerTypeDepth == 0) @@ -332,7 +360,9 @@ public override void VisitNamedType(INamedTypeSymbol symbol) if (_missingTypes.TryGetValue(errorTypeSymbol, out var sharedNamespace)) { - _missingTypes[errorTypeSymbol] = NameUtils.FindCommonPrefix([sharedNamespace, _currentNamespace], true, false, true).Trim('.'); + _missingTypes[errorTypeSymbol] = NameUtils + .FindCommonPrefix([sharedNamespace, _currentNamespace], true, false, true) + .Trim('.'); } else { @@ -350,10 +380,13 @@ private class EmptyStructGenerator /// Map from error type symbol to the namespace the type should be created in. /// Map from the fully qualified name of the generated type to the syntax node containing code for that type. public Dictionary GenerateSyntaxNodes( - Dictionary typesToGenerate) => - GenerateSyntaxNodes(typesToGenerate - .Select(kvp => new KeyValuePair(kvp.Key.Name, kvp.Value)) - .ToDictionary()); + Dictionary typesToGenerate + ) => + GenerateSyntaxNodes( + typesToGenerate + .Select(kvp => new KeyValuePair(kvp.Key.Name, kvp.Value)) + .ToDictionary() + ); /// /// Generates a syntax node for each specified type. @@ -361,7 +394,8 @@ public Dictionary GenerateSyntaxNodes( /// Map from type name to the namespace the type should be created in. /// Map from the fully qualified name of the generated type to the syntax node containing code for that type. public Dictionary GenerateSyntaxNodes( - Dictionary missingHandleTypes) + Dictionary missingHandleTypes + ) { var results = new Dictionary(); foreach (var (name, ns) in missingHandleTypes) @@ -384,7 +418,11 @@ public Dictionary GenerateSyntaxNodes( : FileScopedNamespaceDeclaration( ModUtils.NamespaceIntoIdentifierName(ns) ) - .WithMembers(SingletonList(structDeclarationSyntax)) + .WithMembers( + SingletonList( + structDeclarationSyntax + ) + ) ) ); } @@ -393,7 +431,11 @@ public Dictionary GenerateSyntaxNodes( } } - private class HandleTypeDiscoverer(Project project, Compilation compilation, CancellationToken ct) : SymbolVisitor + private class HandleTypeDiscoverer( + Project project, + Compilation compilation, + CancellationToken ct + ) : SymbolVisitor { private readonly Solution _solution = project.Solution; @@ -417,7 +459,12 @@ public async Task> GetHandleTypesAsync() // For each struct, find its references // Verify that all references are through pointers // Also verify that there is at least one reference through a pointer - var references = await SymbolFinder.FindReferencesAsync(structSymbol, _solution, documents, ct); + var references = await SymbolFinder.FindReferencesAsync( + structSymbol, + _solution, + documents, + ct + ); var wasReferencedAsPointer = false; var wasReferencedAsNonPointer = false; @@ -473,7 +520,11 @@ public override void VisitNamedType(INamedTypeSymbol symbol) // Find empty structs // IsImplicitlyDeclared lets us ignore implicitly declared constructors // SpecialType lets us ignore Void and System.RuntimeArgumentHandle - if (symbol.TypeKind != TypeKind.Struct || symbol.Members().Any(member => !member.IsImplicitlyDeclared) || symbol.SpecialType != SpecialType.None) + if ( + symbol.TypeKind != TypeKind.Struct + || symbol.Members().Any(member => !member.IsImplicitlyDeclared) + || symbol.SpecialType != SpecialType.None + ) { return; } @@ -482,20 +533,21 @@ public override void VisitNamedType(INamedTypeSymbol symbol) } } - private class HandleTypeRewriter(bool useDSL, int handleSuffixPriority) : CSharpSyntaxRewriter + private class HandleTypeRewriter(bool useDSL) : CSharpSyntaxRewriter { public override SyntaxNode VisitStructDeclaration(StructDeclarationSyntax node) { var structName = node.Identifier.Text; - return node - .WithIdentifier(Identifier(structName)) + return node.WithIdentifier(Identifier(structName)) .WithAttributeLists( new SyntaxList() .WithNativeName(structName) - .AddNameSuffix("Handle", handleSuffixPriority)) + .AddNameSuffix("HandleType", "Handle") + ) .WithMembers( List( - GetDefaultHandleMembers(structName).Concat(useDSL ? GetDSLHandleMembers(structName) : []) + GetDefaultHandleMembers(structName) + .Concat(useDSL ? GetDSLHandleMembers(structName) : []) ) ) .WithModifiers( @@ -508,7 +560,9 @@ public override SyntaxNode VisitStructDeclaration(StructDeclarationSyntax node) ); } - private static IEnumerable GetDefaultHandleMembers(string structName) + private static IEnumerable GetDefaultHandleMembers( + string structName + ) { var backingType = PointerType(PredefinedType(Token(SyntaxKind.VoidKeyword))); @@ -523,11 +577,13 @@ private static IEnumerable GetDefaultHandleMembers(stri ); yield return ConstructorDeclaration(Identifier(structName)) - .WithModifiers( - TokenList(Token(SyntaxKind.PublicKeyword)) - ) - .WithParameterList(ParameterList( - SingletonSeparatedList(Parameter(Identifier("handle")).WithType(backingType))) + .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword))) + .WithParameterList( + ParameterList( + SingletonSeparatedList( + Parameter(Identifier("handle")).WithType(backingType) + ) + ) ) .WithBody( Block( @@ -653,7 +709,7 @@ private static IEnumerable GetDefaultHandleMembers(stri { Parameter(Identifier("left")).WithType(IdentifierName(structName)), Token(SyntaxKind.CommaToken), - Parameter(Identifier("right")).WithType(IdentifierName(structName)) + Parameter(Identifier("right")).WithType(IdentifierName(structName)), } ) ) @@ -688,7 +744,7 @@ private static IEnumerable GetDefaultHandleMembers(stri SeparatedList( [ Parameter(Identifier("left")).WithType(IdentifierName(structName)), - Parameter(Identifier("right")).WithType(IdentifierName(structName)) + Parameter(Identifier("right")).WithType(IdentifierName(structName)), ] ) ) @@ -753,7 +809,7 @@ private static IEnumerable GetDSLHandleMembers(string s { Parameter(Identifier("left")).WithType(IdentifierName(structName)), Token(SyntaxKind.CommaToken), - Parameter(Identifier("right")).WithType(IdentifierName("NullPtr")) + Parameter(Identifier("right")).WithType(IdentifierName("NullPtr")), } ) ) @@ -788,7 +844,7 @@ private static IEnumerable GetDSLHandleMembers(string s SeparatedList( [ Parameter(Identifier("left")).WithType(IdentifierName(structName)), - Parameter(Identifier("right")).WithType(IdentifierName("NullPtr")) + Parameter(Identifier("right")).WithType(IdentifierName("NullPtr")), ] ) ) diff --git a/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs index 7454f23398..290e0c5cfb 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs @@ -87,8 +87,8 @@ decl.ReturnType is not PredefinedTypeSyntax pt x.CountParamIdx, // 2. Select only the last parameter this count parameter is associated with ParamForCount: x.ParamsForCount.Select( - (y, j) => (PtrParamInfo: y, ParamForCountIdx: j) - ) + (y, j) => (PtrParamInfo: y, ParamForCountIdx: j) + ) .LastOrDefault() ) ) @@ -232,7 +232,14 @@ bool isHr ) : CSharpSyntaxRewriter { public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node) => - node.WithIdentifier(Identifier(node.Identifier.ToString().Singularize(false))) + node.WithIdentifier( + // TODO: Temporarily hack to fix issue where OpenGL -OES vendor suffix gets replaced with -O + Identifier( + node.Identifier.Text.EndsWith("OES") + ? node.Identifier.Text + : node.Identifier.Text.Singularize(false) + ) + ) .WithReturnType( isOutput ? ptrElementType : PredefinedType(Token(SyntaxKind.VoidKeyword)) ) @@ -253,7 +260,6 @@ is BlockSyntax blk // call. ? Block( (StatementSyntax[]) - [ LocalDeclarationStatement( VariableDeclaration( @@ -271,7 +277,7 @@ is BlockSyntax blk ) ), .. blk.Statements, - ReturnStatement(IdentifierName(ptrParam)) + ReturnStatement(IdentifierName(ptrParam)), ] ) : blk @@ -309,15 +315,15 @@ public override SyntaxNode VisitReturnStatement(ReturnStatementSyntax node) => ? syn.WithParameters( SeparatedList( syn.Parameters.Select(x => - x.Identifier.ToString() == countParam - || (isOutput && x.Identifier.ToString() == ptrParam) - ? null + x.Identifier.ToString() == countParam + || (isOutput && x.Identifier.ToString() == ptrParam) + ? null : base.VisitParameter(x) is ParameterSyntax p ? p.Identifier.ToString() == ptrParam - ? p.WithType(ptrElementType) + ? p.WithType(ptrElementType) : p - : null - ) + : null + ) .OfType() ) ) diff --git a/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs index 64baa1ce54..3ca2698ef7 100644 --- a/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs +++ b/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs @@ -180,6 +180,11 @@ meth.Body.Statements[0] as ExpressionStatementSyntax var newFun = function .WithRenameSafeAttributeLists() .WithIdentifier(Identifier(newIden)); + + newFun = newFun.WithAttributeLists( + newFun.AttributeLists.AddNameSuffix("RawFunction", "Raw") + ); + discrim = ModUtils.DiscrimStr( function.Modifiers, function.TypeParameterList, @@ -251,7 +256,9 @@ Action transform x.Attributes.Where(y => !y.IsAttribute("System.Runtime.InteropServices.DllImport") && !y.IsAttribute("Silk.NET.Core.NativeFunction") - && !y.IsAttribute("System.Runtime.CompilerServices.MethodImpl") + && !y.IsAttribute( + "System.Runtime.CompilerServices.MethodImpl" + ) ) ) ) diff --git a/sources/SilkTouch/SilkTouch/Naming/CandidateNamesWithOriginal.cs b/sources/SilkTouch/SilkTouch/Naming/CandidateNamesWithOriginal.cs index 98dcbfa1e4..2f2512704c 100644 --- a/sources/SilkTouch/SilkTouch/Naming/CandidateNamesWithOriginal.cs +++ b/sources/SilkTouch/SilkTouch/Naming/CandidateNamesWithOriginal.cs @@ -10,7 +10,11 @@ namespace Silk.NET.SilkTouch.Naming; /// The preferred version of the trimmed name. /// The fallback versions of the trimmed name in case the primary does not work. /// The original, unmodified name. -public record struct CandidateNamesWithOriginal(string Primary, List Secondary, string Original) +public record struct CandidateNamesWithOriginal( + string Primary, + List Secondary, + string Original +) { /// /// Formats this instance as a string. diff --git a/sources/SilkTouch/SilkTouch/Naming/NameTrimmer.cs b/sources/SilkTouch/SilkTouch/Naming/NameTrimmer.cs index c8a8ff7718..10579dbb15 100644 --- a/sources/SilkTouch/SilkTouch/Naming/NameTrimmer.cs +++ b/sources/SilkTouch/SilkTouch/Naming/NameTrimmer.cs @@ -168,7 +168,10 @@ hint is null // this was trimmingName originally. given that we're using trimming name to determine a prefix but then // using that prefix on the old primary, this could cause intended behaviour in some cases. there's probably // a better way to do this. (this is working around glDisablei -> glDisable -> Disablei). - context.Names![originalName] = new CandidateNames(oldPrimary[prefixLen..].Trim('_'), sec); + context.Names![originalName] = new CandidateNames( + oldPrimary[prefixLen..].Trim('_'), + sec + ); break; } } diff --git a/sources/SilkTouch/SilkTouch/Naming/NameUtils.cs b/sources/SilkTouch/SilkTouch/Naming/NameUtils.cs index a23297ce68..247b893ccc 100644 --- a/sources/SilkTouch/SilkTouch/Naming/NameUtils.cs +++ b/sources/SilkTouch/SilkTouch/Naming/NameUtils.cs @@ -46,7 +46,11 @@ public static partial class NameUtils /// /// Whether the output is allowed to be fully capitalised ("all caps"). /// The pretty string. - public static string Prettify(this string str, ICulturedStringTransformer nameTransformer, bool allowAllCaps = false) + public static string Prettify( + this string str, + ICulturedStringTransformer nameTransformer, + bool allowAllCaps = false + ) { if (str.Length == 0) { @@ -64,7 +68,9 @@ public static string Prettify(this string str, ICulturedStringTransformer nameTr if (ret.Length == 0) { - throw new InvalidOperationException($"Prettification for '{str}' led to an empty string"); + throw new InvalidOperationException( + $"Prettification for '{str}' led to an empty string" + ); } // Disallow all capitals @@ -328,8 +334,12 @@ public static async Task RenameAllAsync( ) { var newNames = toRename.ToList(); - await LocationTransformationUtils.ModifyAllReferencesAsync(ctx, newNames.Select(x => x.Symbol), [ - new IdentifierRenamingTransformer(newNames), - ], logger, ct); + await LocationTransformationUtils.ModifyAllReferencesAsync( + ctx, + newNames.Select(x => x.Symbol), + [new IdentifierRenamingTransformer(newNames)], + logger, + ct + ); } } diff --git a/sources/SilkTouch/SilkTouch/Program.cs b/sources/SilkTouch/SilkTouch/Program.cs index 5e14a1a6af..5e4c0bf429 100644 --- a/sources/SilkTouch/SilkTouch/Program.cs +++ b/sources/SilkTouch/SilkTouch/Program.cs @@ -20,11 +20,11 @@ "A list of job names to skip." ) { - Arity = ArgumentArity.ZeroOrMore + Arity = ArgumentArity.ZeroOrMore, }; var configs = new Argument("configs", "Path(s) to JSON SilkTouch configuration(s)") { - Arity = ArgumentArity.OneOrMore + Arity = ArgumentArity.OneOrMore, }; var configOverrides = new Argument( "overrides", @@ -32,7 +32,7 @@ "Arguments recognisable by Microsoft.Extensions.Configuration.CommandLine to override JSON configuration items." ) { - Arity = ArgumentArity.ZeroOrMore + Arity = ArgumentArity.ZeroOrMore, }; var jobs = new Option( new[] { "--max-jobs", "-j" }, diff --git a/sources/SilkTouch/SilkTouch/Sources/GitInputSource.cs b/sources/SilkTouch/SilkTouch/Sources/GitInputSource.cs index cee3c20f11..14b037b259 100644 --- a/sources/SilkTouch/SilkTouch/Sources/GitInputSource.cs +++ b/sources/SilkTouch/SilkTouch/Sources/GitInputSource.cs @@ -15,7 +15,7 @@ namespace Silk.NET.SilkTouch.Sources; /// /// The logger. /// The cache into which the repo is cloned. -public class GitInputSource(ILogger logger, ICacheProvider cache) : IInputSource +public class GitInputSource(ILogger logger, ICacheProvider? cache) : IInputSource { /// public async Task TryResolvePath(string path) @@ -24,13 +24,31 @@ public class GitInputSource(ILogger logger, ICacheProvider cache XxHash32.Hash(MemoryMarshal.Cast(path.AsSpan())) ); logger.LogDebug("Cache key for {} = {}", path, cacheKey); - var (dir, shouldClone) = ( - await cache.GetDirectory( + var cacheDir = await ( + cache?.GetDirectoryAsync( cacheKey, CacheIntent.ResolvedForeignInput, - CacheFlags.AllowNewLocked - ) - )!.Value; + CacheFlags.AllowNew | CacheFlags.RequireHostDirectory, + FileAccess.ReadWrite + ) ?? ValueTask.FromResult(null) + ); + + string dir; + var shouldClone = true; + if (cacheDir is { Path: { } fsPath }) + { + dir = fsPath; + shouldClone = !Directory.GetFiles(fsPath, "*", SearchOption.AllDirectories).Any(); + } + else + { + logger.LogWarning( + "Failed to open cache for \"{0}\" (cache key {1}), clone will not be cached.", + path, + cacheKey + ); + dir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + } path = path[4..].TrimStart('/'); var url = path; @@ -79,11 +97,7 @@ await cache.GetDirectory( ); } - await cache.CommitDirectory( - cacheKey, - CacheIntent.ResolvedForeignInput, - CacheFlags.NoHostDirectory - ); + await (cacheDir?.CommitAsync() ?? ValueTask.CompletedTask); } return Path.Combine(dir, pathInRepo); diff --git a/sources/SilkTouch/SilkTouch/Sources/IInputResolver.cs b/sources/SilkTouch/SilkTouch/Sources/IInputResolver.cs index d78b13ec67..f5575a8890 100644 --- a/sources/SilkTouch/SilkTouch/Sources/IInputResolver.cs +++ b/sources/SilkTouch/SilkTouch/Sources/IInputResolver.cs @@ -89,10 +89,13 @@ async Task ResolveInPlace(IList rsps) (await TryResolvePath(rsp.FileDirectory))?.Replace('\\', '/') ?? rsp.FileDirectory, ClangCommandLineArgs = rsp.ClangCommandLineArgs, - GeneratorConfiguration = rsp.GeneratorConfiguration.ToWrapper() with { + GeneratorConfiguration = rsp.GeneratorConfiguration.ToWrapper() with + { OutputLocation = await ResolvePath(rsp.GeneratorConfiguration.OutputLocation), TraversalNames = traversals, - TestOutputLocation = await ResolvePath(rsp.GeneratorConfiguration.TestOutputLocation), + TestOutputLocation = await ResolvePath( + rsp.GeneratorConfiguration.TestOutputLocation + ), }, }; } @@ -130,7 +133,7 @@ async Task ResolveInPlace(IList files) : await ResolvePath(config.InputSourceRoot), InputTestRoot = config.InputTestRoot is null ? null - : await ResolvePath(config.InputTestRoot) + : await ResolvePath(config.InputTestRoot), }; } @@ -145,6 +148,6 @@ config with SourceProject = config.SourceProject is null ? null : await ResolvePath(config.SourceProject), - TestProject = config.TestProject is null ? null : await ResolvePath(config.TestProject) + TestProject = config.TestProject is null ? null : await ResolvePath(config.TestProject), }; } diff --git a/sources/SilkTouch/SilkTouch/Sources/NuGetInputSource.cs b/sources/SilkTouch/SilkTouch/Sources/NuGetInputSource.cs index f9b9079e44..fe72cc9107 100644 --- a/sources/SilkTouch/SilkTouch/Sources/NuGetInputSource.cs +++ b/sources/SilkTouch/SilkTouch/Sources/NuGetInputSource.cs @@ -15,7 +15,8 @@ namespace Silk.NET.SilkTouch.Sources; /// /// Uses NuGet as an input source i.e. so we can use files within NuGet packages. /// -public class NuGetInputSource(ICacheProvider cache, ILogger logger) : IInputSource +public class NuGetInputSource(ICacheProvider? cache, ILogger logger) + : IInputSource { private const string VersionsUrl = "https://api.nuget.org/v3-flatcontainer/{0}/index.json"; private const string DownloadUrl = "https://www.nuget.org/api/v2/package/{0}/{1}"; @@ -38,23 +39,38 @@ await _client.GetStringAsync(string.Format(VersionsUrl, packageName)) } var pathInPackage = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped); - var (dir, needsDownload) = ( - await cache.GetDirectory( + var cacheDir = await ( + cache?.GetDirectoryAsync( $"{packageName}.{version}", CacheIntent.ResolvedForeignInput, - CacheFlags.AllowNewLocked - ) - )!.Value; + CacheFlags.AllowNew | CacheFlags.RequireHostDirectory, + FileAccess.ReadWrite + ) ?? ValueTask.FromResult(null) + ); + + string dir; + var needsDownload = true; + if (cacheDir is { Path: { } fsPath }) + { + dir = fsPath; + needsDownload = !Directory.GetFiles(fsPath, "*", SearchOption.AllDirectories).Any(); + } + else + { + logger.LogWarning( + "Failed to open cache for {0} v{1}, download will not be cached.", + packageName, + version + ); + dir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + } + if (needsDownload) { var url = string.Format(DownloadUrl, packageName, version); logger.LogInformation("Downloading & extracting {} into {}", url, dir); - new ZipArchive(await _client.GetStreamAsync(url)).ExtractToDirectory(dir); - await cache.CommitDirectory( - $"{packageName}.{version}", - CacheIntent.ResolvedForeignInput, - CacheFlags.AllowNewLocked - ); + await new ZipArchive(await _client.GetStreamAsync(url)).ExtractToDirectoryAsync(dir); + await (cacheDir?.CommitAsync() ?? ValueTask.CompletedTask); } var semver1x4 = version[..(version.IndexOf('-') is not -1 and var v ? v : ^0)]; diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 40b74d7678..2b8937aa66 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -14,6 +14,13 @@ $(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props tests 1591;1574;1584;1581;1580 + true + Exe + false + true + + + true @@ -29,4 +36,10 @@ + + + + + + diff --git a/tests/Maths/Maths/PlaneTests.cs b/tests/Maths/Maths/PlaneTests.cs index 53a869dd4a..c9761fa32a 100644 --- a/tests/Maths/Maths/PlaneTests.cs +++ b/tests/Maths/Maths/PlaneTests.cs @@ -108,7 +108,10 @@ public void PlaneGetHashCodeTest() { Plane target = new Plane(1.0f, 2.0f, 3.0f, 4.0f); - int expected = target.Normal.GetHashCode() + target.Distance.GetHashCode(); + int expected = HashCode.Combine( + target.Normal.GetHashCode(), + target.Distance.GetHashCode() + ); int actual = target.GetHashCode(); Assert.Equal(expected, actual); } @@ -117,12 +120,19 @@ public void PlaneGetHashCodeTest() [Fact] public void PlaneConstructorTest1() { - float a = 1.0f, b = 2.0f, c = 3.0f, d = 4.0f; + float a = 1.0f, + b = 2.0f, + c = 3.0f, + d = 4.0f; Plane target = new Plane(a, b, c, d); Assert.True( - target.Normal.X == a && target.Normal.Y == b && target.Normal.Z == c && target.Distance == d, - "Plane.cstor did not return the expected value."); + target.Normal.X == a + && target.Normal.Y == b + && target.Normal.Z == c + && target.Distance == d, + "Plane.cstor did not return the expected value." + ); } // A test for Plane.CreateFromVertices @@ -149,8 +159,14 @@ public void PlaneCreateFromVerticesTest2() Plane target = Plane.CreateFromVertices(point1, point2, point3); var invRoot2 = 1.0f / Scalar.Sqrt(2); - Plane expected = new Plane(new Vector3D(invRoot2, 0, invRoot2), -invRoot2); - Assert.True(MathHelper.Equal(target, expected), "Plane.cstor did not return the expected value."); + Plane expected = new Plane( + new Vector3D(invRoot2, 0, invRoot2), + -invRoot2 + ); + Assert.True( + MathHelper.Equal(target, expected), + "Plane.cstor did not return the expected value." + ); } // A test for Plane (Vector3Df, float) @@ -163,7 +179,8 @@ public void PlaneConstructorTest3() Plane target = new Plane(normal, d); Assert.True( target.Normal == normal && target.Distance == d, - "Plane.cstor did not return the expected value."); + "Plane.cstor did not return the expected value." + ); } // A test for Plane (Vector4Df) @@ -174,8 +191,12 @@ public void PlaneConstructorTest() Plane target = new Plane(value); Assert.True( - target.Normal.X == value.X && target.Normal.Y == value.Y && target.Normal.Z == value.Z && target.Distance == value.W, - "Plane.cstor did not return the expected value."); + target.Normal.X == value.X + && target.Normal.Y == value.Y + && target.Normal.Z == value.Z + && target.Distance == value.W, + "Plane.cstor did not return the expected value." + ); } [Fact] @@ -186,7 +207,10 @@ public void PlaneDotTest() float expected = 10 + 12 + 12 + 10; float actual = Plane.Dot(target, value); - Assert.True(MathHelper.Equal(expected, actual), "Plane.Dot returns unexpected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.Dot returns unexpected value." + ); } [Fact] @@ -197,7 +221,10 @@ public void PlaneDotCoordinateTest() float expected = 10 + 12 + 12 + 5; float actual = Plane.DotCoordinate(target, value); - Assert.True(MathHelper.Equal(expected, actual), "Plane.DotCoordinate returns unexpected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.DotCoordinate returns unexpected value." + ); } [Fact] @@ -208,7 +235,10 @@ public void PlaneDotNormalTest() float expected = 10 + 12 + 12; float actual = Plane.DotNormal(target, value); - Assert.True(MathHelper.Equal(expected, actual), "Plane.DotCoordinate returns unexpected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.DotCoordinate returns unexpected value." + ); } [Fact] @@ -221,11 +251,17 @@ public void PlaneNormalizeTest() Plane expected = new Plane(target.Normal * invF, target.Distance * invF); Plane actual = Plane.Normalize(target); - Assert.True(MathHelper.Equal(expected, actual), "Plane.Normalize returns unexpected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.Normalize returns unexpected value." + ); // normalize, normalized normal. actual = Plane.Normalize(actual); - Assert.True(MathHelper.Equal(expected, actual), "Plane.Normalize returns unexpected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.Normalize returns unexpected value." + ); } [Fact] @@ -236,9 +272,9 @@ public void PlaneTransformTest1() target = Plane.Normalize(target); Matrix4X4 m = - Matrix4X4.CreateRotationX(MathHelper.ToRadians(30.0f)) * - Matrix4X4.CreateRotationY(MathHelper.ToRadians(30.0f)) * - Matrix4X4.CreateRotationZ(MathHelper.ToRadians(30.0f)); + Matrix4X4.CreateRotationX(MathHelper.ToRadians(30.0f)) + * Matrix4X4.CreateRotationY(MathHelper.ToRadians(30.0f)) + * Matrix4X4.CreateRotationZ(MathHelper.ToRadians(30.0f)); m.M41 = 10.0f; m.M42 = 20.0f; m.M43 = 30.0f; @@ -247,16 +283,23 @@ public void PlaneTransformTest1() Matrix4X4 inv; Matrix4X4.Invert(m, out inv); Matrix4X4 itm = Matrix4X4.Transpose(inv); - float x = target.Normal.X, y = target.Normal.Y, z = target.Normal.Z, w = target.Distance; + float x = target.Normal.X, + y = target.Normal.Y, + z = target.Normal.Z, + w = target.Distance; expected.Normal = new Vector3D( x * itm.M11 + y * itm.M21 + z * itm.M31 + w * itm.M41, x * itm.M12 + y * itm.M22 + z * itm.M32 + w * itm.M42, - x * itm.M13 + y * itm.M23 + z * itm.M33 + w * itm.M43); + x * itm.M13 + y * itm.M23 + z * itm.M33 + w * itm.M43 + ); expected.Distance = x * itm.M14 + y * itm.M24 + z * itm.M34 + w * itm.M44; Plane actual; actual = Plane.Transform(target, m); - Assert.True(MathHelper.Equal(expected, actual), "Plane.Transform did not return the expected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.Transform did not return the expected value." + ); } [Fact] @@ -267,22 +310,29 @@ public void PlaneTransformTest2() target = Plane.Normalize(target); Matrix4X4 m = - Matrix4X4.CreateRotationX(MathHelper.ToRadians(30.0f)) * - Matrix4X4.CreateRotationY(MathHelper.ToRadians(30.0f)) * - Matrix4X4.CreateRotationZ(MathHelper.ToRadians(30.0f)); + Matrix4X4.CreateRotationX(MathHelper.ToRadians(30.0f)) + * Matrix4X4.CreateRotationY(MathHelper.ToRadians(30.0f)) + * Matrix4X4.CreateRotationZ(MathHelper.ToRadians(30.0f)); Quaternion q = Quaternion.CreateFromRotationMatrix(m); Plane expected = new Plane(); - float x = target.Normal.X, y = target.Normal.Y, z = target.Normal.Z, w = target.Distance; + float x = target.Normal.X, + y = target.Normal.Y, + z = target.Normal.Z, + w = target.Distance; expected.Normal = new Vector3D( x * m.M11 + y * m.M21 + z * m.M31 + w * m.M41, x * m.M12 + y * m.M22 + z * m.M32 + w * m.M42, - x * m.M13 + y * m.M23 + z * m.M33 + w * m.M43); + x * m.M13 + y * m.M23 + z * m.M33 + w * m.M43 + ); expected.Distance = x * m.M14 + y * m.M24 + z * m.M34 + w * m.M44; Plane actual; actual = Plane.Transform(target, q); - Assert.True(MathHelper.Equal(expected, actual), "Plane.Transform did not return the expected value."); + Assert.True( + MathHelper.Equal(expected, actual), + "Plane.Transform did not return the expected value." + ); } // A test for Plane comparison involving NaN values @@ -334,7 +384,8 @@ public void PlaneToStringTest() CultureInfo.CurrentCulture, "{{Normal:{0:G} D:{1}}}", target.Normal, - target.Distance); + target.Distance + ); Assert.Equal(expected, target.ToString()); } diff --git a/tests/Maths/Maths/Scalar.Bitwise.cs b/tests/Maths/Maths/Scalar.Bitwise.cs index a61ac7a8c9..0a8de24ac8 100644 --- a/tests/Maths/Maths/Scalar.Bitwise.cs +++ b/tests/Maths/Maths/Scalar.Bitwise.cs @@ -13,99 +13,105 @@ public class ScalarBitwiseTest [Fact] public void RotateLeft1() { - Assert.Equal((byte)0b1110_0001, Scalar.RotateLeft((byte)0b1111_0000, 1)); + Assert.Equal((byte)0b1110_0001, Scalar.RotateLeft((byte)0b1111_0000, 1)); } - + [Fact] public void RotateLeft2() { - Assert.Equal((ushort)0b1100_1000_0000_0011, Scalar.RotateLeft((ushort)0b1111_0010_0000_0000, 2)); + Assert.Equal( + (ushort)0b1100_1000_0000_0011, + Scalar.RotateLeft((ushort)0b1111_0010_0000_0000, 2) + ); } - + [Fact] public void RotateRight1() { - Assert.Equal((byte)0b1111_0000, Scalar.RotateRight((byte)0b1110_0001, 1)); + Assert.Equal((byte)0b1111_0000, Scalar.RotateRight((byte)0b1110_0001, 1)); } - + [Fact] public void RotateRight2() { - Assert.Equal((ushort)0b1111_0010_0000_0000, Scalar.RotateRight((ushort)0b1100_1000_0000_0011, 2)); + Assert.Equal( + (ushort)0b1111_0010_0000_0000, + Scalar.RotateRight((ushort)0b1100_1000_0000_0011, 2) + ); } - + [Fact] public void And1() { Assert.Equal(0b1010, Scalar.And(0b1110, 0b1011)); } - + [Fact] public void And2() { Assert.Equal((byte)0b1010, Scalar.And((byte)0b1110, (byte)0b1011)); } - + [Fact] public void And3() { Assert.Equal((long)0b1010, Scalar.And((long)0b1110, (long)0b1011)); } - + [Fact] public void Or1() { Assert.Equal(0b1111, Scalar.Or(0b1110, 0b1011)); } - + [Fact] public void Or2() { Assert.Equal((byte)0b1111, Scalar.Or((byte)0b1110, (byte)0b1011)); } - + [Fact] public void Or3() { Assert.Equal((long)0b1111, Scalar.Or((long)0b1110, (long)0b1011)); } - + [Fact] public void Xor1() { Assert.Equal(0b0101, Scalar.Xor(0b1110, 0b1011)); } - + [Fact] public void Xor2() { Assert.Equal((byte)0b0101, Scalar.Xor((byte)0b1110, (byte)0b1011)); } - + [Fact] public void Xor3() { Assert.Equal((long)0b0101, Scalar.Xor((long)0b1110, (long)0b1011)); } - + [Fact] public void Not1() { Assert.Equal(~0b1110, Scalar.Not(0b1110)); } - + [Fact] public void Not2() { - var b = ~(byte)0b1110; + var b = ~(byte)0b1110 & byte.MaxValue; // ReSharper disable once IntVariableOverflowInUncheckedContext Assert.Equal((byte)b, Scalar.Not((byte)0b1110)); } - + [Fact] public void Not3() { Assert.Equal(~(ulong)0b1110, Scalar.Not((ulong)0b1110)); } } -} \ No newline at end of file +} diff --git a/tests/Maths/Maths/Silk.NET.Maths.Tests.csproj b/tests/Maths/Maths/Silk.NET.Maths.Tests.csproj index b4df4c6f0e..2d1bebe022 100644 --- a/tests/Maths/Maths/Silk.NET.Maths.Tests.csproj +++ b/tests/Maths/Maths/Silk.NET.Maths.Tests.csproj @@ -4,9 +4,8 @@ net10.0 true true - false - true true + true @@ -15,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/SilkTouch/SilkTouch/ArrayParameterTransformerTests.cs b/tests/SilkTouch/SilkTouch/ArrayParameterTransformerTests.cs index 2daa4bf31b..772f171f97 100644 --- a/tests/SilkTouch/SilkTouch/ArrayParameterTransformerTests.cs +++ b/tests/SilkTouch/SilkTouch/ArrayParameterTransformerTests.cs @@ -12,7 +12,6 @@ namespace Silk.NET.SilkTouch.UnitTests; -[TestFixture] public class ArrayParameterTransformerTests { [ @@ -247,7 +246,7 @@ public bool TryGetChildSymbolMetadata( IsOut: childNativeName.Contains('o'), IsIn: childNativeName.Contains('i') ) - ) + ), ], ElementTypeConstraints: new SymbolConstraints( [ @@ -257,7 +256,7 @@ public bool TryGetChildSymbolMetadata( null, null, new UsageConstraints() - ) + ), ] ), IsMutable: childNativeName.Contains('m') @@ -279,7 +278,7 @@ public bool TryGetChildSymbolMetadata( IsOut: childNativeName.Contains('o'), IsIn: childNativeName.Contains('i') ) - ) + ), ], ElementTypeConstraints: new SymbolConstraints( [ @@ -289,7 +288,7 @@ public bool TryGetChildSymbolMetadata( null, null, new UsageConstraints() - ) + ), ] ), IsMutable: childNativeName.Contains('m') diff --git a/tests/SilkTouch/SilkTouch/Caching/CacheTests.cs b/tests/SilkTouch/SilkTouch/Caching/CacheTests.cs new file mode 100644 index 0000000000..d31d1dcb71 --- /dev/null +++ b/tests/SilkTouch/SilkTouch/Caching/CacheTests.cs @@ -0,0 +1,214 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections; +using System.Diagnostics; +using System.IO.Compression; +using System.Runtime.CompilerServices; +using System.Text; +using Microsoft.Extensions.Logging.Abstractions; +using Silk.NET.SilkTouch.Caching; + +namespace Silk.NET.SilkTouch.UnitTests.Caching; + +public class CacheTests +{ + static CacheTests() => Init(); + + private static void Init([CallerFilePath] string filePath = "") + { + FileSystemCacheProvider.CommonDir = Path.Combine( + Path.GetDirectoryName(filePath)!, + "TestData.tmp" + ); + + if (Directory.Exists(FileSystemCacheProvider.CommonDir)) + { + Directory.Delete(FileSystemCacheProvider.CommonDir, true); + } + } + + private static string GetExpectedPath(string cacheKey, CacheIntent intent) => + Path.Combine( + FileSystemCacheProvider.CommonDir, + ".silktouch", + cacheKey.ToLower() + + (intent == CacheIntent.ResolvedForeignInput ? ".stdownload" : ".stout") + ); + + [Test] + public async Task ShouldNotCreateNewCacheWithoutAllowNewAsync() + { + var provider = new FileSystemCacheProvider(new NullLogger()); + var i = 0; + foreach ( + var intent in (IEnumerable) + [CacheIntent.ResolvedForeignInput, CacheIntent.StageIntermediateOutput] + ) + { + foreach ( + var flag in (IEnumerable) + [CacheFlags.None, CacheFlags.RequireHostDirectory] + ) + { + foreach ( + var access in (IEnumerable) + [FileAccess.Read, FileAccess.Write, FileAccess.ReadWrite] + ) + { + var cacheKey = $"{nameof(ShouldNotCreateNewCacheWithoutAllowNewAsync)}{i++}"; + var dir = await provider.GetDirectoryAsync(cacheKey, intent, flag, access); + using (Assert.EnterMultipleScope()) + { + Assert.That(dir, Is.Null); + var expectedPath = GetExpectedPath(cacheKey, intent); + Assert.That(Directory.Exists(expectedPath), Is.False); + Assert.That( + File.Exists( + Path.Combine(FileSystemCacheProvider.CommonDir, cacheKey.ToLower()) + ), + Is.False + ); + } + } + } + } + } + + // TODO this could probably be split up into lots of little tests, but it's fine for now. + [Test] + public async Task ShouldCreateCacheWhenAllowNew() + { + var provider = new FileSystemCacheProvider(new NullLogger()); + var i = 0; + var read = new byte[4]; + foreach ( + var intent in (IEnumerable) + [CacheIntent.ResolvedForeignInput, CacheIntent.StageIntermediateOutput] + ) + { + foreach ( + var flag in (IEnumerable) + [CacheFlags.None, CacheFlags.RequireHostDirectory] + ) + { + foreach ( + var access in (IEnumerable)[FileAccess.Write, FileAccess.ReadWrite] + ) + { + var cacheKey = $"{nameof(ShouldCreateCacheWhenAllowNew)}{i++}"; + var expectedPath = GetExpectedPath(cacheKey, intent); + for (var j = 0; j < 3; j++) + { + // Check we can create the cache + // If this is the third loop, we are testing RequireNew + var dir = await provider.GetDirectoryAsync( + cacheKey, + intent, + (j == 2 ? CacheFlags.RequireNew : CacheFlags.AllowNew) | flag, + access + ); + Assert.That(dir, Is.Not.Null); + Assert.That( + dir.Path is null, + Is.EqualTo((flag & CacheFlags.RequireHostDirectory) == 0) + ); + + // Check we can't access our files before we commit them + if ((access & FileAccess.ReadWrite) == FileAccess.ReadWrite) + { + Assert.That( + await dir.GetCommittedFilesAsync().ToArrayAsync(), + j == 1 + ? Is.EquivalentTo(["test.txt"]) + : Is.EquivalentTo(Array.Empty()) + ); + + if (j == 1) // if the cache has been reopened but it's not RequireNew + { + await using var es = await dir.GetCommittedFileAsync("test.txt"); + await es.ReadExactlyAsync(read); + Assert.That(read, Is.EquivalentTo("tset"u8.ToArray())); + } + } + + foreach ( + var contents in (IEnumerable) + ["test"u8.ToArray(), "tset"u8.ToArray()] + ) + { + // Add a file to ensure commit works properly. + // If this is the second loop, we are testing we can overwrite. + await dir.AddFileAsync("test.txt", new MemoryStream(contents)); + await dir.CommitAsync(); + using (Assert.EnterMultipleScope()) + { + Assert.That( + Directory.Exists(expectedPath), + Is.EqualTo((flag & CacheFlags.RequireHostDirectory) != 0) + ); + Assert.That( + File.Exists(expectedPath), + Is.EqualTo((flag & CacheFlags.RequireHostDirectory) == 0) + ); + } + + // Check that we can access our committed files immediately if ReadWrite + if ((access & FileAccess.ReadWrite) == FileAccess.ReadWrite) + { + Assert.That( + await dir.GetCommittedFilesAsync().ToArrayAsync(), + Is.EquivalentTo(["test.txt"]) + ); + + await using var es = await dir.GetCommittedFileAsync("test.txt"); + await es.ReadExactlyAsync(read); + Assert.That(read, Is.EquivalentTo(contents)); + } + + // Check the cache contents + if ((flag & CacheFlags.RequireHostDirectory) != 0) + { + Assert.That( + await File.ReadAllBytesAsync( + Path.Combine(expectedPath, "test.txt") + ), + Is.EquivalentTo(contents) + ); + } + else + { + await using var za = await ZipArchive.CreateAsync( + File.OpenRead(expectedPath), + ZipArchiveMode.Read, + false, + Encoding.UTF8 + ); + var entry = za.GetEntry("test.txt"); + Assert.That(entry, Is.Not.Null); + await using var es = await entry.OpenAsync(); + read.AsSpan().Clear(); + await es.ReadExactlyAsync(read); + Assert.That(read, Is.EquivalentTo(contents)); + } + } + + // Check that we can't reopen until we've disposed + Assert.ThrowsAsync(async () => + { + await provider.GetDirectoryAsync( + cacheKey, + intent, + CacheFlags.AllowNew | flag, + access + ); + }); + + // Check that we can reopen (in the next loop) + await dir.DisposeAsync(); + } + } + } + } + } +} diff --git a/tests/SilkTouch/SilkTouch/DummyModContext.cs b/tests/SilkTouch/SilkTouch/DummyModContext.cs index 1178166e26..197f71f229 100644 --- a/tests/SilkTouch/SilkTouch/DummyModContext.cs +++ b/tests/SilkTouch/SilkTouch/DummyModContext.cs @@ -12,7 +12,6 @@ public class DummyModContext : IModContext public ValueTask DisposeAsync() => ValueTask.CompletedTask; public string JobKey { get; set; } = string.Empty; - public string JobCacheKey { get; set; } = string.Empty; public string? ConfigurationDirectory { get; set; } public Project? SourceProject { get; set; } public Project? TestProject { get; set; } diff --git a/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt index f621042656..6935be9c20 100644 --- a/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt +++ b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.EnumGroupRegression.cl.xml.verified.txt @@ -15,6 +15,8 @@ Added Group: cl_arm_svm_alloc_flags Existing Group: cl_command_queue_properties Added: CL_QUEUE_RESERVED_QCOM +Added Group: cl_compiler_mode_altera + Added Group: cl_device_command_buffer_capabilities_khr Added: CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR Added: CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR diff --git a/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.cs b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.cs index da687e8f20..a64ee5a3db 100644 --- a/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.cs +++ b/tests/SilkTouch/SilkTouch/Khronos/MixKhronosDataTests.cs @@ -14,9 +14,16 @@ namespace Silk.NET.SilkTouch.UnitTests.Khronos; -[TestFixture] public class MixKhronosDataTests { + static MixKhronosDataTests() + { + if (!VerifyDiffPlex.Initialized) + { + VerifyDiffPlex.Initialize(); + } + } + struct Options : IOptionsSnapshot { public required MixKhronosData.Configuration Value { get; init; } @@ -24,9 +31,6 @@ struct Options : IOptionsSnapshot public MixKhronosData.Configuration Get(string? name) => Value; } - [ModuleInitializer] - public static void Initialize() => VerifyDiffPlex.Initialize(); - public static string TestFile(string name, [CallerFilePath] string? fPath = null) => Path.Combine( Path.GetDirectoryName(fPath) @@ -50,18 +54,20 @@ private static IAsyncEnumerable TestCases() IEnumerable files = ["gl.xml", "wgl.xml", "glx.xml", "cl.xml", "vk.xml"]; return files .ToAsyncEnumerable() - .Select(async (x, ct) => - { - var mod = new MixKhronosData( - new NullLogger(), - new Options - { - Value = new MixKhronosData.Configuration { SpecPath = TestFile(x) }, - } - ); - await mod.InitializeAsync(new DummyModContext(), ct); - return (object[])[x, mod.Jobs[""]]; - }); + .Select( + async (x, ct) => + { + var mod = new MixKhronosData( + new NullLogger(), + new Options + { + Value = new MixKhronosData.Configuration { SpecPath = TestFile(x) }, + } + ); + await mod.InitializeAsync(new DummyModContext(), ct); + return (object[])[x, mod.Jobs[""]]; + } + ); } private static IAsyncEnumerable EnumTestCases() => @@ -69,22 +75,23 @@ private static IAsyncEnumerable EnumTestCases() => private static IAsyncEnumerable RegressionTestCases() => TestCases() - .Select(async (object[] s, CancellationToken ct) => - s[0] is "gl.xml" or "cl.xml" - ? (object[]) - [ - s[0], - s[1], - await Task.WhenAll( - TestFiles( - new Regex( - $@"regression\.2\.21\.{((string)s[0])[..^4]}.*\.json\.gz" + .Select( + async (object[] s, CancellationToken ct) => + s[0] is "gl.xml" or "cl.xml" + ? (object[]) + [ + s[0], + s[1], + await Task.WhenAll( + TestFiles( + new Regex( + $@"regression\.2\.21\.{((string)s[0])[..^4]}.*\.json\.gz" + ) ) - ) - .Select(ReadProfile) - ), - ] - : null + .Select(ReadProfile) + ), + ] + : null ) .OfType(); @@ -332,7 +339,10 @@ public void OverzealousNameTrimming() var names = new Dictionary { { "GL_PIXEL_COUNT_NV", new CandidateNames("GL_PIXEL_COUNT_NV", []) }, - { "GL_PIXEL_COUNT_AVAILABLE_NV", new CandidateNames("GL_PIXEL_COUNT_AVAILABLE_NV", []) }, + { + "GL_PIXEL_COUNT_AVAILABLE_NV", + new CandidateNames("GL_PIXEL_COUNT_AVAILABLE_NV", []) + }, }; var ctx = new NameTrimmerContext { @@ -344,7 +354,10 @@ public void OverzealousNameTrimming() baseTrimmer.Trim(ctx); uut.Trim(ctx); Assert.That(names["GL_PIXEL_COUNT_NV"].Primary, Is.EqualTo("PixelCount")); - Assert.That(names["GL_PIXEL_COUNT_AVAILABLE_NV"].Primary, Is.EqualTo("PixelCountAvailable")); + Assert.That( + names["GL_PIXEL_COUNT_AVAILABLE_NV"].Primary, + Is.EqualTo("PixelCountAvailable") + ); } [Test] diff --git a/tests/SilkTouch/SilkTouch/MetadataUtilsTests.cs b/tests/SilkTouch/SilkTouch/MetadataUtilsTests.cs index 35306f2018..6e75bc5d49 100644 --- a/tests/SilkTouch/SilkTouch/MetadataUtilsTests.cs +++ b/tests/SilkTouch/SilkTouch/MetadataUtilsTests.cs @@ -7,7 +7,6 @@ namespace Silk.NET.SilkTouch.UnitTests; -[TestFixture] public class MetadataUtilsTests { [ diff --git a/tests/SilkTouch/SilkTouch/ModUtilsTests.cs b/tests/SilkTouch/SilkTouch/ModUtilsTests.cs index 6c0a3cbcc7..d03b7a130d 100644 --- a/tests/SilkTouch/SilkTouch/ModUtilsTests.cs +++ b/tests/SilkTouch/SilkTouch/ModUtilsTests.cs @@ -3,21 +3,32 @@ namespace Silk.NET.SilkTouch.UnitTests; -[TestFixture] public class ModUtilsTests { - private static readonly (string Input, string EffectiveName, string Directory, string Remainder)[] - GetEffectiveNameTests = [ - ("hello/GL.gen.cs", "GL", "hello/", ".gen.cs"), - ("hello/GL.Manual.cs", "GL.Manual", "hello/", ".cs"), - ("hello/GL.Interfaces.gen.cs", "GL.Interfaces", "hello/", ".gen.cs") - ]; + private static readonly ( + string Input, + string EffectiveName, + string Directory, + string Remainder + )[] GetEffectiveNameTests = + [ + ("hello/GL.gen.cs", "GL", "hello/", ".gen.cs"), + ("hello/GL.Manual.cs", "GL.Manual", "hello/", ".cs"), + ("hello/GL.Interfaces.gen.cs", "GL.Interfaces", "hello/", ".gen.cs"), + ]; [Test] public void GetEffectiveName( - [ValueSource(nameof(GetEffectiveNameTests))] (string Input, string EffectiveName, string Directory, string Remainder) testData) + [ValueSource(nameof(GetEffectiveNameTests))] + (string Input, string EffectiveName, string Directory, string Remainder) testData + ) { - ModUtils.GetEffectiveName(testData.Input, out var effectiveName, out var directory, out var remainder); + ModUtils.GetEffectiveName( + testData.Input, + out var effectiveName, + out var directory, + out var remainder + ); Assert.That(effectiveName.ToString(), Is.EqualTo(testData.EffectiveName)); Assert.That(directory.ToString(), Is.EqualTo(testData.Directory)); Assert.That(remainder.ToString(), Is.EqualTo(testData.Remainder)); diff --git a/tests/SilkTouch/SilkTouch/Naming/NameTests.cs b/tests/SilkTouch/SilkTouch/Naming/NameTests.cs index 544b0406c7..23eb2c3376 100644 --- a/tests/SilkTouch/SilkTouch/Naming/NameTests.cs +++ b/tests/SilkTouch/SilkTouch/Naming/NameTests.cs @@ -6,7 +6,6 @@ namespace Silk.NET.SilkTouch.UnitTests.Naming; -[TestFixture] public class NameTests : NameTrimmer { [Test, TestCase(null), TestCase("glfw")] @@ -53,7 +52,10 @@ public void SimpleGlfwTestDetermination(string? hint) }; foreach (var (key, (trimmed, _)) in test) { - Assert.That(trimmed.Prettify(new NameUtils.NameTransformer(4)), Is.EqualTo(expected[key])); + Assert.That( + trimmed.Prettify(new NameUtils.NameTransformer(4)), + Is.EqualTo(expected[key]) + ); } } @@ -85,7 +87,10 @@ public void RegressionFragmentShaderColorModMaskATI() }; foreach (var (key, (trimmed, _)) in test) { - Assert.That(trimmed.Prettify(new NameUtils.NameTransformer(4)), Is.EqualTo(expected[key])); + Assert.That( + trimmed.Prettify(new NameUtils.NameTransformer(4)), + Is.EqualTo(expected[key]) + ); } } @@ -113,7 +118,10 @@ public void RegressionEvalTargetNV() }; foreach (var (key, (trimmed, _)) in test) { - Assert.That(trimmed.Prettify(new NameUtils.NameTransformer(4)), Is.EqualTo(expected[key])); + Assert.That( + trimmed.Prettify(new NameUtils.NameTransformer(4)), + Is.EqualTo(expected[key]) + ); } } @@ -159,6 +167,9 @@ public void MultipleGlobalPrefixHints() }; var uut = new NameTrimmer(); uut.Trim(ctx); - Assert.That(names["ALC_CONTEXT_DEBUG_BIT_EXT"].Primary, Is.EqualTo("CONTEXT_DEBUG_BIT_EXT")); + Assert.That( + names["ALC_CONTEXT_DEBUG_BIT_EXT"].Primary, + Is.EqualTo("CONTEXT_DEBUG_BIT_EXT") + ); } }