Update Vulkan-Headers to 1.3.310

Author: MarijnS95

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.4.304 (#910, #951)
+- Update Vulkan-Headers to 1.4.310 (#910, #951)
 - Added `VK_KHR_get_display_properties2` instance extension (#932)
 - Added `VK_EXT_metal_objects` device extension (#942)
 

ash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ash"
-version = "0.38.0+1.4.304"
+version = "0.38.0+1.4.310"
 authors = [
     "Maik Klein <[email protected]>",
     "Benjamin Saunders <[email protected]>",

ash/src/extensions_generated.rs

@@ -20953,6 +20953,14 @@ pub mod nv {
             }
         }
     }
+    #[doc = "VK_NV_present_metering"]
+    pub mod present_metering {
+        use super::super::*;
+        pub use {
+            crate::vk::NV_PRESENT_METERING_NAME as NAME,
+            crate::vk::NV_PRESENT_METERING_SPEC_VERSION as SPEC_VERSION,
+        };
+    }
 }
 #[doc = "Extensions tagged NVX"]
 pub mod nvx {

ash/src/vk/const_debugs.rs

@@ -186,12 +186,12 @@ impl fmt::Debug for AccessFlags {
                 "FRAGMENT_SHADING_RATE_ATTACHMENT_READ_KHR",
             ),
             (
-                AccessFlags::COMMAND_PREPROCESS_READ_NV.0,
-                "COMMAND_PREPROCESS_READ_NV",
+                AccessFlags::COMMAND_PREPROCESS_READ_EXT.0,
+                "COMMAND_PREPROCESS_READ_EXT",
             ),
             (
-                AccessFlags::COMMAND_PREPROCESS_WRITE_NV.0,
-                "COMMAND_PREPROCESS_WRITE_NV",
+                AccessFlags::COMMAND_PREPROCESS_WRITE_EXT.0,
+                "COMMAND_PREPROCESS_WRITE_EXT",
             ),
             (AccessFlags::NONE.0, "NONE"),
         ];
@@ -276,12 +276,12 @@ impl fmt::Debug for AccessFlags2 {
                 "CONDITIONAL_RENDERING_READ_EXT",
             ),
             (
-                AccessFlags2::COMMAND_PREPROCESS_READ_NV.0,
-                "COMMAND_PREPROCESS_READ_NV",
+                AccessFlags2::COMMAND_PREPROCESS_READ_EXT.0,
+                "COMMAND_PREPROCESS_READ_EXT",
             ),
             (
-                AccessFlags2::COMMAND_PREPROCESS_WRITE_NV.0,
-                "COMMAND_PREPROCESS_WRITE_NV",
+                AccessFlags2::COMMAND_PREPROCESS_WRITE_EXT.0,
+                "COMMAND_PREPROCESS_WRITE_EXT",
             ),
             (
                 AccessFlags2::FRAGMENT_SHADING_RATE_ATTACHMENT_READ_KHR.0,
@@ -4439,12 +4439,12 @@ impl fmt::Debug for PipelineStageFlags {
                 PipelineStageFlags::FRAGMENT_SHADING_RATE_ATTACHMENT_KHR.0,
                 "FRAGMENT_SHADING_RATE_ATTACHMENT_KHR",
             ),
-            (
-                PipelineStageFlags::COMMAND_PREPROCESS_NV.0,
-                "COMMAND_PREPROCESS_NV",
-            ),
             (PipelineStageFlags::TASK_SHADER_EXT.0, "TASK_SHADER_EXT"),
             (PipelineStageFlags::MESH_SHADER_EXT.0, "MESH_SHADER_EXT"),
+            (
+                PipelineStageFlags::COMMAND_PREPROCESS_EXT.0,
+                "COMMAND_PREPROCESS_EXT",
+            ),
             (PipelineStageFlags::NONE.0, "NONE"),
         ];
         debug_flags(f, KNOWN, self.0)
@@ -4510,8 +4510,8 @@ impl fmt::Debug for PipelineStageFlags2 {
                 "CONDITIONAL_RENDERING_EXT",
             ),
             (
-                PipelineStageFlags2::COMMAND_PREPROCESS_NV.0,
-                "COMMAND_PREPROCESS_NV",
+                PipelineStageFlags2::COMMAND_PREPROCESS_EXT.0,
+                "COMMAND_PREPROCESS_EXT",
             ),
             (
                 PipelineStageFlags2::FRAGMENT_SHADING_RATE_ATTACHMENT_KHR.0,
@@ -7228,6 +7228,10 @@ impl fmt::Debug for StructureType {
             Self::PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT => {
                 Some("PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT")
             }
+            Self::SET_PRESENT_CONFIG_NV => Some("SET_PRESENT_CONFIG_NV"),
+            Self::PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV => {
+                Some("PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV")
+            }
             Self::PHYSICAL_DEVICE_SUBGROUP_PROPERTIES => {
                 Some("PHYSICAL_DEVICE_SUBGROUP_PROPERTIES")
             }

ash/src/vk/definitions.rs

@@ -60,7 +60,7 @@ pub const API_VERSION_1_3: u32 = make_api_version(0, 1, 3, 0);
 #[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_API_VERSION_1_4.html>"]
 pub const API_VERSION_1_4: u32 = make_api_version(0, 1, 4, 0);
 #[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_HEADER_VERSION.html>"]
-pub const HEADER_VERSION: u32 = 307;
+pub const HEADER_VERSION: u32 = 310;
 #[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_HEADER_VERSION_COMPLETE.html>"]
 pub const HEADER_VERSION_COMPLETE: u32 = make_api_version(0, 1, 4, HEADER_VERSION);
 #[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkSampleMask.html>"]
@@ -36280,6 +36280,10 @@ unsafe impl<'a> TaggedStructure for AccelerationStructureGeometryLinearSweptSphe
     const STRUCTURE_TYPE: StructureType =
         StructureType::ACCELERATION_STRUCTURE_GEOMETRY_LINEAR_SWEPT_SPHERES_DATA_NV;
 }
+unsafe impl ExtendsAccelerationStructureGeometryKHR
+    for AccelerationStructureGeometryLinearSweptSpheresDataNV<'_>
+{
+}
 impl<'a> AccelerationStructureGeometryLinearSweptSpheresDataNV<'a> {
     #[inline]
     pub fn vertex_format(mut self, vertex_format: Format) -> Self {
@@ -36398,6 +36402,10 @@ unsafe impl<'a> TaggedStructure for AccelerationStructureGeometrySpheresDataNV<'
     const STRUCTURE_TYPE: StructureType =
         StructureType::ACCELERATION_STRUCTURE_GEOMETRY_SPHERES_DATA_NV;
 }
+unsafe impl ExtendsAccelerationStructureGeometryKHR
+    for AccelerationStructureGeometrySpheresDataNV<'_>
+{
+}
 impl<'a> AccelerationStructureGeometrySpheresDataNV<'a> {
     #[inline]
     pub fn vertex_format(mut self, vertex_format: Format) -> Self {
@@ -36501,6 +36509,7 @@ impl ::core::default::Default for AccelerationStructureGeometryKHR<'_> {
 unsafe impl<'a> TaggedStructure for AccelerationStructureGeometryKHR<'a> {
     const STRUCTURE_TYPE: StructureType = StructureType::ACCELERATION_STRUCTURE_GEOMETRY_KHR;
 }
+pub unsafe trait ExtendsAccelerationStructureGeometryKHR {}
 impl<'a> AccelerationStructureGeometryKHR<'a> {
     #[inline]
     pub fn geometry_type(mut self, geometry_type: GeometryTypeKHR) -> Self {
@@ -36517,6 +36526,23 @@ impl<'a> AccelerationStructureGeometryKHR<'a> {
         self.flags = flags;
         self
     }
+    #[doc = r" Prepends the given extension struct between the root and the first pointer. This"]
+    #[doc = r" method only exists on structs that can be passed to a function directly. Only"]
+    #[doc = r" valid extension structs can be pushed into the chain."]
+    #[doc = r" If the chain looks like `A -> B -> C`, and you call `x.push_next(&mut D)`, then the"]
+    #[doc = r" chain will look like `A -> D -> B -> C`."]
+    pub fn push_next<T: ExtendsAccelerationStructureGeometryKHR + ?Sized>(
+        mut self,
+        next: &'a mut T,
+    ) -> Self {
+        unsafe {
+            let next_ptr = <*const T>::cast(next);
+            let last_next = ptr_chain_iter(next).last().unwrap();
+            (*last_next).p_next = self.p_next as _;
+            self.p_next = next_ptr;
+        }
+        self
+    }
 }
 #[repr(C)]
 #[derive(Copy, Clone)]
@@ -42396,7 +42422,6 @@ unsafe impl<'a> TaggedStructure for MemoryBarrier2<'a> {
     const STRUCTURE_TYPE: StructureType = StructureType::MEMORY_BARRIER_2;
 }
 unsafe impl ExtendsSubpassDependency2 for MemoryBarrier2<'_> {}
-pub unsafe trait ExtendsMemoryBarrier2 {}
 impl<'a> MemoryBarrier2<'a> {
     #[inline]
     pub fn src_stage_mask(mut self, src_stage_mask: PipelineStageFlags2) -> Self {
@@ -42418,20 +42443,6 @@ impl<'a> MemoryBarrier2<'a> {
         self.dst_access_mask = dst_access_mask;
         self
     }
-    #[doc = r" Prepends the given extension struct between the root and the first pointer. This"]
-    #[doc = r" method only exists on structs that can be passed to a function directly. Only"]
-    #[doc = r" valid extension structs can be pushed into the chain."]
-    #[doc = r" If the chain looks like `A -> B -> C`, and you call `x.push_next(&mut D)`, then the"]
-    #[doc = r" chain will look like `A -> D -> B -> C`."]
-    pub fn push_next<T: ExtendsMemoryBarrier2 + ?Sized>(mut self, next: &'a mut T) -> Self {
-        unsafe {
-            let next_ptr = <*const T>::cast(next);
-            let last_next = ptr_chain_iter(next).last().unwrap();
-            (*last_next).p_next = self.p_next as _;
-            self.p_next = next_ptr;
-        }
-        self
-    }
 }
 #[repr(C)]
 #[cfg_attr(feature = "debug", derive(Debug))]
@@ -42679,7 +42690,7 @@ impl ::core::default::Default for MemoryBarrierAccessFlags3KHR<'_> {
 unsafe impl<'a> TaggedStructure for MemoryBarrierAccessFlags3KHR<'a> {
     const STRUCTURE_TYPE: StructureType = StructureType::MEMORY_BARRIER_ACCESS_FLAGS_3_KHR;
 }
-unsafe impl ExtendsMemoryBarrier2 for MemoryBarrierAccessFlags3KHR<'_> {}
+unsafe impl ExtendsSubpassDependency2 for MemoryBarrierAccessFlags3KHR<'_> {}
 unsafe impl ExtendsBufferMemoryBarrier2 for MemoryBarrierAccessFlags3KHR<'_> {}
 unsafe impl ExtendsImageMemoryBarrier2 for MemoryBarrierAccessFlags3KHR<'_> {}
 impl<'a> MemoryBarrierAccessFlags3KHR<'a> {
@@ -64782,3 +64793,82 @@ impl<'a> ConvertCooperativeVectorMatrixInfoNV<'a> {
         self
     }
 }
+#[repr(C)]
+#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Copy, Clone)]
+#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkSetPresentConfigNV.html>"]
+#[must_use]
+pub struct SetPresentConfigNV<'a> {
+    pub s_type: StructureType,
+    pub p_next: *const c_void,
+    pub num_frames_per_batch: u32,
+    pub present_config_feedback: u32,
+    pub _marker: PhantomData<&'a ()>,
+}
+unsafe impl Send for SetPresentConfigNV<'_> {}
+unsafe impl Sync for SetPresentConfigNV<'_> {}
+impl ::core::default::Default for SetPresentConfigNV<'_> {
+    #[inline]
+    fn default() -> Self {
+        Self {
+            s_type: Self::STRUCTURE_TYPE,
+            p_next: ::core::ptr::null(),
+            num_frames_per_batch: u32::default(),
+            present_config_feedback: u32::default(),
+            _marker: PhantomData,
+        }
+    }
+}
+unsafe impl<'a> TaggedStructure for SetPresentConfigNV<'a> {
+    const STRUCTURE_TYPE: StructureType = StructureType::SET_PRESENT_CONFIG_NV;
+}
+unsafe impl ExtendsPresentInfoKHR for SetPresentConfigNV<'_> {}
+impl<'a> SetPresentConfigNV<'a> {
+    #[inline]
+    pub fn num_frames_per_batch(mut self, num_frames_per_batch: u32) -> Self {
+        self.num_frames_per_batch = num_frames_per_batch;
+        self
+    }
+    #[inline]
+    pub fn present_config_feedback(mut self, present_config_feedback: u32) -> Self {
+        self.present_config_feedback = present_config_feedback;
+        self
+    }
+}
+#[repr(C)]
+#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Copy, Clone)]
+#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkPhysicalDevicePresentMeteringFeaturesNV.html>"]
+#[must_use]
+pub struct PhysicalDevicePresentMeteringFeaturesNV<'a> {
+    pub s_type: StructureType,
+    pub p_next: *mut c_void,
+    pub present_metering: Bool32,
+    pub _marker: PhantomData<&'a ()>,
+}
+unsafe impl Send for PhysicalDevicePresentMeteringFeaturesNV<'_> {}
+unsafe impl Sync for PhysicalDevicePresentMeteringFeaturesNV<'_> {}
+impl ::core::default::Default for PhysicalDevicePresentMeteringFeaturesNV<'_> {
+    #[inline]
+    fn default() -> Self {
+        Self {
+            s_type: Self::STRUCTURE_TYPE,
+            p_next: ::core::ptr::null_mut(),
+            present_metering: Bool32::default(),
+            _marker: PhantomData,
+        }
+    }
+}
+unsafe impl<'a> TaggedStructure for PhysicalDevicePresentMeteringFeaturesNV<'a> {
+    const STRUCTURE_TYPE: StructureType =
+        StructureType::PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV;
+}
+unsafe impl ExtendsPhysicalDeviceFeatures2 for PhysicalDevicePresentMeteringFeaturesNV<'_> {}
+unsafe impl ExtendsDeviceCreateInfo for PhysicalDevicePresentMeteringFeaturesNV<'_> {}
+impl<'a> PhysicalDevicePresentMeteringFeaturesNV<'a> {
+    #[inline]
+    pub fn present_metering(mut self, present_metering: bool) -> Self {
+        self.present_metering = present_metering.into();
+        self
+    }
+}

ash/src/vk/extensions.rs

@@ -2404,8 +2404,8 @@ impl StructureType {
 }
 #[doc = "Generated from 'VK_NV_device_generated_commands'"]
 impl AccessFlags {
-    pub const COMMAND_PREPROCESS_READ_NV: Self = Self(0b10_0000_0000_0000_0000);
-    pub const COMMAND_PREPROCESS_WRITE_NV: Self = Self(0b100_0000_0000_0000_0000);
+    pub const COMMAND_PREPROCESS_READ_NV: Self = Self::COMMAND_PREPROCESS_READ_EXT;
+    pub const COMMAND_PREPROCESS_WRITE_NV: Self = Self::COMMAND_PREPROCESS_WRITE_EXT;
 }
 #[doc = "Generated from 'VK_NV_device_generated_commands'"]
 impl ObjectType {
@@ -2417,7 +2417,7 @@ impl PipelineCreateFlags {
 }
 #[doc = "Generated from 'VK_NV_device_generated_commands'"]
 impl PipelineStageFlags {
-    pub const COMMAND_PREPROCESS_NV: Self = Self(0b10_0000_0000_0000_0000);
+    pub const COMMAND_PREPROCESS_NV: Self = Self::COMMAND_PREPROCESS_EXT;
 }
 #[doc = "Generated from 'VK_NV_device_generated_commands'"]
 impl StructureType {
@@ -2691,10 +2691,10 @@ impl AccessFlags2 {
         Self(0b1000_0000_0000_0000_0000_0000_0000);
     #[doc = "read access flag for reading conditional rendering predicate"]
     pub const CONDITIONAL_RENDERING_READ_EXT: Self = Self(0b1_0000_0000_0000_0000_0000);
-    pub const COMMAND_PREPROCESS_READ_NV: Self = Self(0b10_0000_0000_0000_0000);
-    pub const COMMAND_PREPROCESS_WRITE_NV: Self = Self(0b100_0000_0000_0000_0000);
-    pub const COMMAND_PREPROCESS_READ_EXT: Self = Self::COMMAND_PREPROCESS_READ_NV;
-    pub const COMMAND_PREPROCESS_WRITE_EXT: Self = Self::COMMAND_PREPROCESS_WRITE_NV;
+    pub const COMMAND_PREPROCESS_READ_NV: Self = Self::COMMAND_PREPROCESS_READ_EXT;
+    pub const COMMAND_PREPROCESS_WRITE_NV: Self = Self::COMMAND_PREPROCESS_WRITE_EXT;
+    pub const COMMAND_PREPROCESS_READ_EXT: Self = Self(0b10_0000_0000_0000_0000);
+    pub const COMMAND_PREPROCESS_WRITE_EXT: Self = Self(0b100_0000_0000_0000_0000);
     pub const FRAGMENT_SHADING_RATE_ATTACHMENT_READ_KHR: Self =
         Self(0b1000_0000_0000_0000_0000_0000);
     pub const SHADING_RATE_IMAGE_READ_NV: Self = Self::FRAGMENT_SHADING_RATE_ATTACHMENT_READ_KHR;
@@ -2749,8 +2749,8 @@ impl PipelineStageFlags2 {
     pub const TRANSFORM_FEEDBACK_EXT: Self = Self(0b1_0000_0000_0000_0000_0000_0000);
     #[doc = "A pipeline stage for conditional rendering predicate fetch"]
     pub const CONDITIONAL_RENDERING_EXT: Self = Self(0b100_0000_0000_0000_0000);
-    pub const COMMAND_PREPROCESS_NV: Self = Self(0b10_0000_0000_0000_0000);
-    pub const COMMAND_PREPROCESS_EXT: Self = Self::COMMAND_PREPROCESS_NV;
+    pub const COMMAND_PREPROCESS_NV: Self = Self::COMMAND_PREPROCESS_EXT;
+    pub const COMMAND_PREPROCESS_EXT: Self = Self(0b10_0000_0000_0000_0000);
     pub const FRAGMENT_SHADING_RATE_ATTACHMENT_KHR: Self = Self(0b100_0000_0000_0000_0000_0000);
     pub const SHADING_RATE_IMAGE_NV: Self = Self::FRAGMENT_SHADING_RATE_ATTACHMENT_KHR;
     pub const ACCELERATION_STRUCTURE_BUILD_KHR: Self = Self(0b10_0000_0000_0000_0000_0000_0000);
@@ -4434,8 +4434,8 @@ impl StructureType {
 }
 #[doc = "Generated from 'VK_EXT_device_generated_commands'"]
 impl AccessFlags {
-    pub const COMMAND_PREPROCESS_READ_EXT: Self = Self::COMMAND_PREPROCESS_READ_NV;
-    pub const COMMAND_PREPROCESS_WRITE_EXT: Self = Self::COMMAND_PREPROCESS_WRITE_NV;
+    pub const COMMAND_PREPROCESS_READ_EXT: Self = Self(0b10_0000_0000_0000_0000);
+    pub const COMMAND_PREPROCESS_WRITE_EXT: Self = Self(0b100_0000_0000_0000_0000);
 }
 #[doc = "Generated from 'VK_EXT_device_generated_commands'"]
 impl BufferUsageFlags2 {
@@ -4453,7 +4453,7 @@ impl PipelineCreateFlags2 {
 }
 #[doc = "Generated from 'VK_EXT_device_generated_commands'"]
 impl PipelineStageFlags {
-    pub const COMMAND_PREPROCESS_EXT: Self = Self::COMMAND_PREPROCESS_NV;
+    pub const COMMAND_PREPROCESS_EXT: Self = Self(0b10_0000_0000_0000_0000);
 }
 #[doc = "Generated from 'VK_EXT_device_generated_commands'"]
 impl ShaderCreateFlagsEXT {
@@ -4550,6 +4550,11 @@ impl StructureType {
 impl StructureType {
     pub const PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT: Self = Self(1_000_608_000);
 }
+#[doc = "Generated from 'VK_NV_present_metering'"]
+impl StructureType {
+    pub const SET_PRESENT_CONFIG_NV: Self = Self(1_000_613_000);
+    pub const PHYSICAL_DEVICE_PRESENT_METERING_FEATURES_NV: Self = Self(1_000_613_001);
+}
 pub const KHR_SURFACE_NAME: &CStr =
     unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_KHR_surface\0") };
 pub const KHR_SURFACE_SPEC_VERSION: u32 = 25u32;
@@ -8729,3 +8734,6 @@ pub const KHR_DEPTH_CLAMP_ZERO_ONE_SPEC_VERSION: u32 = 1u32;
 pub const EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_NAME: &CStr =
     unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_EXT_vertex_attribute_robustness\0") };
 pub const EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_SPEC_VERSION: u32 = 1u32;
+pub const NV_PRESENT_METERING_NAME: &CStr =
+    unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_NV_present_metering\0") };
+pub const NV_PRESENT_METERING_SPEC_VERSION: u32 = 1u32;