Remove constants that are marked as deprecated aliases

These only seem to exist for Vulkan currently.

For Vulkan:
These represent misnamed constants that have now been renamed to be consistent with the rest of the Vulkan spec.

For Silk:
These misnamed constants and their corrected variants cause name collisions when names are prettified (thus leading to compile errors) and cause common prefix determination for enum member names to be more pessimistic (thus leading to longer names).

For users:
Removing these aliases can induce more API breaks, but because these are aliases and always have an alternative, API breaks are simple to fix. Removing these aliases also makes it clearer which variant is the correct variant to use.

Author: Exanite

.silktouch/ac001027d53000e0.stout

@@ -2,17 +2,6 @@
 @../remap.rsp
 --exclude
 VK_NULL_HANDLE
-VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME
-VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION
-VK_KHR_MAINTENANCE1_EXTENSION_NAME
-VK_KHR_MAINTENANCE1_SPEC_VERSION
-VK_KHR_MAINTENANCE2_EXTENSION_NAME
-VK_KHR_MAINTENANCE2_SPEC_VERSION
-VK_KHR_MAINTENANCE3_EXTENSION_NAME
-VK_KHR_MAINTENANCE3_SPEC_VERSION
-VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME
-VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION
-VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT
 --file
 vulkan-vulkan.h
 --methodClassName

.silktouch/bdd42329798b2360.stout

@@ -121,6 +121,18 @@ public Dictionary<
         /// modifying the original configuration object. It is used in the same way.
         /// </summary>
         public Dictionary<string, string> TypeMap { get; init; } = [];
+
+        /// <summary>
+        /// This tracks a set of enum members marked with the deprecated="aliased" attribute.
+        /// These are removed from the generated bindings.
+        /// </summary>
+        /// <remarks>
+        /// At the time this was added, only Vulkan seems to use the deprecated="aliased" attribute.
+        /// These names tend to cause name collisions after names are prettified so removing these
+        /// prevents these issues. This can cause API breakages, but because these are aliases,
+        /// these are easily solvable breakages.
+        /// </remarks>
+        public HashSet<string> DeprecatedAliases = [];
     }
 
     /// <summary>
@@ -259,6 +271,7 @@ public async Task InitializeAsync(IModContext ctx, CancellationToken ct = defaul
         job.SupportedApiProfiles = supportedApiProfiles;
 
         var profiles = supportedApiProfiles.SelectMany(x => x.Value).Select(x => x.Profile).ToHashSet();
+
         job.Vendors =
         [
             .. xml.Element("registry")
@@ -281,6 +294,10 @@ .. xml.Element("registry")
                 .Select(name => name.Value.Split('_')[1].ToUpper()) ?? Enumerable.Empty<string>()
         ];
 
+        job.DeprecatedAliases = xml.Descendants()
+            .Where(x => x.Attribute("deprecated")?.Value == "aliased" && x.Attribute("name") != null)
+            .Select(x => x.Attribute("name")!.Value).ToHashSet();
+
         ReadGroups(xml, job, job.Vendors);
 
         foreach (var typeElement in xml.Elements("registry").Elements("types").Elements("type"))
@@ -303,7 +320,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
         var proj = ctx.SourceProject;
 
         // Rewrite phase 1
-        var rewriter1 = new EnumRewriterPhase1(jobData, logger);
+        var rewriter1 = new RewriterPhase1(jobData, logger);
         foreach (var docId in proj?.DocumentIds ?? [])
         {
             var doc = proj!.GetDocument(docId) ?? throw new InvalidOperationException("Document missing");
@@ -326,7 +343,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
         }
 
         // Rewrite phase 2
-        var rewriter2 = new EnumRewriterPhase2(jobData, rewriter1);
+        var rewriter2 = new RewriterPhase2(jobData, rewriter1);
         foreach (var docId in proj?.DocumentIds ?? [])
         {
             var doc = proj!.GetDocument(docId) ?? throw new InvalidOperationException("Document missing");
@@ -1694,14 +1711,16 @@ jobKey is null
     private static partial Regex EndingsNotToTrim();
 
     /// <summary>
+    /// This rewriter focuses on adding missing enums.
+    /// <para/>
     /// Extracts enum constants that are defined as fields and moves them to their actual enum types.
     /// Begins renaming FlagBits enums to Flags.
     /// </summary>
     /// <remarks>
     /// This rewriter is split into two phases because NamespaceFromSyntaxNode breaks due to
     /// the FieldDeclarationSyntax being modified.
     /// </remarks>
-    private class EnumRewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter
+    private class RewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewriter
     {
         /// <summary>
         /// Tracks enum groups that already exist in the project, prior to the generation of missing enums.
@@ -1927,15 +1946,24 @@ private class EnumRewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewr
     /// Finishes renaming FlagBits enums to Flags.
     /// Marks bitmask enums with the [Flags] attribute.
     /// Replaces uint/ulong with the actual enum type for FlagBits/Flags types.
+    /// Removes deprecated aliases.
     /// </summary>
-    private class EnumRewriterPhase2(JobData job, EnumRewriterPhase1 phase1) : CSharpSyntaxRewriter(true)
+    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? VisitEnumDeclaration(EnumDeclarationSyntax node)
         {
             var identifier = node.Identifier.ToString();
 
+            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))
+                ]);
+            }
+
             if (job.Groups.TryGetValue(identifier, out var group) && group.KnownBitmask)
             {
                 // Add [Flags] attribute
@@ -1951,22 +1979,47 @@ private class EnumRewriterPhase2(JobData job, EnumRewriterPhase1 phase1) : CShar
 
         public override SyntaxNode? VisitFieldDeclaration(FieldDeclarationSyntax node)
         {
-            if (!TryGetManagedEnumType(node.AttributeLists, out var managedName))
+            if (node.Declaration.Variables.Any(v => job.DeprecatedAliases.Contains(v.Identifier.ValueText)))
             {
-                return base.VisitFieldDeclaration(node);
+                // Remove deprecated aliases
+                node = node.WithDeclaration(node.Declaration.WithVariables([
+                    ..node.Declaration.Variables.Where(v => !job.DeprecatedAliases.Contains(v.Identifier.ValueText))
+                ]));
+
+                if (node.Declaration.Variables.Count == 0)
+                {
+                    return null;
+                }
+            }
+
+            if (TryGetManagedEnumType(node.AttributeLists, out var managedName))
+            {
+                node = node.WithDeclaration(node.Declaration.WithType(ParseTypeName(managedName)));
+            }
+
+            return base.VisitFieldDeclaration(node);
+
+        }
+
+        public override SyntaxNode? VisitPropertyDeclaration(PropertyDeclarationSyntax node)
+        {
+            if (job.DeprecatedAliases.Contains(node.Identifier.ValueText))
+            {
+                return null;
             }
 
-            return base.VisitFieldDeclaration(node.WithDeclaration(node.Declaration.WithType(ParseTypeName(managedName))));
+            return base.VisitPropertyDeclaration(node);
         }
 
         public override SyntaxNode? VisitParameter(ParameterSyntax node)
         {
-            if (!TryGetManagedEnumType(node.AttributeLists, out var managedName))
+            if (TryGetManagedEnumType(node.AttributeLists, out var managedName))
             {
-                return base.VisitParameter(node);
+                node = node.WithType(ParseTypeName(managedName));
             }
 
-            return base.VisitParameter(node.WithType(ParseTypeName(managedName)));
+            return base.VisitParameter(node);
+
         }
 
         /// <summary>

eng/silktouch/vulkan/vulkan/generate.rsp

@@ -83,7 +83,6 @@ public enum PipelineStageFlags2 : ulong
     TaskShaderBitEXT = unchecked((ulong)0x00080000UL),
     MeshShaderBitEXT = unchecked((ulong)0x00100000UL),
     SubpassShaderBitHuawei = unchecked((ulong)0x8000000000UL),
-    SubpassShadingBitHuawei = unchecked((ulong)0x8000000000UL),
     InvocationMaskBitHuawei = unchecked((ulong)0x10000000000UL),
     AccelerationStructureCopyBitKHR = unchecked((ulong)0x10000000UL),
     MicromapBuildBitEXT = unchecked((ulong)0x40000000UL),

sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs

@@ -14,105 +14,105 @@ namespace Silk.NET.Vulkan;
 public enum ColorSpaceKHR : uint
 {
     [SupportedApiProfile("vulkan", ["VK_KHR_surface"])]
-    ColorSpaceSrgbNonlinearKHR = 0,
+    SrgbNonlinearKHR = 0,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceDisplayP3NonlinearEXT = 1000104001,
+    DisplayP3NonlinearEXT = 1000104001,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceExtendedSrgbLinearEXT = 1000104002,
+    ExtendedSrgbLinearEXT = 1000104002,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceDisplayP3LinearEXT = 1000104003,
+    DisplayP3LinearEXT = 1000104003,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceDciP3NonlinearEXT = 1000104004,
+    DciP3NonlinearEXT = 1000104004,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceBt709LinearEXT = 1000104005,
+    Bt709LinearEXT = 1000104005,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceBt709NonlinearEXT = 1000104006,
+    Bt709NonlinearEXT = 1000104006,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceBt2020LinearEXT = 1000104007,
+    Bt2020LinearEXT = 1000104007,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceHdr10St2084EXT = 1000104008,
+    Hdr10St2084EXT = 1000104008,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceDolbyvisionEXT = 1000104009,
+    DolbyvisionEXT = 1000104009,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceHdr10HlgEXT = 1000104010,
+    Hdr10HlgEXT = 1000104010,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceAdobergbLinearEXT = 1000104011,
+    AdobergbLinearEXT = 1000104011,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceAdobergbNonlinearEXT = 1000104012,
+    AdobergbNonlinearEXT = 1000104012,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpacePassThroughEXT = 1000104013,
+    PassThroughEXT = 1000104013,
 
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_swapchain_colorspace"],
         ImpliesSets = ["VK_KHR_surface"]
     )]
-    ColorSpaceExtendedSrgbNonlinearEXT = 1000104014,
+    ExtendedSrgbNonlinearEXT = 1000104014,
 
     [SupportedApiProfile(
         "vulkan",
@@ -122,15 +122,5 @@ public enum ColorSpaceKHR : uint
             "VK_KHR_get_surface_capabilities2+VK_KHR_swapchain+VK_VERSION_1_1",
         ]
     )]
-    ColorSpaceDisplayNativeAMD = 1000213000,
-
-    [SupportedApiProfile("vulkan", ["VK_KHR_surface"])]
-    ColorspaceSrgbNonlinearKHR = ColorSpaceSrgbNonlinearKHR,
-
-    [SupportedApiProfile(
-        "vulkan",
-        ["VK_EXT_swapchain_colorspace"],
-        ImpliesSets = ["VK_KHR_surface"]
-    )]
-    ColorSpaceDciP3LinearEXT = ColorSpaceDisplayP3LinearEXT,
+    DisplayNativeAMD = 1000213000,
 }

sources/Vulkan/Vulkan/Enums/PipelineStageFlags2.gen.cs

@@ -176,12 +176,6 @@ public enum DebugReportObjectTypeEXT : uint
     )]
     BufferCollectionFuchsiaEXT = 1000366000,
 
-    [SupportedApiProfile("vulkan", ["VK_EXT_debug_report"])]
-    DebugReportEXT = DebugReportCallbackExtEXT,
-
-    [SupportedApiProfile("vulkan", ["VK_EXT_debug_report"])]
-    ValidationCacheEXT = ValidationCacheExtEXT,
-
     [SupportedApiProfile(
         "vulkan",
         ["VK_EXT_debug_report", "VK_KHR_descriptor_update_template"],

sources/Vulkan/Vulkan/Vulkan/ColorSpaceKHR.gen.cs

@@ -2292,17 +2292,6 @@ public enum Format : uint
     )]
     A4B4G4R4UnormPack16EXT = A4B4G4R4UnormPack16,
 
-    [SupportedApiProfile(
-        "vulkan",
-        ["VK_NV_optical_flow"],
-        ImpliesSets = [
-            "VK_KHR_format_feature_flags2+VK_KHR_synchronization2+VK_KHR_get_physical_device_properties2",
-            "VK_KHR_format_feature_flags2+VK_KHR_synchronization2+VK_VERSION_1_1",
-            "VK_VERSION_1_3",
-        ]
-    )]
-    R16G16S10X5NV = R16G16Sfixed5NV,
-
     [SupportedApiProfile(
         "vulkan",
         ["VK_KHR_maintenance5"],