Update Vulkan-Headers to 1.3.216

ash-rs · Jun 2, 2022 · 61b2ed9 · 61b2ed9
1 parent 78acf4b
commit 61b2ed9
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 54 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added `VK_NV_coverage_reduction_mode` device extension (#617)
 - Added `VK_EXT_sample_locations` device extension (#616)
-- Update Vulkan-Headers to 1.3.215 (#605, #608, #619)
+- Update Vulkan-Headers to 1.3.216 (#605, #608, #619)
 - Added `VK_EXT_image_drm_format_modifier` device extension (#603)
 
 ### Removed

diff --git a/ash/Cargo.toml b/ash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ash"
-version = "0.37.0+1.3.215"
+version = "0.37.0+1.3.216"
 authors = ["maik klein <maikklein@googlemail.com>"]
 description = "Vulkan bindings for Rust"
 license = "MIT"

diff --git a/ash/src/vk/const_debugs.rs b/ash/src/vk/const_debugs.rs
@@ -2469,6 +2469,7 @@ impl fmt::Debug for ImageViewCreateFlags {
                 ImageViewCreateFlags::FRAGMENT_DENSITY_MAP_DEFERRED_EXT.0,
                 "FRAGMENT_DENSITY_MAP_DEFERRED_EXT",
             ),
+            (ImageViewCreateFlags::RESERVED_3_EXT.0, "RESERVED_3_EXT"),
         ];
         debug_flags(f, KNOWN, self.0)
     }
@@ -5117,11 +5118,11 @@ impl fmt::Debug for StructureType {
                 Some("PHYSICAL_DEVICE_SUBPASS_MERGE_FEEDBACK_FEATURES_EXT")
             }
             Self::RENDER_PASS_CREATION_CONTROL_EXT => Some("RENDER_PASS_CREATION_CONTROL_EXT"),
-            Self::RENDER_PASS_CREATION_FEEDBACK_INFO_EXT => {
-                Some("RENDER_PASS_CREATION_FEEDBACK_INFO_EXT")
+            Self::RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT => {
+                Some("RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT")
             }
-            Self::RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT => {
-                Some("RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT")
+            Self::RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT => {
+                Some("RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT")
             }
             Self::PHYSICAL_DEVICE_SUBGROUP_PROPERTIES => {
                 Some("PHYSICAL_DEVICE_SUBGROUP_PROPERTIES")

diff --git a/ash/src/vk/definitions.rs b/ash/src/vk/definitions.rs
@@ -57,7 +57,7 @@ pub const API_VERSION_1_1: u32 = make_api_version(0, 1, 1, 0);
 pub const API_VERSION_1_2: u32 = make_api_version(0, 1, 2, 0);
 #[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_API_VERSION_1_3.html>"]
 pub const API_VERSION_1_3: u32 = make_api_version(0, 1, 3, 0);
-pub const HEADER_VERSION: u32 = 215u32;
+pub const HEADER_VERSION: u32 = 216u32;
 #[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_HEADER_VERSION_COMPLETE.html>"]
 pub const HEADER_VERSION_COMPLETE: u32 = make_api_version(0, 1, 3, HEADER_VERSION);
 #[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkSampleMask.html>"]
@@ -38922,75 +38922,71 @@ impl ::std::default::Default for RenderPassCreationControlEXT<'_> {
 }
 unsafe impl ExtendsRenderPassCreateInfo2 for RenderPassCreationControlEXT<'_> {}
 unsafe impl ExtendsSubpassDescription2 for RenderPassCreationControlEXT<'_> {}
-pub unsafe trait ExtendsRenderPassCreationControlEXT {}
 impl<'a> RenderPassCreationControlEXT<'a> {
     #[inline]
     pub fn disallow_merging(mut self, disallow_merging: bool) -> Self {
         self.disallow_merging = disallow_merging.into();
         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: ExtendsRenderPassCreationControlEXT>(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;
-        }
+}
+#[repr(C)]
+#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Copy, Clone, Default)]
+#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkRenderPassCreationFeedbackInfoEXT.html>"]
+pub struct RenderPassCreationFeedbackInfoEXT {
+    pub post_merge_subpass_count: u32,
+}
+impl RenderPassCreationFeedbackInfoEXT {
+    #[inline]
+    pub fn post_merge_subpass_count(mut self, post_merge_subpass_count: u32) -> Self {
+        self.post_merge_subpass_count = post_merge_subpass_count;
         self
     }
 }
 #[repr(C)]
 #[cfg_attr(feature = "debug", derive(Debug))]
 #[derive(Copy, Clone)]
-#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkRenderPassCreationFeedbackInfoEXT.html>"]
-pub struct RenderPassCreationFeedbackInfoEXT<'a> {
+#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkRenderPassCreationFeedbackCreateInfoEXT.html>"]
+pub struct RenderPassCreationFeedbackCreateInfoEXT<'a> {
     pub s_type: StructureType,
     pub p_next: *const c_void,
-    pub post_merge_subpass_count: u32,
+    pub p_render_pass_feedback: *mut RenderPassCreationFeedbackInfoEXT,
     pub _marker: PhantomData<&'a ()>,
 }
-impl ::std::default::Default for RenderPassCreationFeedbackInfoEXT<'_> {
+impl ::std::default::Default for RenderPassCreationFeedbackCreateInfoEXT<'_> {
     #[inline]
     fn default() -> Self {
         Self {
-            s_type: StructureType::RENDER_PASS_CREATION_FEEDBACK_INFO_EXT,
+            s_type: StructureType::RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT,
             p_next: ::std::ptr::null(),
-            post_merge_subpass_count: u32::default(),
+            p_render_pass_feedback: ::std::ptr::null_mut(),
             _marker: PhantomData,
         }
     }
 }
-unsafe impl ExtendsRenderPassCreateInfo2 for RenderPassCreationFeedbackInfoEXT<'_> {}
-unsafe impl ExtendsRenderPassCreationControlEXT for RenderPassCreationFeedbackInfoEXT<'_> {}
-impl<'a> RenderPassCreationFeedbackInfoEXT<'a> {
+unsafe impl ExtendsRenderPassCreateInfo2 for RenderPassCreationFeedbackCreateInfoEXT<'_> {}
+impl<'a> RenderPassCreationFeedbackCreateInfoEXT<'a> {
     #[inline]
-    pub fn post_merge_subpass_count(mut self, post_merge_subpass_count: u32) -> Self {
-        self.post_merge_subpass_count = post_merge_subpass_count;
+    pub fn render_pass_feedback(
+        mut self,
+        render_pass_feedback: &'a mut RenderPassCreationFeedbackInfoEXT,
+    ) -> Self {
+        self.p_render_pass_feedback = render_pass_feedback;
         self
     }
 }
 #[repr(C)]
 #[derive(Copy, Clone)]
 #[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkRenderPassSubpassFeedbackInfoEXT.html>"]
-pub struct RenderPassSubpassFeedbackInfoEXT<'a> {
-    pub s_type: StructureType,
-    pub p_next: *const c_void,
+pub struct RenderPassSubpassFeedbackInfoEXT {
     pub subpass_merge_status: SubpassMergeStatusEXT,
     pub description: [c_char; MAX_DESCRIPTION_SIZE],
     pub post_merge_index: u32,
-    pub _marker: PhantomData<&'a ()>,
 }
 #[cfg(feature = "debug")]
-impl fmt::Debug for RenderPassSubpassFeedbackInfoEXT<'_> {
+impl fmt::Debug for RenderPassSubpassFeedbackInfoEXT {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("RenderPassSubpassFeedbackInfoEXT")
-            .field("s_type", &self.s_type)
-            .field("p_next", &self.p_next)
             .field("subpass_merge_status", &self.subpass_merge_status)
             .field("description", &unsafe {
                 ::std::ffi::CStr::from_ptr(self.description.as_ptr())
@@ -38999,22 +38995,17 @@ impl fmt::Debug for RenderPassSubpassFeedbackInfoEXT<'_> {
             .finish()
     }
 }
-impl ::std::default::Default for RenderPassSubpassFeedbackInfoEXT<'_> {
+impl ::std::default::Default for RenderPassSubpassFeedbackInfoEXT {
     #[inline]
     fn default() -> Self {
         Self {
-            s_type: StructureType::RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT,
-            p_next: ::std::ptr::null(),
             subpass_merge_status: SubpassMergeStatusEXT::default(),
             description: unsafe { ::std::mem::zeroed() },
             post_merge_index: u32::default(),
-            _marker: PhantomData,
         }
     }
 }
-unsafe impl ExtendsSubpassDescription2 for RenderPassSubpassFeedbackInfoEXT<'_> {}
-unsafe impl ExtendsRenderPassCreationControlEXT for RenderPassSubpassFeedbackInfoEXT<'_> {}
-impl<'a> RenderPassSubpassFeedbackInfoEXT<'a> {
+impl RenderPassSubpassFeedbackInfoEXT {
     #[inline]
     pub fn subpass_merge_status(mut self, subpass_merge_status: SubpassMergeStatusEXT) -> Self {
         self.subpass_merge_status = subpass_merge_status;
@@ -39034,6 +39025,38 @@ impl<'a> RenderPassSubpassFeedbackInfoEXT<'a> {
 #[repr(C)]
 #[cfg_attr(feature = "debug", derive(Debug))]
 #[derive(Copy, Clone)]
+#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkRenderPassSubpassFeedbackCreateInfoEXT.html>"]
+pub struct RenderPassSubpassFeedbackCreateInfoEXT<'a> {
+    pub s_type: StructureType,
+    pub p_next: *const c_void,
+    pub p_subpass_feedback: *mut RenderPassSubpassFeedbackInfoEXT,
+    pub _marker: PhantomData<&'a ()>,
+}
+impl ::std::default::Default for RenderPassSubpassFeedbackCreateInfoEXT<'_> {
+    #[inline]
+    fn default() -> Self {
+        Self {
+            s_type: StructureType::RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT,
+            p_next: ::std::ptr::null(),
+            p_subpass_feedback: ::std::ptr::null_mut(),
+            _marker: PhantomData,
+        }
+    }
+}
+unsafe impl ExtendsSubpassDescription2 for RenderPassSubpassFeedbackCreateInfoEXT<'_> {}
+impl<'a> RenderPassSubpassFeedbackCreateInfoEXT<'a> {
+    #[inline]
+    pub fn subpass_feedback(
+        mut self,
+        subpass_feedback: &'a mut RenderPassSubpassFeedbackInfoEXT,
+    ) -> Self {
+        self.p_subpass_feedback = subpass_feedback;
+        self
+    }
+}
+#[repr(C)]
+#[cfg_attr(feature = "debug", derive(Debug))]
+#[derive(Copy, Clone)]
 #[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkPhysicalDeviceSubpassMergeFeedbackFeaturesEXT.html>"]
 pub struct PhysicalDeviceSubpassMergeFeedbackFeaturesEXT<'a> {
     pub s_type: StructureType,
@@ -39082,9 +39105,7 @@ impl ::std::default::Default for PipelinePropertiesIdentifierEXT<'_> {
         }
     }
 }
-// XXX: Manually removed to make this compile, actual solution will be resolved inside Khronos
-// https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/5184
-// unsafe impl ExtendsBaseOutStructure for PipelinePropertiesIdentifierEXT<'_> {}
+unsafe impl ExtendsBaseOutStructure for PipelinePropertiesIdentifierEXT<'_> {}
 impl<'a> PipelinePropertiesIdentifierEXT<'a> {
     #[inline]
     pub fn pipeline_identifier(mut self, pipeline_identifier: [u8; UUID_SIZE]) -> Self {

diff --git a/ash/src/vk/enums.rs b/ash/src/vk/enums.rs
@@ -896,7 +896,7 @@ impl Result {
     pub const ERROR_OUT_OF_HOST_MEMORY: Self = Self(-1);
     #[doc = "A device memory allocation has failed"]
     pub const ERROR_OUT_OF_DEVICE_MEMORY: Self = Self(-2);
-    #[doc = "Initialization of a object has failed"]
+    #[doc = "Initialization of an object has failed"]
     pub const ERROR_INITIALIZATION_FAILED: Self = Self(-3);
     #[doc = "The logical device has been lost. See <<devsandqueues-lost-device>>"]
     pub const ERROR_DEVICE_LOST: Self = Self(-4);
@@ -931,7 +931,7 @@ impl fmt::Display for Result {
             Self::INCOMPLETE => Some("A return array was too small for the result"),
             Self::ERROR_OUT_OF_HOST_MEMORY => Some("A host memory allocation has failed"),
             Self::ERROR_OUT_OF_DEVICE_MEMORY => Some("A device memory allocation has failed"),
-            Self::ERROR_INITIALIZATION_FAILED => Some("Initialization of a object has failed"),
+            Self::ERROR_INITIALIZATION_FAILED => Some("Initialization of an object has failed"),
             Self::ERROR_DEVICE_LOST => {
                 Some("The logical device has been lost. See <<devsandqueues-lost-device>>")
             }

diff --git a/ash/src/vk/extensions.rs b/ash/src/vk/extensions.rs
@@ -20532,6 +20532,10 @@ impl ExtExtension419Fn {
         Self {}
     }
 }
+#[doc = "Generated from 'VK_EXT_extension_419'"]
+impl ImageViewCreateFlags {
+    pub const RESERVED_3_EXT: Self = Self(0b1000);
+}
 impl ExtExtension420Fn {
     pub const fn name() -> &'static ::std::ffi::CStr {
         unsafe { ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"VK_EXT_extension_420\0") }
@@ -21380,7 +21384,7 @@ impl ExtSubpassMergeFeedbackFn {
             ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"VK_EXT_subpass_merge_feedback\0")
         }
     }
-    pub const SPEC_VERSION: u32 = 1u32;
+    pub const SPEC_VERSION: u32 = 2u32;
 }
 #[derive(Clone)]
 pub struct ExtSubpassMergeFeedbackFn {}
@@ -21398,8 +21402,8 @@ impl ExtSubpassMergeFeedbackFn {
 impl StructureType {
     pub const PHYSICAL_DEVICE_SUBPASS_MERGE_FEEDBACK_FEATURES_EXT: Self = Self(1_000_458_000);
     pub const RENDER_PASS_CREATION_CONTROL_EXT: Self = Self(1_000_458_001);
-    pub const RENDER_PASS_CREATION_FEEDBACK_INFO_EXT: Self = Self(1_000_458_002);
-    pub const RENDER_PASS_SUBPASS_FEEDBACK_INFO_EXT: Self = Self(1_000_458_003);
+    pub const RENDER_PASS_CREATION_FEEDBACK_CREATE_INFO_EXT: Self = Self(1_000_458_002);
+    pub const RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT: Self = Self(1_000_458_003);
 }
 impl ExtExtension460Fn {
     pub const fn name() -> &'static ::std::ffi::CStr {

diff --git a/generator/Vulkan-Headers b/generator/Vulkan-Headers
+3 −19		include/vulkan/vulkan.hpp
+17 −9		include/vulkan/vulkan_core.h
+4 −4		include/vulkan/vulkan_enums.hpp
+2 −0		include/vulkan/vulkan_handles.hpp
+28 −4		include/vulkan/vulkan_hash.hpp
+229 −341		include/vulkan/vulkan_raii.hpp
+210 −72		include/vulkan/vulkan_structs.hpp
+55 −69		registry/validusage.json
+20 −11		registry/vk.xml