Fix Flags types being typed as uint/ulong instead of the proper enum type

Author: Exanite

.silktouch/ce8a69a66cd3bd3f.stout

@@ -1906,9 +1906,12 @@ private class EnumRewriterPhase1(JobData job, ILogger logger) : CSharpSyntaxRewr
     /// <summary>
     /// 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.
     /// </summary>
     private class EnumRewriterPhase2(JobData job) : 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();
@@ -1925,7 +1928,53 @@ private class EnumRewriterPhase2(JobData job) : CSharpSyntaxRewriter(true)
             return base.VisitEnumDeclaration(node);
         }
 
-        public override SyntaxNode? VisitIdentifierName(IdentifierNameSyntax node) => IdentifierName(node.Identifier.ToString().Replace("FlagBits", "Flags"));
+        public override SyntaxNode? VisitFieldDeclaration(FieldDeclarationSyntax node)
+        {
+            if (!TryGetManagedEnumType(node.AttributeLists, out var managedName))
+            {
+                return base.VisitFieldDeclaration(node);
+            }
+
+            return base.VisitFieldDeclaration(node.WithDeclaration(node.Declaration.WithType(ParseTypeName(managedName))));
+        }
+
+        public override SyntaxNode? VisitParameter(ParameterSyntax node)
+        {
+            if (!TryGetManagedEnumType(node.AttributeLists, out var managedName))
+            {
+                return base.VisitParameter(node);
+            }
+
+            return base.VisitParameter(node.WithType(ParseTypeName(managedName)));
+        }
+
+        /// <summary>
+        /// Parses the attribute list and uses the [NativeTypeName] attribute to determine the correct enum type.
+        /// </summary>
+        /// <remarks>
+        /// This method is intentionally implemented in a naive manner to keep things simple.
+        /// </remarks>
+        private bool TryGetManagedEnumType(SyntaxList<AttributeListSyntax> attributes, [NotNullWhen(true)] out string? managedName)
+        {
+            managedName = null;
+
+            // ClangSharp does not know how to handle FlagBits and Flags types
+            // Because of this ClangSharp outputs Flags types as uints or ulongs
+            // We have to look at the NativeTypeName in order to determine the correct type
+            var nativeName = attributes.GetNativeTypeName()?.Replace("FlagBits", "Flags");
+            if (nativeName == null || !nativeName.Contains("Flags"))
+            {
+                return false;
+            }
+
+            var nativeNameParts = nativeName.Split(' ');
+            var typeName = nativeName.StartsWith("const ") ? nativeNameParts[1] : nativeNameParts[0];
+            var pointerDimension = nativeName.Count(c => c == '*');
+
+            managedName = typeName + new string('*', pointerDimension);
+
+            return true;
+        }
     }
 
     [SuppressMessage("ReSharper", "MoveLocalFunctionAfterJumpStatement")]

sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs

@@ -52,7 +52,7 @@ public unsafe partial struct AccelerationStructureBuildGeometryInfoKHR
             "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
         ]
     )]
-    public uint Flags;
+    public BuildAccelerationStructureFlagsKHR Flags;
 
     [SupportedApiProfile(
         "vulkan",

sources/Vulkan/Vulkan/Vulkan/AccelerationStructureBuildGeometryInfoKHR.gen.cs

@@ -42,7 +42,7 @@ public unsafe partial struct AccelerationStructureCreateInfoKHR
             "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
         ]
     )]
-    public uint CreateFlags;
+    public AccelerationStructureCreateFlagsKHR CreateFlags;
 
     [NativeTypeName("VkBuffer")]
     [SupportedApiProfile(

sources/Vulkan/Vulkan/Vulkan/AccelerationStructureCreateInfoKHR.gen.cs

@@ -62,5 +62,5 @@ public unsafe partial struct AccelerationStructureGeometryKHR
             "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
         ]
     )]
-    public uint Flags;
+    public GeometryFlagsKHR Flags;
 }

sources/Vulkan/Vulkan/Vulkan/AccelerationStructureGeometryKHR.gen.cs

@@ -53,7 +53,7 @@ public unsafe partial struct AccelerationStructureInfoNV
             "VK_VERSION_1_1",
         ]
     )]
-    public uint Flags;
+    public VkBuildAccelerationStructureFlagsNV Flags;
 
     [NativeTypeName("uint32_t")]
     [SupportedApiProfile(

sources/Vulkan/Vulkan/Vulkan/AccelerationStructureInfoNV.gen.cs

@@ -41,5 +41,5 @@ public unsafe partial struct AccelerationStructureMotionInfoNV
         ["VK_NV_ray_tracing_motion_blur"],
         ImpliesSets = ["VK_KHR_ray_tracing_pipeline"]
     )]
-    public uint Flags;
+    public VkAccelerationStructureMotionInfoFlagsNV Flags;
 }

sources/Vulkan/Vulkan/Vulkan/AccelerationStructureMotionInfoNV.gen.cs

@@ -25,7 +25,7 @@ public partial struct AccelerationStructureMotionInstanceNV
         ["VK_NV_ray_tracing_motion_blur"],
         ImpliesSets = ["VK_KHR_ray_tracing_pipeline"]
     )]
-    public uint Flags;
+    public VkAccelerationStructureMotionInstanceFlagsNV Flags;
 
     [SupportedApiProfile(
         "vulkan",

sources/Vulkan/Vulkan/Vulkan/AccelerationStructureMotionInstanceNV.gen.cs

@@ -42,7 +42,7 @@ public unsafe partial struct AcquireProfilingLockInfoKHR
             "VK_KHR_performance_query+VK_VERSION_1_1",
         ]
     )]
-    public uint Flags;
+    public AcquireProfilingLockFlagsKHR Flags;
 
     [NativeTypeName("uint64_t")]
     [SupportedApiProfile(

sources/Vulkan/Vulkan/Vulkan/AcquireProfilingLockInfoKHR.gen.cs

@@ -18,7 +18,7 @@ public partial struct AttachmentDescription
         ["VK_VERSION_1_0", "VK_VERSION_1_1", "VK_VERSION_1_2", "VK_VERSION_1_3", "VK_VERSION_1_4"],
         MinVersion = "1.0"
     )]
-    public uint Flags;
+    public AttachmentDescriptionFlags Flags;
 
     [SupportedApiProfile(
         "vulkan",