dotnet · Exanite · May 23, 2025 · May 23, 2025 · May 23, 2025 · May 23, 2025
@@ -13,3 +13,9 @@
 [submodule "eng/submodules/silk.net-2.x"]
 	path = eng/submodules/silk.net-2.x
 	url = https://github.com/dotnet/Silk.NET
+[submodule "eng/submodules/vulkan"]
+	path = eng/submodules/vulkan
+	url = https://github.com/KhronosGroup/Vulkan-Docs.git
+[submodule "eng/submodules/vulkan-headers"]
+	path = eng/submodules/vulkan-headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git
@@ -102,6 +102,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windowing", "Windowing", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing", "sources\Windowing\Windowing\Silk.NET.Windowing.csproj", "{EF07CBB5-D253-4CA9-A5DA-8B3DF2B0DF8E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vulkan", "Vulkan", "{5E20252F-E2A0-46C9-BBEF-4CE5C96D0E07}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Vulkan", "sources\Vulkan\Vulkan\Silk.NET.Vulkan.csproj", "{E5E8FFBF-1319-4D33-B084-E732656E8A04}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -168,6 +172,10 @@ Global
 		{EF07CBB5-D253-4CA9-A5DA-8B3DF2B0DF8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF07CBB5-D253-4CA9-A5DA-8B3DF2B0DF8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF07CBB5-D253-4CA9-A5DA-8B3DF2B0DF8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5E8FFBF-1319-4D33-B084-E732656E8A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E8FFBF-1319-4D33-B084-E732656E8A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E8FFBF-1319-4D33-B084-E732656E8A04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E8FFBF-1319-4D33-B084-E732656E8A04}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -200,6 +208,8 @@ Global
 		{F16C0AB9-DE7E-4C09-9EE9-DAA8B8E935A6} = {EC4D7B06-D277-4411-BD7B-71A6D37683F0}
 		{FE4414F8-5370-445D-9F24-C3AD3223F299} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
 		{EF07CBB5-D253-4CA9-A5DA-8B3DF2B0DF8E} = {FE4414F8-5370-445D-9F24-C3AD3223F299}
+		{5E20252F-E2A0-46C9-BBEF-4CE5C96D0E07} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{E5E8FFBF-1319-4D33-B084-E732656E8A04} = {5E20252F-E2A0-46C9-BBEF-4CE5C96D0E07}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {78D2CF6A-60A1-43E3-837B-00B73C9DA384}

@@ -0,0 +1,5 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// Ported from the Vulkan headers and corresponding dependencies.
+// Original source is Copyright 2015-2023 The Khronos Group Inc. Licensed under the MIT license.
@@ -0,0 +1,5 @@
+--remap
+int32_t=int
+uint32_t=uint
+int64_t=long
+uint64_t=ulong
@@ -0,0 +1,144 @@
+@../remap-stdint.rsp
+--remap
+VkFramebufferCreateFlagBits=VkFramebufferCreateFlags
+VkRenderPassCreateFlagBits=VkRenderPassCreateFlags
+VkSamplerCreateFlagBits=VkSamplerCreateFlags
+VkPipelineLayoutCreateFlagBits=VkPipelineLayoutCreateFlags
+VkPipelineCacheCreateFlagBits=VkPipelineCacheCreateFlags
+VkPipelineDepthStencilStateCreateFlagBits=VkPipelineDepthStencilStateCreateFlags
+VkPipelineColorBlendStateCreateFlagBits=VkPipelineColorBlendStateCreateFlags
+VkPipelineShaderStageCreateFlagBits=VkPipelineShaderStageCreateFlags
+VkDescriptorSetLayoutCreateFlagBits=VkDescriptorSetLayoutCreateFlags
+VkInstanceCreateFlagBits=VkInstanceCreateFlags
+VkDeviceQueueCreateFlagBits=VkDeviceQueueCreateFlags
+VkQueueFlagBits=VkQueueFlags
+VkMemoryPropertyFlagBits=VkMemoryPropertyFlags
+VkMemoryHeapFlagBits=VkMemoryHeapFlags
+VkAccessFlagBits=VkAccessFlags
+VkBufferUsageFlagBits=VkBufferUsageFlags
+VkBufferCreateFlagBits=VkBufferCreateFlags
+VkShaderStageFlagBits=VkShaderStageFlags
+VkImageUsageFlagBits=VkImageUsageFlags
+VkImageCreateFlagBits=VkImageCreateFlags
+VkImageViewCreateFlagBits=VkImageViewCreateFlags
+VkPipelineCreateFlagBits=VkPipelineCreateFlags
+VkColorComponentFlagBits=VkColorComponentFlags
+VkFenceCreateFlagBits=VkFenceCreateFlags
+VkFormatFeatureFlagBits=VkFormatFeatureFlags
+VkQueryControlFlagBits=VkQueryControlFlags
+VkQueryResultFlagBits=VkQueryResultFlags
+VkEventCreateFlagBits=VkEventCreateFlags
+VkCommandPoolCreateFlagBits=VkCommandPoolCreateFlags
+VkCommandPoolResetFlagBits=VkCommandPoolResetFlags
+VkCommandBufferResetFlagBits=VkCommandBufferResetFlags
+VkCommandBufferUsageFlagBits=VkCommandBufferUsageFlags
+VkQueryPipelineStatisticFlagBits=VkQueryPipelineStatisticFlags
+VkMemoryMapFlagBits=VkMemoryMapFlags
+VkMemoryUnmapFlagBits=VkMemoryUnmapFlags
+VkImageAspectFlagBits=VkImageAspectFlags
+VkSparseMemoryBindFlagBits=VkSparseMemoryBindFlags
+VkSparseImageFormatFlagBits=VkSparseImageFormatFlags
+VkSubpassDescriptionFlagBits=VkSubpassDescriptionFlags
+VkPipelineStageFlagBits=VkPipelineStageFlags
+VkSampleCountFlagBits=VkSampleCountFlags
+VkAttachmentDescriptionFlagBits=VkAttachmentDescriptionFlags
+VkStencilFaceFlagBits=VkStencilFaceFlags
+VkCullModeFlagBits=VkCullModeFlags
+VkDescriptorPoolCreateFlagBits=VkDescriptorPoolCreateFlags
+VkDependencyFlagBits=VkDependencyFlags
+VkSubgroupFeatureFlagBits=VkSubgroupFeatureFlags
+VkIndirectCommandsLayoutUsageFlagBitsNV=VkIndirectCommandsLayoutUsageFlagsNV
+VkIndirectStateFlagBitsNV=VkIndirectStateFlagsNV
+VkGeometryFlagBitsKHR=VkGeometryFlagsKHR
+VkGeometryInstanceFlagBitsKHR=VkGeometryInstanceFlagsKHR
+VkClusterAccelerationStructureGeometryFlagBitsNV=VkClusterAccelerationStructureGeometryFlagsNV
+VkClusterAccelerationStructureClusterFlagBitsNV=VkClusterAccelerationStructureClusterFlagsNV
+VkClusterAccelerationStructureAddressResolutionFlagBitsNV=VkClusterAccelerationStructureAddressResolutionFlagsNV
+VkBuildAccelerationStructureFlagBitsKHR=VkBuildAccelerationStructureFlagsKHR
+VkAccelerationStructureCreateFlagBitsKHR=VkAccelerationStructureCreateFlagsKHR
+VkPipelineCreationFeedbackFlagBits=VkPipelineCreationFeedbackFlags
+VkPerformanceCounterDescriptionFlagBitsKHR=VkPerformanceCounterDescriptionFlagsKHR
+VkAcquireProfilingLockFlagBitsKHR=VkAcquireProfilingLockFlagsKHR
+VkSemaphoreWaitFlagBits=VkSemaphoreWaitFlags
+VkPipelineCompilerControlFlagBitsAMD=VkPipelineCompilerControlFlagsAMD
+VkShaderCorePropertiesFlagBitsAMD=VkShaderCorePropertiesFlagsAMD
+VkDeviceDiagnosticsConfigFlagBitsNV=VkDeviceDiagnosticsConfigFlagsNV
+VkRefreshObjectFlagBitsKHR=VkRefreshObjectFlagsKHR
+VkRenderingFlagBits=VkRenderingFlags
+VkBuildMicromapFlagBitsEXT=VkBuildMicromapFlagsEXT
+VkMicromapCreateFlagBitsEXT=VkMicromapCreateFlagsEXT
+VkIndirectCommandsLayoutUsageFlagBitsEXT=VkIndirectCommandsLayoutUsageFlagsEXT
+VkIndirectCommandsInputModeFlagBitsEXT=VkIndirectCommandsInputModeFlagsEXT
+VkCompositeAlphaFlagBitsKHR=VkCompositeAlphaFlagsKHR
+VkDisplayPlaneAlphaFlagBitsKHR=VkDisplayPlaneAlphaFlagsKHR
+VkSurfaceTransformFlagBitsKHR=VkSurfaceTransformFlagsKHR
+VkSwapchainCreateFlagBitsKHR=VkSwapchainCreateFlagsKHR
+VkPeerMemoryFeatureFlagBits=VkPeerMemoryFeatureFlags
+VkMemoryAllocateFlagBits=VkMemoryAllocateFlags
+VkDeviceGroupPresentModeFlagBitsKHR=VkDeviceGroupPresentModeFlagsKHR
+VkDebugReportFlagBitsEXT=VkDebugReportFlagsEXT
+VkExternalMemoryHandleTypeFlagBitsNV=VkExternalMemoryHandleTypeFlagsNV
+VkClusterAccelerationStructureIndexFormatFlagBitsNV=VkClusterAccelerationStructureIndexFormatFlagsNV
+VkExternalMemoryFeatureFlagBitsNV=VkExternalMemoryFeatureFlagsNV
+VkExternalMemoryHandleTypeFlagBits=VkExternalMemoryHandleTypeFlags
+VkExternalMemoryFeatureFlagBits=VkExternalMemoryFeatureFlags
+VkExternalSemaphoreHandleTypeFlagBits=VkExternalSemaphoreHandleTypeFlags
+VkExternalSemaphoreFeatureFlagBits=VkExternalSemaphoreFeatureFlags
+VkSemaphoreImportFlagBits=VkSemaphoreImportFlags
+VkExternalFenceHandleTypeFlagBits=VkExternalFenceHandleTypeFlags
+VkExternalFenceFeatureFlagBits=VkExternalFenceFeatureFlags
+VkFenceImportFlagBits=VkFenceImportFlags
+VkSurfaceCounterFlagBitsEXT=VkSurfaceCounterFlagsEXT
+VkDebugUtilsMessageSeverityFlagBitsEXT=VkDebugUtilsMessageSeverityFlagsEXT
+VkDebugUtilsMessageTypeFlagBitsEXT=VkDebugUtilsMessageTypeFlagsEXT
+VkDescriptorBindingFlagBits=VkDescriptorBindingFlags
+VkConditionalRenderingFlagBitsEXT=VkConditionalRenderingFlagsEXT
+VkResolveModeFlagBits=VkResolveModeFlags
+VkSwapchainImageUsageFlagBitsANDROID=VkSwapchainImageUsageFlagsANDROID
+VkToolPurposeFlagBits=VkToolPurposeFlags
+VkSubmitFlagBits=VkSubmitFlags
+VkHostImageCopyFlagBits=VkHostImageCopyFlags
+VkPartitionedAccelerationStructureInstanceFlagBitsNV=VkPartitionedAccelerationStructureInstanceFlagsNV
+VkImageConstraintsInfoFlagBitsFUCHSIA=VkImageConstraintsInfoFlagsFUCHSIA
+VkGraphicsPipelineLibraryFlagBitsEXT=VkGraphicsPipelineLibraryFlagsEXT
+VkImageCompressionFlagBitsEXT=VkImageCompressionFlagsEXT
+VkImageCompressionFixedRateFlagBitsEXT=VkImageCompressionFixedRateFlagsEXT
+VkExportMetalObjectTypeFlagBitsEXT=VkExportMetalObjectTypeFlagsEXT
+VkDeviceAddressBindingFlagBitsEXT=VkDeviceAddressBindingFlagsEXT
+VkOpticalFlowGridSizeFlagBitsNV=VkOpticalFlowGridSizeFlagsNV
+VkOpticalFlowUsageFlagBitsNV=VkOpticalFlowUsageFlagsNV
+VkOpticalFlowSessionCreateFlagBitsNV=VkOpticalFlowSessionCreateFlagsNV
+VkOpticalFlowExecuteFlagBitsNV=VkOpticalFlowExecuteFlagsNV
+VkFrameBoundaryFlagBitsEXT=VkFrameBoundaryFlagsEXT
+VkPresentScalingFlagBitsEXT=VkPresentScalingFlagsEXT
+VkPresentGravityFlagBitsEXT=VkPresentGravityFlagsEXT
+VkShaderCreateFlagBitsEXT=VkShaderCreateFlagsEXT
+VkTileShadingRenderPassFlagBitsQCOM=VkTileShadingRenderPassFlagsQCOM
+VkVideoCodecOperationFlagBitsKHR=VkVideoCodecOperationFlagsKHR
+VkVideoCapabilityFlagBitsKHR=VkVideoCapabilityFlagsKHR
+VkVideoSessionCreateFlagBitsKHR=VkVideoSessionCreateFlagsKHR
+VkVideoSessionParametersCreateFlagBitsKHR=VkVideoSessionParametersCreateFlagsKHR
+VkVideoCodingControlFlagBitsKHR=VkVideoCodingControlFlagsKHR
+VkVideoDecodeUsageFlagBitsKHR=VkVideoDecodeUsageFlagsKHR
+VkVideoDecodeCapabilityFlagBitsKHR=VkVideoDecodeCapabilityFlagsKHR
+VkVideoDecodeH264PictureLayoutFlagBitsKHR=VkVideoDecodeH264PictureLayoutFlagsKHR
+VkVideoEncodeFlagBitsKHR=VkVideoEncodeFlagsKHR
+VkVideoEncodeUsageFlagBitsKHR=VkVideoEncodeUsageFlagsKHR
+VkVideoEncodeContentFlagBitsKHR=VkVideoEncodeContentFlagsKHR
+VkVideoEncodeCapabilityFlagBitsKHR=VkVideoEncodeCapabilityFlagsKHR
+VkVideoEncodeFeedbackFlagBitsKHR=VkVideoEncodeFeedbackFlagsKHR
+VkVideoEncodeRateControlModeFlagBitsKHR=VkVideoEncodeRateControlModeFlagsKHR
+VkVideoChromaSubsamplingFlagBitsKHR=VkVideoChromaSubsamplingFlagsKHR
+VkVideoComponentBitDepthFlagBitsKHR=VkVideoComponentBitDepthFlagsKHR
+VkVideoEncodeH264CapabilityFlagBitsKHR=VkVideoEncodeH264CapabilityFlagsKHR
+VkVideoEncodeH264StdFlagBitsKHR=VkVideoEncodeH264StdFlagsKHR
+VkVideoEncodeH264RateControlFlagBitsKHR=VkVideoEncodeH264RateControlFlagsKHR
+VkVideoEncodeH265CapabilityFlagBitsKHR=VkVideoEncodeH265CapabilityFlagsKHR
+VkVideoEncodeH265StdFlagBitsKHR=VkVideoEncodeH265StdFlagsKHR
+VkVideoEncodeH265RateControlFlagBitsKHR=VkVideoEncodeH265RateControlFlagsKHR
+VkVideoEncodeH265CtbSizeFlagBitsKHR=VkVideoEncodeH265CtbSizeFlagsKHR
+VkVideoEncodeH265TransformBlockSizeFlagBitsKHR=VkVideoEncodeH265TransformBlockSizeFlagsKHR
+VkVideoEncodeAV1CapabilityFlagBitsKHR=VkVideoEncodeAV1CapabilityFlagsKHR
+VkVideoEncodeAV1StdFlagBitsKHR=VkVideoEncodeAV1StdFlagsKHR
+VkVideoEncodeAV1RateControlFlagBitsKHR=VkVideoEncodeAV1RateControlFlagsKHR
+VkVideoEncodeAV1SuperblockSizeFlagBitsKHR=VkVideoEncodeAV1SuperblockSizeFlagsKHR
@@ -0,0 +1,13 @@
+@../../common.rsp
+--define-macro
+TODO_DEFINE_MACROS=HERE
+--headerFile
+../header.txt
+--include-directory
+../../../submodules/vulkan-headers/include
+# TODO: Remove this
+/usr/lib/clang/19/include
+--with-callconv
+*=Winapi
+--with-librarypath
+*=vulkan
@@ -0,0 +1,17 @@
+@../settings.rsp
+@../remap.rsp
+--exclude
+VK_NULL_HANDLE
+--file
+vulkan-vulkan.h
+--methodClassName
+Vulkan
+--namespace
+Silk.NET.Vulkan
+--output
+../../../../sources/Vulkan/Vulkan
+--test-output
+../../../../tests/Vulkan/Vulkan
+--traverse
+../../../submodules/vulkan-headers/include/vulkan/vulkan.h
+../../../submodules/vulkan-headers/include/vulkan/vulkan_core.h
@@ -0,0 +1 @@
+#include <vulkan/vulkan.h>
@@ -54,8 +54,10 @@
         "InputSourceRoot": "sources/SDL",
         "InputTestRoot": "tests/SDL"
       },
+      "ExtractNestedTyping": {
+        "GenerateEmptyStructsForMissingHandleTypes": true
+      },
       "TransformHandles": {
-        "AssumeMissingTypesOpaque": true,
         "UseDSL": true
       },
       "TransformFunctions": {
@@ -156,6 +158,60 @@
           "GLboolean": null
         }
       }
+    },
+    "Vulkan": {
+      "SourceProject": "sources/Vulkan/Vulkan/Silk.NET.Vulkan.csproj",
+      "Solution": "Silk.NET.sln",
+      "DefaultLicenseHeader": "eng/silktouch/header.txt",
+      "Mods": [
+        "AddIncludes",
+        "ClangScraper",
+        "AddApiProfiles",
+        "MixKhronosData",
+        "ExtractNestedTyping",
+        "PrettifyNames",
+        "TransformHandles",
+        "TransformFunctions",
+        "TransformProperties",
+        "AddVTables"
+      ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/silktouch/vulkan/**/generate.rsp"
+        ],
+        "InputSourceRoot": "sources/Vulkan",
+        "InputTestRoot": "tests/Vulkan"
+      },
+      "AddApiProfiles": {
+        "Profiles": [
+          {
+            "Profile": "vulkan",
+            "SourceSubdirectory": "vulkan"
+          }
+        ]
+      },
+      "MixKhronosData": {
+        "SpecPath": "eng/submodules/vulkan/xml/vk.xml",
+        "Namespace": "Silk.NET.Vulkan"
+      },
+      "ExtractNestedTyping": {
+        "GenerateEmptyStructsForMissingHandleTypes": true
+      },
+      "PrettifyNames": {
+        "LongAcronymThreshold": 4,
+        "GlobalPrefixHint": "vk"
+      },
+      "AddVTables": {
+        "VTables": [
+          {
+            "Kind": "DllImport",
+            "IsDefault": true
+          }
+        ]
+      },
+      "TransformHandles": {
+        "UseDSL": true
+      }
     }
   }
 }
@@ -87,42 +87,64 @@ public async Task InitializeAsync()
             throw new InvalidOperationException("No solution provided in configuration.");
         }
 
-        var solution = await parent.OpenSolutionAsync(
-            Path.GetFullPath(_cfg.Solution, ConfigurationDirectory)
-        );
-
         if (_cfg?.SourceProject is null)
         {
             throw new InvalidOperationException("No source project provided in configuration.");
         }
 
-        // First locate the source project
-        var projectFile = Path.GetFullPath(_cfg.SourceProject, ConfigurationDirectory);
+        var solutionPath = Path.GetFullPath(_cfg.Solution, ConfigurationDirectory);
+        var solution = await parent.OpenSolutionAsync(solutionPath);
+
+        // Locate source project
+        var projectPath = Path.GetFullPath(_cfg.SourceProject, ConfigurationDirectory);
         _srcProject = solution
             .Projects.Where(x => x.FilePath is not null)
             .FirstOrDefault(x =>
-                Path.GetFullPath(x.FilePath!, ConfigurationDirectory) == projectFile
+                Path.GetFullPath(x.FilePath!, ConfigurationDirectory) == projectPath
             );
+
         if (_srcProject is null)
         {
             throw new InvalidOperationException("Failed to locate source project.");
         }
 
-        // Wipe the slate clean. The generator should only be able to see generated code.
-        // TODO maybe one day we'll lift this restriction? I couldn't think of a reason not to have it, but there's also not many to have it.
-        SourceProject = _srcProject.RemoveDocuments([.. _srcProject.DocumentIds]);
+        // Remove all documents from the output directory
+        // This is to ensure that existing code is not used as the input for newly generated code,
+        // which would cause a cycle.
+        // Note that this does not remove all documents from the project, such as the global usings files.
+        SourceProject = _srcProject.RemoveDocuments([..GetDocumentsInProjectDirectory(_srcProject)]);
         solution = _srcProject.Solution;
+
+        // Do the same for the test project
         if (_cfg.TestProject is not null)
         {
-            var testProjectFile = Path.GetFullPath(_cfg.TestProject, ConfigurationDirectory);
+            // Locate test project
+            var testProjectPath = Path.GetFullPath(_cfg.TestProject, ConfigurationDirectory);
             _testProject = solution
                 .Projects.Where(x => x.FilePath is not null)
                 .FirstOrDefault(x =>
-                    Path.GetFullPath(x.FilePath!, ConfigurationDirectory) == testProjectFile
+                    Path.GetFullPath(x.FilePath!, ConfigurationDirectory) == testProjectPath
                 );
-            TestProject = _testProject?.RemoveDocuments([.. _testProject.DocumentIds]);
+
+            // Remove all documents from the output directory
+            TestProject = _testProject?.RemoveDocuments([..GetDocumentsInProjectDirectory(_testProject)]);
             solution = _testProject?.Solution ?? solution;
         }
+
+        return;
+
+        static IEnumerable<DocumentId> GetDocumentsInProjectDirectory(Project project)
+        {
+            var projectDirectory = Path.GetDirectoryName(project.FilePath);
+            if (projectDirectory == null)
+            {
+                throw new InvalidOperationException("Project is not part of a directory");
+            }
+
+            return project.Documents
+                .Where(d => d.FilePath?.StartsWith(projectDirectory) ?? false)
+                .Select(d => d.Id);
+        }
     }
 
     private string ObtainCacheKey()