diff --git a/Cargo.toml b/Cargo.toml index b63e0f4c1..17b22f707 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,3 @@ members = [ "generator", "generator-rewrite", ] - -[patch.crates-io] -# https://github.com/krolli/vk-parse/pull/32 -# https://togithub.com/KhronosGroup/Vulkan-Docs/pull/2366 -vk-parse = { git = "https://github.com/MarijnS95/vk-parse", rev = "97848b1" } diff --git a/Changelog.md b/Changelog.md index 364ac629e..b9780035f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Update Vulkan-Headers to 1.3.285 (#910) +- Update Vulkan-Headers to 1.3.286 (#910) ## [0.38.0] - 2024-04-01 diff --git a/ash/Cargo.toml b/ash/Cargo.toml index d24451300..8d0f9fd48 100644 --- a/ash/Cargo.toml +++ b/ash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ash" -version = "0.38.0+1.3.285" +version = "0.38.0+1.3.286" authors = [ "Maik Klein ", "Benjamin Saunders ", diff --git a/ash/src/extensions_generated.rs b/ash/src/extensions_generated.rs index 6c94ab9c7..2f2ca3756 100644 --- a/ash/src/extensions_generated.rs +++ b/ash/src/extensions_generated.rs @@ -8414,6 +8414,14 @@ pub mod ext { } } } + #[doc = "VK_EXT_shader_replicated_composites"] + pub mod shader_replicated_composites { + use super::super::*; + pub use { + crate::vk::EXT_SHADER_REPLICATED_COMPOSITES_NAME as NAME, + crate::vk::EXT_SHADER_REPLICATED_COMPOSITES_SPEC_VERSION as SPEC_VERSION, + }; + } } #[doc = "Extensions tagged FUCHSIA"] pub mod fuchsia { diff --git a/ash/src/vk/const_debugs.rs b/ash/src/vk/const_debugs.rs index 6de5b289e..05ad4b869 100644 --- a/ash/src/vk/const_debugs.rs +++ b/ash/src/vk/const_debugs.rs @@ -1676,6 +1676,7 @@ impl fmt::Debug for DriverId { Self::MESA_NVK => Some("MESA_NVK"), Self::IMAGINATION_OPEN_SOURCE_MESA => Some("IMAGINATION_OPEN_SOURCE_MESA"), Self::MESA_AGXV => Some("MESA_AGXV"), + Self::RESERVED_27 => Some("RESERVED_27"), _ => None, }; if let Some(x) = name { @@ -6620,6 +6621,9 @@ impl fmt::Debug for StructureType { Self::PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV => { Some("PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV") } + Self::PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT => { + Some("PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT") + } Self::PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV => { Some("PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV") } @@ -7288,6 +7292,7 @@ impl fmt::Debug for ValidationFeatureEnableEXT { impl fmt::Debug for VendorId { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let name = match *self { + Self::KHRONOS => Some("KHRONOS"), Self::VIV => Some("VIV"), Self::VSI => Some("VSI"), Self::KAZAN => Some("KAZAN"), diff --git a/ash/src/vk/definitions.rs b/ash/src/vk/definitions.rs index 2b1c38f62..7b5521cd1 100644 --- a/ash/src/vk/definitions.rs +++ b/ash/src/vk/definitions.rs @@ -58,7 +58,7 @@ pub const API_VERSION_1_2: u32 = make_api_version(0, 1, 2, 0); #[doc = ""] pub const API_VERSION_1_3: u32 = make_api_version(0, 1, 3, 0); #[doc = ""] -pub const HEADER_VERSION: u32 = 285; +pub const HEADER_VERSION: u32 = 286; #[doc = ""] pub const HEADER_VERSION_COMPLETE: u32 = make_api_version(0, 1, 3, HEADER_VERSION); #[doc = ""] @@ -57617,3 +57617,43 @@ impl<'a> ImageAlignmentControlCreateInfoMESA<'a> { self } } +#[repr(C)] +#[cfg_attr(feature = "debug", derive(Debug))] +#[derive(Copy, Clone)] +#[doc = ""] +#[must_use] +pub struct PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'a> { + pub s_type: StructureType, + pub p_next: *mut c_void, + pub shader_replicated_composites: Bool32, + pub _marker: PhantomData<&'a ()>, +} +unsafe impl Send for PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'_> {} +unsafe impl Sync for PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'_> {} +impl ::core::default::Default for PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'_> { + #[inline] + fn default() -> Self { + Self { + s_type: Self::STRUCTURE_TYPE, + p_next: ::core::ptr::null_mut(), + shader_replicated_composites: Bool32::default(), + _marker: PhantomData, + } + } +} +unsafe impl<'a> TaggedStructure for PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'a> { + const STRUCTURE_TYPE: StructureType = + StructureType::PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT; +} +unsafe impl ExtendsPhysicalDeviceFeatures2 + for PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'_> +{ +} +unsafe impl ExtendsDeviceCreateInfo for PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'_> {} +impl<'a> PhysicalDeviceShaderReplicatedCompositesFeaturesEXT<'a> { + #[inline] + pub fn shader_replicated_composites(mut self, shader_replicated_composites: bool) -> Self { + self.shader_replicated_composites = shader_replicated_composites.into(); + self + } +} diff --git a/ash/src/vk/enums.rs b/ash/src/vk/enums.rs index 643ca0259..bdff1eb9f 100644 --- a/ash/src/vk/enums.rs +++ b/ash/src/vk/enums.rs @@ -1757,6 +1757,8 @@ impl VendorId { } } impl VendorId { + #[doc = "Khronos vendor ID"] + pub const KHRONOS: Self = Self(0x1_0000); #[doc = "Vivante vendor ID"] pub const VIV: Self = Self(0x1_0001); #[doc = "VeriSilicon vendor ID"] @@ -1839,6 +1841,8 @@ impl DriverId { pub const IMAGINATION_OPEN_SOURCE_MESA: Self = Self(25); #[doc = "Mesa open source project"] pub const MESA_AGXV: Self = Self(26); + #[doc = "Reserved for undisclosed driver project"] + pub const RESERVED_27: Self = Self(27); } #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] #[repr(transparent)] diff --git a/ash/src/vk/extensions.rs b/ash/src/vk/extensions.rs index 03039efba..0467f1fd3 100644 --- a/ash/src/vk/extensions.rs +++ b/ash/src/vk/extensions.rs @@ -3961,6 +3961,10 @@ impl StructureType { impl StructureType { pub const PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV: Self = Self(1_000_563_000); } +#[doc = "Generated from 'VK_EXT_shader_replicated_composites'"] +impl StructureType { + pub const PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT: Self = Self(1_000_564_000); +} #[doc = "Generated from 'VK_NV_ray_tracing_validation'"] impl StructureType { pub const PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV: Self = Self(1_000_568_000); @@ -7897,6 +7901,9 @@ pub const NV_RAW_ACCESS_CHAINS_SPEC_VERSION: u32 = 1u32; pub const NV_SHADER_ATOMIC_FLOAT16_VECTOR_NAME: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_NV_shader_atomic_float16_vector\0") }; pub const NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION: u32 = 1u32; +pub const EXT_SHADER_REPLICATED_COMPOSITES_NAME: &CStr = + unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_EXT_shader_replicated_composites\0") }; +pub const EXT_SHADER_REPLICATED_COMPOSITES_SPEC_VERSION: u32 = 1u32; pub const NV_RAY_TRACING_VALIDATION_NAME: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_NV_ray_tracing_validation\0") }; pub const NV_RAY_TRACING_VALIDATION_SPEC_VERSION: u32 = 1u32; diff --git a/generator/Cargo.toml b/generator/Cargo.toml index 6e83ec048..286f312d2 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -17,7 +17,7 @@ once_cell = "1.7" proc-macro2 = "1.0" quote = "1.0" regex = "1.4" -vk-parse = { version = "0.12", features = ["vkxml-convert"] } +vk-parse = { version = "0.13", features = ["vkxml-convert"] } vkxml = "0.3" [dependencies.syn] diff --git a/generator/Vulkan-Headers b/generator/Vulkan-Headers index 5677bafb8..192d051db 160000 --- a/generator/Vulkan-Headers +++ b/generator/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 5677bafb820e476441e9e1f745371b72133407d3 +Subproject commit 192d051db3382e213f8bd9d8048fc9eaa78ed6ab