[3.0] Rewrite NameUtils.Prettify

eng/silktouch/openal/alsoft/generate.rsp

@@ -2,6 +2,8 @@
 @../remap.rsp
 --exclude
 _GUID
+AL_CPLUSPLUS
+ALC_CPLUSPLUS
 --file
 openal-soft-al.h
 --methodClassName

eng/silktouch/openal/remap.rsp

@@ -1,2 +1,3 @@
+@../../remap-stdint.rsp
 --remap
 _GUID=System.Guid

eng/silktouch/opengl/remap.rsp

@@ -1,3 +1,4 @@
+@../../remap-stdint.rsp
 --remap
 __GLsync=GLsync
 _cl_context=void
@@ -23,3 +24,5 @@ GLclampf=float
 GLdouble=double
 GLclampd=double
 GLhandleARB=uint
+GLintptrARB=nint
+GLsizeiptrARB=nuint

eng/silktouch/sdl/remap.rsp

@@ -1,3 +1,4 @@
+@../../remap-stdint.rsp
 --remap
 SDL_fabsf=float.Abs
 VkSurfaceKHR=ulong

eng/silktouch/vulkan/remap.rsp

@@ -1 +1 @@
-@../remap-stdint.rsp
+@../../remap-stdint.rsp

generator.json

@@ -171,7 +171,6 @@
         ]
       },
       "PrettifyNames": {
-        "LongAcronymThreshold": 4,
         "GlobalPrefixHints": ["gl"],
         "PrefixOverrides": {
           "SyncObjectMask": "GL_SYNC",
@@ -291,7 +290,6 @@
         ]
       },
       "PrettifyNames": {
-        "LongAcronymThreshold": 4,
         "GlobalPrefixHints": ["alc", "al"],
         "NameOverrides": {
           "ALContext": "ALContext",
@@ -424,12 +422,14 @@
         "UseDSL": true
       },
       "PrettifyNames": {
-        "LongAcronymThreshold": 4,
         "GlobalPrefixHints": ["PFN_vk","vk"],
         "PrefixOverrides": {
           "VkPipelineCreateFlags2": "VK_PIPELINE_CREATE_2",
           "VkMemoryDecompressionMethodFlagsEXT": "VK_MEMORY_DECOMPRESSION_METHOD"
         },
+        "NameOverrides": {
+          "numAABBs": "NumAabbs"
+        },
         "Affixes": {
           "HandleType": {
             "Order": 1

sources/Core/Core/Abstractions/EGLPlatformInfo.cs → sources/Core/Core/Abstractions/EglPlatformInfo.cs

@@ -5,4 +5,4 @@ namespace Silk.NET.Core;
 /// </summary>
 /// <param name="Display"><c>EGLDisplay</c>.</param>
 /// <param name="Surface"><c>EGLSurface</c>.</param>
-public readonly record struct EGLPlatformInfo(nint Display, nint Surface);
+public readonly record struct EglPlatformInfo(nint Display, nint Surface);

sources/Core/Core/PublicAPI/net10.0/PublicAPI.Unshipped.txt

@@ -3,7 +3,7 @@ override Silk.NET.Core.AndroidPlatformInfo.GetHashCode() -> int
 override Silk.NET.Core.CocoaPlatformInfo.GetHashCode() -> int
 override Silk.NET.Core.Constant<TUnderlying, TEnum1, TEnum2>.GetHashCode() -> int
 override Silk.NET.Core.Constant<TUnderlying, TEnum1>.GetHashCode() -> int
-override Silk.NET.Core.EGLPlatformInfo.GetHashCode() -> int
+override Silk.NET.Core.EglPlatformInfo.GetHashCode() -> int
 override Silk.NET.Core.MaybeBool<T, TScheme>.GetHashCode() -> int
 override Silk.NET.Core.MaybeBool<T>.GetHashCode() -> int
 override Silk.NET.Core.NullPtr.GetHashCode() -> int
@@ -102,15 +102,15 @@ Silk.NET.Core.CppAttributeListAttribute.CppAttributeListAttribute(string! attrib
 Silk.NET.Core.Default
 Silk.NET.Core.Default.Default() -> void
 Silk.NET.Core.DSL
-Silk.NET.Core.EGLPlatformInfo
-Silk.NET.Core.EGLPlatformInfo.Deconstruct(out nint Display, out nint Surface) -> void
-Silk.NET.Core.EGLPlatformInfo.Display.get -> nint
-Silk.NET.Core.EGLPlatformInfo.Display.init -> void
-Silk.NET.Core.EGLPlatformInfo.EGLPlatformInfo() -> void
-Silk.NET.Core.EGLPlatformInfo.EGLPlatformInfo(nint Display, nint Surface) -> void
-Silk.NET.Core.EGLPlatformInfo.Equals(Silk.NET.Core.EGLPlatformInfo other) -> bool
-Silk.NET.Core.EGLPlatformInfo.Surface.get -> nint
-Silk.NET.Core.EGLPlatformInfo.Surface.init -> void
+Silk.NET.Core.EglPlatformInfo
+Silk.NET.Core.EglPlatformInfo.Deconstruct(out nint Display, out nint Surface) -> void
+Silk.NET.Core.EglPlatformInfo.Display.get -> nint
+Silk.NET.Core.EglPlatformInfo.Display.init -> void
+Silk.NET.Core.EglPlatformInfo.EglPlatformInfo() -> void
+Silk.NET.Core.EglPlatformInfo.EglPlatformInfo(nint Display, nint Surface) -> void
+Silk.NET.Core.EglPlatformInfo.Equals(Silk.NET.Core.EglPlatformInfo other) -> bool
+Silk.NET.Core.EglPlatformInfo.Surface.get -> nint
+Silk.NET.Core.EglPlatformInfo.Surface.init -> void
 Silk.NET.Core.IBoolScheme
 Silk.NET.Core.IBoolScheme.False<T>() -> T
 Silk.NET.Core.IBoolScheme.IsTrue<T>(T value) -> bool
@@ -402,8 +402,8 @@ static Silk.NET.Core.Constant<TUnderlying, TEnum1>.operator !=(Silk.NET.Core.Con
 static Silk.NET.Core.Constant<TUnderlying, TEnum1>.operator ==(Silk.NET.Core.Constant<TUnderlying, TEnum1> left, Silk.NET.Core.Constant<TUnderlying, TEnum1> right) -> bool
 static Silk.NET.Core.Default.True<T>() -> T
 static Silk.NET.Core.DSL.nullptr.get -> Silk.NET.Core.NullPtr
-static Silk.NET.Core.EGLPlatformInfo.operator !=(Silk.NET.Core.EGLPlatformInfo left, Silk.NET.Core.EGLPlatformInfo right) -> bool
-static Silk.NET.Core.EGLPlatformInfo.operator ==(Silk.NET.Core.EGLPlatformInfo left, Silk.NET.Core.EGLPlatformInfo right) -> bool
+static Silk.NET.Core.EglPlatformInfo.operator !=(Silk.NET.Core.EglPlatformInfo left, Silk.NET.Core.EglPlatformInfo right) -> bool
+static Silk.NET.Core.EglPlatformInfo.operator ==(Silk.NET.Core.EglPlatformInfo left, Silk.NET.Core.EglPlatformInfo right) -> bool
 static Silk.NET.Core.Loader.LoaderInterface.AlternativeNames.get -> System.Collections.Generic.Dictionary<string!, System.Collections.Generic.List<string!>!>!
 static Silk.NET.Core.Loader.LoaderInterface.LoadAlternativeNames(string! libraryName, System.Reflection.Assembly! assembly, System.Runtime.InteropServices.DllImportSearchPath? searchPath) -> nint
 static Silk.NET.Core.Loader.LoaderInterface.LoadLibrary(string! name, System.Reflection.Assembly! asm) -> nint
@@ -847,8 +847,8 @@ static Silk.NET.Core.X11PlatformInfo.operator ==(Silk.NET.Core.X11PlatformInfo l
 ~override Silk.NET.Core.Constant<TUnderlying, TEnum1, TEnum2>.ToString() -> string
 ~override Silk.NET.Core.Constant<TUnderlying, TEnum1>.Equals(object obj) -> bool
 ~override Silk.NET.Core.Constant<TUnderlying, TEnum1>.ToString() -> string
-~override Silk.NET.Core.EGLPlatformInfo.Equals(object obj) -> bool
-~override Silk.NET.Core.EGLPlatformInfo.ToString() -> string
+~override Silk.NET.Core.EglPlatformInfo.Equals(object obj) -> bool
+~override Silk.NET.Core.EglPlatformInfo.ToString() -> string
 ~override Silk.NET.Core.MaybeBool<T, TScheme>.Equals(object obj) -> bool
 ~override Silk.NET.Core.MaybeBool<T, TScheme>.ToString() -> string
 ~override Silk.NET.Core.MaybeBool<T>.Equals(object obj) -> bool

sources/OpenAL/OpenAL/Enums/ALCEnum.gen.cs

@@ -248,13 +248,13 @@ public enum ALCEnum : uint
     StereoHrtfSOFT = 6578,
 
     [NativeName("ALC_SURROUND_5_1_SOFT")]
-    Surround5X1SOFT = 5380,
+    Surround5x1SOFT = 5380,
 
     [NativeName("ALC_SURROUND_6_1_SOFT")]
-    Surround6X1SOFT = 5381,
+    Surround6x1SOFT = 5381,
 
     [NativeName("ALC_SURROUND_7_1_SOFT")]
-    Surround7X1SOFT = 5382,
+    Surround7x1SOFT = 5382,
 
     [NativeName("ALC_CONTEXT_FLAGS_EXT")]
     ContextFlagsEXT = 6607,

sources/OpenAL/OpenAL/Enums/ALEnum.gen.cs

@@ -1874,31 +1874,31 @@ public enum ALEnum : uint
     Rear32FSOFT = 4617,
 
     [NativeName("AL_5POINT1_8_SOFT")]
-    X5Point1X8SOFT = 4618,
+    X5Point1x8SOFT = 4618,
 
     [NativeName("AL_5POINT1_16_SOFT")]
-    X5Point1X16SOFT = 4619,
+    X5Point1x16SOFT = 4619,
 
     [NativeName("AL_5POINT1_32F_SOFT")]
-    X5Point1X32FSOFT = 4620,
+    X5Point1x32FSOFT = 4620,
 
     [NativeName("AL_6POINT1_8_SOFT")]
-    X6Point1X8SOFT = 4621,
+    X6Point1x8SOFT = 4621,
 
     [NativeName("AL_6POINT1_16_SOFT")]
-    X6Point1X16SOFT = 4622,
+    X6Point1x16SOFT = 4622,
 
     [NativeName("AL_6POINT1_32F_SOFT")]
-    X6Point1X32FSOFT = 4623,
+    X6Point1x32FSOFT = 4623,
 
     [NativeName("AL_7POINT1_8_SOFT")]
-    X7Point1X8SOFT = 4624,
+    X7Point1x8SOFT = 4624,
 
     [NativeName("AL_7POINT1_16_SOFT")]
-    X7Point1X16SOFT = 4625,
+    X7Point1x16SOFT = 4625,
 
     [NativeName("AL_7POINT1_32F_SOFT")]
-    X7Point1X32FSOFT = 4626,
+    X7Point1x32FSOFT = 4626,
 
     [NativeName("AL_INTERNAL_FORMAT_SOFT")]
     InternalFormatSOFT = 8200,

sources/OpenAL/OpenAL/Enums/EffectEAXReverb.gen.cs → sources/OpenAL/OpenAL/Enums/EffectEaxReverb.gen.cs

@@ -11,7 +11,7 @@
 namespace Silk.NET.OpenAL;
 
 [NativeName("EffectEAXReverb")]
-public enum EffectEAXReverb : uint
+public enum EffectEaxReverb : uint
 {
     [NativeName("AL_EAXREVERB_DENSITY")]
     Density = 1,

sources/OpenAL/OpenAL/Enums/InternalFormatSOFT.gen.cs

@@ -50,29 +50,29 @@ public enum InternalFormatSOFT : uint
     Rear32F = 4617,
 
     [NativeName("AL_5POINT1_8_SOFT")]
-    X5Point1X8 = 4618,
+    X5Point1x8 = 4618,
 
     [NativeName("AL_5POINT1_16_SOFT")]
-    X5Point1X16 = 4619,
+    X5Point1x16 = 4619,
 
     [NativeName("AL_5POINT1_32F_SOFT")]
-    X5Point1X32F = 4620,
+    X5Point1x32F = 4620,
 
     [NativeName("AL_6POINT1_8_SOFT")]
-    X6Point1X8 = 4621,
+    X6Point1x8 = 4621,
 
     [NativeName("AL_6POINT1_16_SOFT")]
-    X6Point1X16 = 4622,
+    X6Point1x16 = 4622,
 
     [NativeName("AL_6POINT1_32F_SOFT")]
-    X6Point1X32F = 4623,
+    X6Point1x32F = 4623,
 
     [NativeName("AL_7POINT1_8_SOFT")]
-    X7Point1X8 = 4624,
+    X7Point1x8 = 4624,
 
     [NativeName("AL_7POINT1_16_SOFT")]
-    X7Point1X16 = 4625,
+    X7Point1x16 = 4625,
 
     [NativeName("AL_7POINT1_32F_SOFT")]
-    X7Point1X32F = 4626,
+    X7Point1x32F = 4626,
 }

sources/OpenAL/OpenAL/Enums/OutputModeSOFT.gen.cs

@@ -26,11 +26,11 @@ public enum OutputModeSOFT : uint
     StereoHrtf = 6578,
 
     [NativeName("ALC_SURROUND_5_1_SOFT")]
-    Surround5X1 = 5380,
+    Surround5x1 = 5380,
 
     [NativeName("ALC_SURROUND_6_1_SOFT")]
-    Surround6X1 = 5381,
+    Surround6x1 = 5381,
 
     [NativeName("ALC_SURROUND_7_1_SOFT")]
-    Surround7X1 = 5382,
+    Surround7x1 = 5382,
 }

sources/OpenAL/OpenAL/al/AL.gen.cs

@@ -26129,9 +26129,6 @@ uint value_size
         }
     }
 
-    [NativeName("AL_CPLUSPLUS")]
-    public const int Cplusplus = 201402;
-
     [NativeName("AL_EXT_FOLDBACK_NAME")]
     [SupportedApiProfile("al", ["AL_EXT_FOLDBACK"])]
     public static ReadOnlySpan<byte> ExtFoldbackName => "AL_EXT_FOLDBACK"u8;

sources/OpenAL/OpenAL/al/ALContext.gen.cs

@@ -1905,12 +1905,9 @@ public static void SuspendContext(ContextHandle context) =>
             Underlying.Value!.SuspendContext(context);
     }
 
-    [NativeName("ALC_CPLUSPLUS")]
-    public const int Cplusplus = 201402;
-
     [NativeName("ALC_VERSION_0_1")]
     [SupportedApiProfile("alc", ["ALC_VERSION_1_0", "ALC_VERSION_1_1"], MinVersion = "1.0")]
-    public const int Version0X1 = 1;
+    public const int Version0x1 = 1;
 
     [NativeName("ALC_EXT_CAPTURE")]
     [SupportedApiProfile("alc", ["ALC_VERSION_1_1"], MinVersion = "1.1")]

sources/OpenGL/OpenGL/Enums/AttributeType.gen.cs

@@ -80,22 +80,22 @@ public enum AttributeType : uint
     Sampler2DShadow = 35682,
 
     [NativeName("GL_FLOAT_MAT2x3")]
-    FloatMAT2X3 = 35685,
+    FloatMat2x3 = 35685,
 
     [NativeName("GL_FLOAT_MAT2x4")]
-    FloatMAT2X4 = 35686,
+    FloatMat2x4 = 35686,
 
     [NativeName("GL_FLOAT_MAT3x2")]
-    FloatMAT3X2 = 35687,
+    FloatMat3x2 = 35687,
 
     [NativeName("GL_FLOAT_MAT3x4")]
-    FloatMAT3X4 = 35688,
+    FloatMat3x4 = 35688,
 
     [NativeName("GL_FLOAT_MAT4x2")]
-    FloatMAT4X2 = 35689,
+    FloatMat4x2 = 35689,
 
     [NativeName("GL_FLOAT_MAT4x3")]
-    FloatMAT4X3 = 35690,
+    FloatMat4x3 = 35690,
 
     [NativeName("GL_SAMPLER_1D_ARRAY_SHADOW")]
     Sampler1DArrayShadow = 36291,
@@ -221,22 +221,22 @@ public enum AttributeType : uint
     DoubleMat4 = 36680,
 
     [NativeName("GL_DOUBLE_MAT2x3")]
-    DoubleMAT2X3 = 36681,
+    DoubleMat2x3 = 36681,
 
     [NativeName("GL_DOUBLE_MAT2x4")]
-    DoubleMAT2X4 = 36682,
+    DoubleMat2x4 = 36682,
 
     [NativeName("GL_DOUBLE_MAT3x2")]
-    DoubleMAT3X2 = 36683,
+    DoubleMat3x2 = 36683,
 
     [NativeName("GL_DOUBLE_MAT3x4")]
-    DoubleMAT3X4 = 36684,
+    DoubleMat3x4 = 36684,
 
     [NativeName("GL_DOUBLE_MAT4x2")]
-    DoubleMAT4X2 = 36685,
+    DoubleMat4x2 = 36685,
 
     [NativeName("GL_DOUBLE_MAT4x3")]
-    DoubleMAT4X3 = 36686,
+    DoubleMat4x3 = 36686,
 
     [NativeName("GL_IMAGE_1D")]
     Image1D = 36940,
@@ -437,20 +437,20 @@ public enum AttributeType : uint
     Sampler2DShadowEXT = 35682,
 
     [NativeName("GL_FLOAT_MAT2x3_NV")]
-    FloatMAT2X3NV = 35685,
+    FloatMat2x3NV = 35685,
 
     [NativeName("GL_FLOAT_MAT2x4_NV")]
-    FloatMAT2X4NV = 35686,
+    FloatMat2x4NV = 35686,
 
     [NativeName("GL_FLOAT_MAT3x2_NV")]
-    FloatMAT3X2NV = 35687,
+    FloatMat3x2NV = 35687,
 
     [NativeName("GL_FLOAT_MAT3x4_NV")]
-    FloatMAT3X4NV = 35688,
+    FloatMat3x4NV = 35688,
 
     [NativeName("GL_FLOAT_MAT4x2_NV")]
-    FloatMAT4X2NV = 35689,
+    FloatMat4x2NV = 35689,
 
     [NativeName("GL_FLOAT_MAT4x3_NV")]
-    FloatMAT4X3NV = 35690,
+    FloatMat4x3NV = 35690,
 }