Remove ICD from generation

vendor/vulkan/_gen/create_vulkan_odin_wrapper.py

@@ -9,8 +9,8 @@ import math
 file_and_urls = [
     ("vk_platform.h",  'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_platform.h',  True),
     ("vulkan_core.h",  'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_core.h',  False),
-    ("vk_layer.h",     'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_layer.h',     False),
-    ("vk_icd.h",       'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_icd.h',       False),
+    ("vk_layer.h",     'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_layer.h',     True),
+    ("vk_icd.h",       'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_icd.h',       True),
     ("vulkan_win32.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_win32.h', False),
     ("vulkan_metal.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_metal.h', False),
     ("vulkan_macos.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_macos.h', False),

vendor/vulkan/enums.odin

@@ -2859,28 +2859,6 @@ ShaderGroupShaderKHR :: enum c.int {
 	INTERSECTION = 3,
 }
 
-NegotiateLayerStructType :: enum c.int {
-}
-
-LayerFunction_ :: enum c.int {
-	LAYER_LINK_INFO                     = 0,
-	LOADER_DATA_CALLBACK                = 1,
-	LOADER_LAYER_CREATE_DEVICE_CALLBACK = 2,
-	LOADER_FEATURES                     = 3,
-}
-
-LoaderFeastureFlags :: distinct bit_set[LoaderFeastureFlag; Flags];
-LoaderFeastureFlag :: enum Flags {
-	LOADER_FEATURE_PHYSICAL_DEVICE_SORTING = 0,
-}
-
-ChainType :: enum c.int {
-	UNKNOWN                                 = 0,
-	ENUMERATE_INSTANCE_EXTENSION_PROPERTIES = 1,
-	ENUMERATE_INSTANCE_LAYER_PROPERTIES     = 2,
-	ENUMERATE_INSTANCE_VERSION              = 3,
-}
-
 FullScreenExclusiveEXT :: enum c.int {
 	DEFAULT                = 0,
 	ALLOWED                = 1,
@@ -2888,87 +2866,85 @@ FullScreenExclusiveEXT :: enum c.int {
 	APPLICATION_CONTROLLED = 3,
 }
 
-PipelineDynamicStateCreateFlags                      :: distinct bit_set[PipelineDynamicStateCreateFlag; Flags];
-PipelineDynamicStateCreateFlag                       :: enum u32 {};
-PipelineViewportStateCreateFlags                     :: distinct bit_set[PipelineViewportStateCreateFlag; Flags];
-PipelineViewportStateCreateFlag                      :: enum u32 {};
+PipelineLayoutCreateFlags                            :: distinct bit_set[PipelineLayoutCreateFlag; Flags];
+PipelineLayoutCreateFlag                             :: enum u32 {};
+MemoryMapFlags                                       :: distinct bit_set[MemoryMapFlag; Flags];
+MemoryMapFlag                                        :: enum u32 {};
+PipelineTessellationStateCreateFlags                 :: distinct bit_set[PipelineTessellationStateCreateFlag; Flags];
+PipelineTessellationStateCreateFlag                  :: enum u32 {};
+DebugUtilsMessengerCreateFlagsEXT                    :: distinct bit_set[DebugUtilsMessengerCreateFlagEXT; Flags];
+DebugUtilsMessengerCreateFlagEXT                     :: enum u32 {};
+Win32SurfaceCreateFlagsKHR                           :: distinct bit_set[Win32SurfaceCreateFlagKHR; Flags];
+Win32SurfaceCreateFlagKHR                            :: enum u32 {};
+PipelineDepthStencilStateCreateFlags                 :: distinct bit_set[PipelineDepthStencilStateCreateFlag; Flags];
+PipelineDepthStencilStateCreateFlag                  :: enum u32 {};
+PipelineColorBlendStateCreateFlags                   :: distinct bit_set[PipelineColorBlendStateCreateFlag; Flags];
+PipelineColorBlendStateCreateFlag                    :: enum u32 {};
 PipelineDiscardRectangleStateCreateFlagsEXT          :: distinct bit_set[PipelineDiscardRectangleStateCreateFlagEXT; Flags];
 PipelineDiscardRectangleStateCreateFlagEXT           :: enum u32 {};
 DescriptorUpdateTemplateCreateFlags                  :: distinct bit_set[DescriptorUpdateTemplateCreateFlag; Flags];
 DescriptorUpdateTemplateCreateFlag                   :: enum u32 {};
-AccelerationStructureMotionInstanceFlagsNV           :: distinct bit_set[AccelerationStructureMotionInstanceFlagNV; Flags];
-AccelerationStructureMotionInstanceFlagNV            :: enum u32 {};
+QueryPoolCreateFlags                                 :: distinct bit_set[QueryPoolCreateFlag; Flags];
+QueryPoolCreateFlag                                  :: enum u32 {};
 PipelineRasterizationConservativeStateCreateFlagsEXT :: distinct bit_set[PipelineRasterizationConservativeStateCreateFlagEXT; Flags];
 PipelineRasterizationConservativeStateCreateFlagEXT  :: enum u32 {};
-PipelineRasterizationDepthClipStateCreateFlagsEXT    :: distinct bit_set[PipelineRasterizationDepthClipStateCreateFlagEXT; Flags];
-PipelineRasterizationDepthClipStateCreateFlagEXT     :: enum u32 {};
-ValidationCacheCreateFlagsEXT                        :: distinct bit_set[ValidationCacheCreateFlagEXT; Flags];
-ValidationCacheCreateFlagEXT                         :: enum u32 {};
-AccelerationStructureMotionInfoFlagsNV               :: distinct bit_set[AccelerationStructureMotionInfoFlagNV; Flags];
-AccelerationStructureMotionInfoFlagNV                :: enum u32 {};
-MacOSSurfaceCreateFlagsMVK                           :: distinct bit_set[MacOSSurfaceCreateFlagMVK; Flags];
-MacOSSurfaceCreateFlagMVK                            :: enum u32 {};
-MetalSurfaceCreateFlagsEXT                           :: distinct bit_set[MetalSurfaceCreateFlagEXT; Flags];
-MetalSurfaceCreateFlagEXT                            :: enum u32 {};
-PipelineInputAssemblyStateCreateFlags                :: distinct bit_set[PipelineInputAssemblyStateCreateFlag; Flags];
-PipelineInputAssemblyStateCreateFlag                 :: enum u32 {};
-PipelineTessellationStateCreateFlags                 :: distinct bit_set[PipelineTessellationStateCreateFlag; Flags];
-PipelineTessellationStateCreateFlag                  :: enum u32 {};
-PipelineCoverageModulationStateCreateFlagsNV         :: distinct bit_set[PipelineCoverageModulationStateCreateFlagNV; Flags];
-PipelineCoverageModulationStateCreateFlagNV          :: enum u32 {};
-CommandPoolTrimFlags                                 :: distinct bit_set[CommandPoolTrimFlag; Flags];
-CommandPoolTrimFlag                                  :: enum u32 {};
-DisplayModeCreateFlagsKHR                            :: distinct bit_set[DisplayModeCreateFlagKHR; Flags];
-DisplayModeCreateFlagKHR                             :: enum u32 {};
+PipelineCoverageToColorStateCreateFlagsNV            :: distinct bit_set[PipelineCoverageToColorStateCreateFlagNV; Flags];
+PipelineCoverageToColorStateCreateFlagNV             :: enum u32 {};
+BufferViewCreateFlags                                :: distinct bit_set[BufferViewCreateFlag; Flags];
+BufferViewCreateFlag                                 :: enum u32 {};
 PipelineRasterizationStateStreamCreateFlagsEXT       :: distinct bit_set[PipelineRasterizationStateStreamCreateFlagEXT; Flags];
 PipelineRasterizationStateStreamCreateFlagEXT        :: enum u32 {};
 DisplaySurfaceCreateFlagsKHR                         :: distinct bit_set[DisplaySurfaceCreateFlagKHR; Flags];
 DisplaySurfaceCreateFlagKHR                          :: enum u32 {};
-QueryPoolCreateFlags                                 :: distinct bit_set[QueryPoolCreateFlag; Flags];
-QueryPoolCreateFlag                                  :: enum u32 {};
-PipelineColorBlendStateCreateFlags                   :: distinct bit_set[PipelineColorBlendStateCreateFlag; Flags];
-PipelineColorBlendStateCreateFlag                    :: enum u32 {};
-LoaderFeatureFlags                                   :: distinct bit_set[LoaderFeatureFlag; Flags];
-LoaderFeatureFlag                                    :: enum u32 {};
-PipelineCoverageReductionStateCreateFlagsNV          :: distinct bit_set[PipelineCoverageReductionStateCreateFlagNV; Flags];
-PipelineCoverageReductionStateCreateFlagNV           :: enum u32 {};
 DeviceCreateFlags                                    :: distinct bit_set[DeviceCreateFlag; Flags];
 DeviceCreateFlag                                     :: enum u32 {};
-HeadlessSurfaceCreateFlagsEXT                        :: distinct bit_set[HeadlessSurfaceCreateFlagEXT; Flags];
-HeadlessSurfaceCreateFlagEXT                         :: enum u32 {};
+PipelineCoverageModulationStateCreateFlagsNV         :: distinct bit_set[PipelineCoverageModulationStateCreateFlagNV; Flags];
+PipelineCoverageModulationStateCreateFlagNV          :: enum u32 {};
 PipelineMultisampleStateCreateFlags                  :: distinct bit_set[PipelineMultisampleStateCreateFlag; Flags];
 PipelineMultisampleStateCreateFlag                   :: enum u32 {};
-InstanceCreateFlags                                  :: distinct bit_set[InstanceCreateFlag; Flags];
-InstanceCreateFlag                                   :: enum u32 {};
-Win32SurfaceCreateFlagsKHR                           :: distinct bit_set[Win32SurfaceCreateFlagKHR; Flags];
-Win32SurfaceCreateFlagKHR                            :: enum u32 {};
-IOSSurfaceCreateFlagsMVK                             :: distinct bit_set[IOSSurfaceCreateFlagMVK; Flags];
-IOSSurfaceCreateFlagMVK                              :: enum u32 {};
-PipelineLayoutCreateFlags                            :: distinct bit_set[PipelineLayoutCreateFlag; Flags];
-PipelineLayoutCreateFlag                             :: enum u32 {};
-PipelineCoverageToColorStateCreateFlagsNV            :: distinct bit_set[PipelineCoverageToColorStateCreateFlagNV; Flags];
-PipelineCoverageToColorStateCreateFlagNV             :: enum u32 {};
+AccelerationStructureMotionInfoFlagsNV               :: distinct bit_set[AccelerationStructureMotionInfoFlagNV; Flags];
+AccelerationStructureMotionInfoFlagNV                :: enum u32 {};
+DisplayModeCreateFlagsKHR                            :: distinct bit_set[DisplayModeCreateFlagKHR; Flags];
+DisplayModeCreateFlagKHR                             :: enum u32 {};
+AccelerationStructureMotionInstanceFlagsNV           :: distinct bit_set[AccelerationStructureMotionInstanceFlagNV; Flags];
+AccelerationStructureMotionInstanceFlagNV            :: enum u32 {};
+CommandPoolTrimFlags                                 :: distinct bit_set[CommandPoolTrimFlag; Flags];
+CommandPoolTrimFlag                                  :: enum u32 {};
+PipelineDynamicStateCreateFlags                      :: distinct bit_set[PipelineDynamicStateCreateFlag; Flags];
+PipelineDynamicStateCreateFlag                       :: enum u32 {};
+ValidationCacheCreateFlagsEXT                        :: distinct bit_set[ValidationCacheCreateFlagEXT; Flags];
+ValidationCacheCreateFlagEXT                         :: enum u32 {};
+DebugUtilsMessengerCallbackDataFlagsEXT              :: distinct bit_set[DebugUtilsMessengerCallbackDataFlagEXT; Flags];
+DebugUtilsMessengerCallbackDataFlagEXT               :: enum u32 {};
+MacOSSurfaceCreateFlagsMVK                           :: distinct bit_set[MacOSSurfaceCreateFlagMVK; Flags];
+MacOSSurfaceCreateFlagMVK                            :: enum u32 {};
 SemaphoreCreateFlags                                 :: distinct bit_set[SemaphoreCreateFlag; Flags];
 SemaphoreCreateFlag                                  :: enum u32 {};
-PipelineViewportSwizzleStateCreateFlagsNV            :: distinct bit_set[PipelineViewportSwizzleStateCreateFlagNV; Flags];
-PipelineViewportSwizzleStateCreateFlagNV             :: enum u32 {};
-PipelineDepthStencilStateCreateFlags                 :: distinct bit_set[PipelineDepthStencilStateCreateFlag; Flags];
-PipelineDepthStencilStateCreateFlag                  :: enum u32 {};
-MemoryMapFlags                                       :: distinct bit_set[MemoryMapFlag; Flags];
-MemoryMapFlag                                        :: enum u32 {};
-PipelineRasterizationStateCreateFlags                :: distinct bit_set[PipelineRasterizationStateCreateFlag; Flags];
-PipelineRasterizationStateCreateFlag                 :: enum u32 {};
 DeviceMemoryReportFlagsEXT                           :: distinct bit_set[DeviceMemoryReportFlagEXT; Flags];
 DeviceMemoryReportFlagEXT                            :: enum u32 {};
-DebugUtilsMessengerCallbackDataFlagsEXT              :: distinct bit_set[DebugUtilsMessengerCallbackDataFlagEXT; Flags];
-DebugUtilsMessengerCallbackDataFlagEXT               :: enum u32 {};
-DebugUtilsMessengerCreateFlagsEXT                    :: distinct bit_set[DebugUtilsMessengerCreateFlagEXT; Flags];
-DebugUtilsMessengerCreateFlagEXT                     :: enum u32 {};
+PipelineViewportSwizzleStateCreateFlagsNV            :: distinct bit_set[PipelineViewportSwizzleStateCreateFlagNV; Flags];
+PipelineViewportSwizzleStateCreateFlagNV             :: enum u32 {};
+MetalSurfaceCreateFlagsEXT                           :: distinct bit_set[MetalSurfaceCreateFlagEXT; Flags];
+MetalSurfaceCreateFlagEXT                            :: enum u32 {};
+PipelineInputAssemblyStateCreateFlags                :: distinct bit_set[PipelineInputAssemblyStateCreateFlag; Flags];
+PipelineInputAssemblyStateCreateFlag                 :: enum u32 {};
+InstanceCreateFlags                                  :: distinct bit_set[InstanceCreateFlag; Flags];
+InstanceCreateFlag                                   :: enum u32 {};
+IOSSurfaceCreateFlagsMVK                             :: distinct bit_set[IOSSurfaceCreateFlagMVK; Flags];
+IOSSurfaceCreateFlagMVK                              :: enum u32 {};
 DescriptorPoolResetFlags                             :: distinct bit_set[DescriptorPoolResetFlag; Flags];
 DescriptorPoolResetFlag                              :: enum u32 {};
-BufferViewCreateFlags                                :: distinct bit_set[BufferViewCreateFlag; Flags];
-BufferViewCreateFlag                                 :: enum u32 {};
+PipelineRasterizationStateCreateFlags                :: distinct bit_set[PipelineRasterizationStateCreateFlag; Flags];
+PipelineRasterizationStateCreateFlag                 :: enum u32 {};
 PipelineVertexInputStateCreateFlags                  :: distinct bit_set[PipelineVertexInputStateCreateFlag; Flags];
 PipelineVertexInputStateCreateFlag                   :: enum u32 {};
+PipelineRasterizationDepthClipStateCreateFlagsEXT    :: distinct bit_set[PipelineRasterizationDepthClipStateCreateFlagEXT; Flags];
+PipelineRasterizationDepthClipStateCreateFlagEXT     :: enum u32 {};
+PipelineCoverageReductionStateCreateFlagsNV          :: distinct bit_set[PipelineCoverageReductionStateCreateFlagNV; Flags];
+PipelineCoverageReductionStateCreateFlagNV           :: enum u32 {};
+PipelineViewportStateCreateFlags                     :: distinct bit_set[PipelineViewportStateCreateFlag; Flags];
+PipelineViewportStateCreateFlag                      :: enum u32 {};
+HeadlessSurfaceCreateFlagsEXT                        :: distinct bit_set[HeadlessSurfaceCreateFlagEXT; Flags];
+HeadlessSurfaceCreateFlagEXT                         :: enum u32 {};
 
 

vendor/vulkan/procedures.odin

@@ -459,16 +459,6 @@ when ODIN_OS == "windows" {
 	ProcCmdTraceRaysIndirectKHR                                         :: #type proc "stdcall" (commandBuffer: CommandBuffer, pRaygenShaderBindingTable: ^StridedDeviceAddressRegionKHR, pMissShaderBindingTable: ^StridedDeviceAddressRegionKHR, pHitShaderBindingTable: ^StridedDeviceAddressRegionKHR, pCallableShaderBindingTable: ^StridedDeviceAddressRegionKHR, indirectDeviceAddress: DeviceAddress);
 	ProcGetRayTracingShaderGroupStackSizeKHR                            :: #type proc "stdcall" (device: Device, pipeline: Pipeline, group: u32, groupShader: ShaderGroupShaderKHR) -> DeviceSize;
 	ProcCmdSetRayTracingPipelineStackSizeKHR                            :: #type proc "stdcall" (commandBuffer: CommandBuffer, pipelineStackSize: u32);
-	ProcGetPhysicalDeviceProcAddr                                       :: #type proc "stdcall" (instance: Instance, pName: cstring) -> ProcVoidFunction;
-	ProcNegotiateLoaderLayerInterfaceVersion                            :: #type proc "stdcall" (pVersionStruct: ^NegotiateLayerInterface ) -> Result;
-	ProcSetInstanceLoaderData                                           :: #type proc "stdcall" (instance: Instance, object: rawptr) -> Result;
-	ProcSetDeviceLoaderData                                             :: #type proc "stdcall" (device: Device, object: rawptr) -> Result;
-	ProcLayerCreateDevice                                               :: #type proc "stdcall" (instance: Instance, physicalDevice: PhysicalDevice, pCreateInfo: ^DeviceCreateInfo , pAllocator: ^AllocationCallbacks , pDevice: ^Device , layerGIPA: ProcGetInstanceProcAddr, nextGDPA: ^ProcGetDeviceProcAddr ) -> Result;
-	ProcLayerDestroyDevice                                              :: #type proc "stdcall" (physicalDevice: Device, pAllocator: ^AllocationCallbacks , destroyFunction: ProcDestroyDevice);
-	ProcicdNegotiateLoaderICDInterfaceVersion                           :: #type proc "stdcall" (pVersion: ^u32) -> Result;
-	ProcicdGetInstanceProcAddr                                          :: #type proc "stdcall" (instance: Instance, pName: cstring) -> ProcVoidFunction;
-	ProcicdGetPhysicalDeviceProcAddr                                    :: #type proc "stdcall" (instance: Instance, pName: cstring) -> ProcVoidFunction;
-	ProcicdEnumerateAdapterPhysicalDevices                              :: #type proc "stdcall" (instance: Instance, adapterLUID: LUID, pPhysicalDeviceCount: ^u32, pPhysicalDevices: ^PhysicalDevice) -> Result;
 	ProcCreateWin32SurfaceKHR                                           :: #type proc "stdcall" (instance: Instance, pCreateInfo: ^Win32SurfaceCreateInfoKHR, pAllocator: ^AllocationCallbacks, pSurface: ^SurfaceKHR) -> Result;
 	ProcGetPhysicalDeviceWin32PresentationSupportKHR                    :: #type proc "stdcall" (physicalDevice: PhysicalDevice, queueFamilyIndex: u32) -> b32;
 	ProcGetMemoryWin32HandleKHR                                         :: #type proc "stdcall" (device: Device, pGetWin32HandleInfo: ^MemoryGetWin32HandleInfoKHR, pHandle: ^HANDLE) -> Result;
@@ -937,16 +927,6 @@ when ODIN_OS == "windows" {
 	ProcCmdTraceRaysIndirectKHR                                         :: #type proc "c" (commandBuffer: CommandBuffer, pRaygenShaderBindingTable: ^StridedDeviceAddressRegionKHR, pMissShaderBindingTable: ^StridedDeviceAddressRegionKHR, pHitShaderBindingTable: ^StridedDeviceAddressRegionKHR, pCallableShaderBindingTable: ^StridedDeviceAddressRegionKHR, indirectDeviceAddress: DeviceAddress);
 	ProcGetRayTracingShaderGroupStackSizeKHR                            :: #type proc "c" (device: Device, pipeline: Pipeline, group: u32, groupShader: ShaderGroupShaderKHR) -> DeviceSize;
 	ProcCmdSetRayTracingPipelineStackSizeKHR                            :: #type proc "c" (commandBuffer: CommandBuffer, pipelineStackSize: u32);
-	ProcGetPhysicalDeviceProcAddr                                       :: #type proc "c" (instance: Instance, pName: cstring) -> ProcVoidFunction;
-	ProcNegotiateLoaderLayerInterfaceVersion                            :: #type proc "c" (pVersionStruct: ^NegotiateLayerInterface ) -> Result;
-	ProcSetInstanceLoaderData                                           :: #type proc "c" (instance: Instance, object: rawptr) -> Result;
-	ProcSetDeviceLoaderData                                             :: #type proc "c" (device: Device, object: rawptr) -> Result;
-	ProcLayerCreateDevice                                               :: #type proc "c" (instance: Instance, physicalDevice: PhysicalDevice, pCreateInfo: ^DeviceCreateInfo , pAllocator: ^AllocationCallbacks , pDevice: ^Device , layerGIPA: ProcGetInstanceProcAddr, nextGDPA: ^ProcGetDeviceProcAddr ) -> Result;
-	ProcLayerDestroyDevice                                              :: #type proc "c" (physicalDevice: Device, pAllocator: ^AllocationCallbacks , destroyFunction: ProcDestroyDevice);
-	ProcicdNegotiateLoaderICDInterfaceVersion                           :: #type proc "c" (pVersion: ^u32) -> Result;
-	ProcicdGetInstanceProcAddr                                          :: #type proc "c" (instance: Instance, pName: cstring) -> ProcVoidFunction;
-	ProcicdGetPhysicalDeviceProcAddr                                    :: #type proc "c" (instance: Instance, pName: cstring) -> ProcVoidFunction;
-	ProcicdEnumerateAdapterPhysicalDevices                              :: #type proc "c" (instance: Instance, adapterLUID: LUID, pPhysicalDeviceCount: ^u32, pPhysicalDevices: ^PhysicalDevice) -> Result;
 	ProcCreateWin32SurfaceKHR                                           :: #type proc "c" (instance: Instance, pCreateInfo: ^Win32SurfaceCreateInfoKHR, pAllocator: ^AllocationCallbacks, pSurface: ^SurfaceKHR) -> Result;
 	ProcGetPhysicalDeviceWin32PresentationSupportKHR                    :: #type proc "c" (physicalDevice: PhysicalDevice, queueFamilyIndex: u32) -> b32;
 	ProcGetMemoryWin32HandleKHR                                         :: #type proc "c" (device: Device, pGetWin32HandleInfo: ^MemoryGetWin32HandleInfoKHR, pHandle: ^HANDLE) -> Result;
@@ -1043,12 +1023,6 @@ AcquireDrmDisplayEXT:                                            ProcAcquireDrmD
 GetDrmDisplayEXT:                                                ProcGetDrmDisplayEXT;
 AcquireWinrtDisplayNV:                                           ProcAcquireWinrtDisplayNV;
 GetWinrtDisplayNV:                                               ProcGetWinrtDisplayNV;
-GetPhysicalDeviceProcAddr:                                       ProcGetPhysicalDeviceProcAddr;
-SetInstanceLoaderData:                                           ProcSetInstanceLoaderData;
-LayerCreateDevice:                                               ProcLayerCreateDevice;
-icdGetInstanceProcAddr:                                          ProcicdGetInstanceProcAddr;
-icdGetPhysicalDeviceProcAddr:                                    ProcicdGetPhysicalDeviceProcAddr;
-icdEnumerateAdapterPhysicalDevices:                              ProcicdEnumerateAdapterPhysicalDevices;
 CreateWin32SurfaceKHR:                                           ProcCreateWin32SurfaceKHR;
 GetPhysicalDeviceWin32PresentationSupportKHR:                    ProcGetPhysicalDeviceWin32PresentationSupportKHR;
 GetPhysicalDeviceSurfacePresentModes2EXT:                        ProcGetPhysicalDeviceSurfacePresentModes2EXT;
@@ -1419,8 +1393,6 @@ GetRayTracingCaptureReplayShaderGroupHandlesKHR: ProcGetRayTracingCaptureReplayS
 CmdTraceRaysIndirectKHR:                         ProcCmdTraceRaysIndirectKHR;
 GetRayTracingShaderGroupStackSizeKHR:            ProcGetRayTracingShaderGroupStackSizeKHR;
 CmdSetRayTracingPipelineStackSizeKHR:            ProcCmdSetRayTracingPipelineStackSizeKHR;
-SetDeviceLoaderData:                             ProcSetDeviceLoaderData;
-LayerDestroyDevice:                              ProcLayerDestroyDevice;
 GetMemoryWin32HandleKHR:                         ProcGetMemoryWin32HandleKHR;
 GetMemoryWin32HandlePropertiesKHR:               ProcGetMemoryWin32HandlePropertiesKHR;
 ImportSemaphoreWin32HandleKHR:                   ProcImportSemaphoreWin32HandleKHR;
@@ -1433,14 +1405,12 @@ ReleaseFullScreenExclusiveModeEXT:               ProcReleaseFullScreenExclusiveM
 GetDeviceGroupSurfacePresentModes2EXT:           ProcGetDeviceGroupSurfacePresentModes2EXT;
 
 // Loader Procedures
-CreateInstance:                        ProcCreateInstance;
-EnumerateInstanceExtensionProperties:  ProcEnumerateInstanceExtensionProperties;
-EnumerateInstanceLayerProperties:      ProcEnumerateInstanceLayerProperties;
-EnumerateInstanceVersion:              ProcEnumerateInstanceVersion;
-DebugUtilsMessengerCallbackEXT:        ProcDebugUtilsMessengerCallbackEXT;
-DeviceMemoryReportCallbackEXT:         ProcDeviceMemoryReportCallbackEXT;
-NegotiateLoaderLayerInterfaceVersion:  ProcNegotiateLoaderLayerInterfaceVersion;
-icdNegotiateLoaderICDInterfaceVersion: ProcicdNegotiateLoaderICDInterfaceVersion;
+CreateInstance:                       ProcCreateInstance;
+EnumerateInstanceExtensionProperties: ProcEnumerateInstanceExtensionProperties;
+EnumerateInstanceLayerProperties:     ProcEnumerateInstanceLayerProperties;
+EnumerateInstanceVersion:             ProcEnumerateInstanceVersion;
+DebugUtilsMessengerCallbackEXT:       ProcDebugUtilsMessengerCallbackEXT;
+DeviceMemoryReportCallbackEXT:        ProcDeviceMemoryReportCallbackEXT;
 
 load_proc_addresses :: proc(set_proc_address: SetProcAddressType) {
 	// Instance Procedures
@@ -1520,12 +1490,6 @@ load_proc_addresses :: proc(set_proc_address: SetProcAddressType) {
 	set_proc_address(&GetDrmDisplayEXT,                                                "vkGetDrmDisplayEXT");
 	set_proc_address(&AcquireWinrtDisplayNV,                                           "vkAcquireWinrtDisplayNV");
 	set_proc_address(&GetWinrtDisplayNV,                                               "vkGetWinrtDisplayNV");
-	set_proc_address(&GetPhysicalDeviceProcAddr,                                       "vkGetPhysicalDeviceProcAddr");
-	set_proc_address(&SetInstanceLoaderData,                                           "vkSetInstanceLoaderData");
-	set_proc_address(&LayerCreateDevice,                                               "vkLayerCreateDevice");
-	set_proc_address(&icdGetInstanceProcAddr,                                          "vkicdGetInstanceProcAddr");
-	set_proc_address(&icdGetPhysicalDeviceProcAddr,                                    "vkicdGetPhysicalDeviceProcAddr");
-	set_proc_address(&icdEnumerateAdapterPhysicalDevices,                              "vkicdEnumerateAdapterPhysicalDevices");
 	set_proc_address(&CreateWin32SurfaceKHR,                                           "vkCreateWin32SurfaceKHR");
 	set_proc_address(&GetPhysicalDeviceWin32PresentationSupportKHR,                    "vkGetPhysicalDeviceWin32PresentationSupportKHR");
 	set_proc_address(&GetPhysicalDeviceSurfacePresentModes2EXT,                        "vkGetPhysicalDeviceSurfacePresentModes2EXT");
@@ -1896,8 +1860,6 @@ load_proc_addresses :: proc(set_proc_address: SetProcAddressType) {
 	set_proc_address(&CmdTraceRaysIndirectKHR,                         "vkCmdTraceRaysIndirectKHR");
 	set_proc_address(&GetRayTracingShaderGroupStackSizeKHR,            "vkGetRayTracingShaderGroupStackSizeKHR");
 	set_proc_address(&CmdSetRayTracingPipelineStackSizeKHR,            "vkCmdSetRayTracingPipelineStackSizeKHR");
-	set_proc_address(&SetDeviceLoaderData,                             "vkSetDeviceLoaderData");
-	set_proc_address(&LayerDestroyDevice,                              "vkLayerDestroyDevice");
 	set_proc_address(&GetMemoryWin32HandleKHR,                         "vkGetMemoryWin32HandleKHR");
 	set_proc_address(&GetMemoryWin32HandlePropertiesKHR,               "vkGetMemoryWin32HandlePropertiesKHR");
 	set_proc_address(&ImportSemaphoreWin32HandleKHR,                   "vkImportSemaphoreWin32HandleKHR");
@@ -1910,14 +1872,12 @@ load_proc_addresses :: proc(set_proc_address: SetProcAddressType) {
 	set_proc_address(&GetDeviceGroupSurfacePresentModes2EXT,           "vkGetDeviceGroupSurfacePresentModes2EXT");
 
 	// Loader Procedures
-	set_proc_address(&CreateInstance,                        "vkCreateInstance");
-	set_proc_address(&EnumerateInstanceExtensionProperties,  "vkEnumerateInstanceExtensionProperties");
-	set_proc_address(&EnumerateInstanceLayerProperties,      "vkEnumerateInstanceLayerProperties");
-	set_proc_address(&EnumerateInstanceVersion,              "vkEnumerateInstanceVersion");
-	set_proc_address(&DebugUtilsMessengerCallbackEXT,        "vkDebugUtilsMessengerCallbackEXT");
-	set_proc_address(&DeviceMemoryReportCallbackEXT,         "vkDeviceMemoryReportCallbackEXT");
-	set_proc_address(&NegotiateLoaderLayerInterfaceVersion,  "vkNegotiateLoaderLayerInterfaceVersion");
-	set_proc_address(&icdNegotiateLoaderICDInterfaceVersion, "vkicdNegotiateLoaderICDInterfaceVersion");
+	set_proc_address(&CreateInstance,                       "vkCreateInstance");
+	set_proc_address(&EnumerateInstanceExtensionProperties, "vkEnumerateInstanceExtensionProperties");
+	set_proc_address(&EnumerateInstanceLayerProperties,     "vkEnumerateInstanceLayerProperties");
+	set_proc_address(&EnumerateInstanceVersion,             "vkEnumerateInstanceVersion");
+	set_proc_address(&DebugUtilsMessengerCallbackEXT,       "vkDebugUtilsMessengerCallbackEXT");
+	set_proc_address(&DeviceMemoryReportCallbackEXT,        "vkDeviceMemoryReportCallbackEXT");
 
 }
 

vendor/vulkan/structs.odin

@@ -5055,46 +5055,6 @@ PhysicalDeviceRayQueryFeaturesKHR :: struct {
 	rayQuery: b32,
 }
 
-NegotiateLayerInterface :: struct {
-	sType:                        NegotiateLayerStructType,
-	loaderLayerInterfaceVersion:  u32,
-	pfnGetInstanceProcAddr:       ProcGetInstanceProcAddr,
-	pfnGetDeviceProcAddr:         ProcGetDeviceProcAddr,
-	pfnGetPhysicalDeviceProcAddr: ProcGetPhysicalDeviceProcAddr,
-}
-
-LayerInstanceLink_ :: struct {
-	pfnNextGetInstanceProcAddr:       ProcGetInstanceProcAddr,
-	pfnNextGetPhysicalDeviceProcAddr: ProcGetPhysicalDeviceProcAddr,
-}
-
-LayerDeviceInfo_ :: struct {
-	pfnNextGetInstanceProcAddr: ProcGetInstanceProcAddr,
-}
-
-LayerDeviceLink_ :: struct {
-	pfnNextGetInstanceProcAddr: ProcGetInstanceProcAddr,
-	pfnNextGetDeviceProcAddr:   ProcGetDeviceProcAddr,
-}
-
-ChainHeader :: struct {
-	type:    ChainType,
-	version: u32,
-	size:    u32,
-}
-
-EnumerateInstanceExtensionPropertiesChain :: struct {
-	header: ChainHeader,
-}
-
-EnumerateInstanceLayerPropertiesChain :: struct {
-	header: ChainHeader,
-}
-
-EnumerateInstanceVersionChain :: struct {
-	header: ChainHeader,
-}
-
 Win32SurfaceCreateInfoKHR :: struct {
 	sType:     StructureType,
 	pNext:     rawptr,