From f958f33f4c91b7bed3d1ffa2a22de03daa4af783 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 20 Mar 2023 22:50:26 -0700 Subject: [PATCH] Update Vulkan-Headers to 1.3.244 --- Changelog.md | 2 +- ash/Cargo.toml | 2 +- ash/src/vk/const_debugs.rs | 8 ++++ ash/src/vk/definitions.rs | 97 +++++++++++++++++++++++++++++++++++++- ash/src/vk/extensions.rs | 68 ++++++++++++++++++++++++++ generator/Vulkan-Headers | 2 +- 6 files changed, 175 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index fe32bc72c..4c49a5a54 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Update Vulkan-Headers to 1.3.243 (#697) +- Update Vulkan-Headers to 1.3.244 (#697) ### Changed diff --git a/ash/Cargo.toml b/ash/Cargo.toml index 603c673dc..cf685cd3e 100644 --- a/ash/Cargo.toml +++ b/ash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ash" -version = "0.37.0+1.3.243" +version = "0.37.0+1.3.244" authors = [ "Maik Klein ", "Benjamin Saunders ", diff --git a/ash/src/vk/const_debugs.rs b/ash/src/vk/const_debugs.rs index 6052c9ed4..17741e45c 100644 --- a/ash/src/vk/const_debugs.rs +++ b/ash/src/vk/const_debugs.rs @@ -2901,6 +2901,12 @@ impl fmt::Debug for MemoryPropertyFlags { debug_flags(f, KNOWN, self.0) } } +impl fmt::Debug for MemoryUnmapFlagsKHR { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + const KNOWN: &[(Flags, &str)] = &[]; + debug_flags(f, KNOWN, self.0) + } +} impl fmt::Debug for MetalSurfaceCreateFlagsEXT { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { const KNOWN: &[(Flags, &str)] = &[]; @@ -5272,6 +5278,8 @@ impl fmt::Debug for StructureType { Self::PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR => { Some("PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR") } + Self::MEMORY_MAP_INFO_KHR => Some("MEMORY_MAP_INFO_KHR"), + Self::MEMORY_UNMAP_INFO_KHR => Some("MEMORY_UNMAP_INFO_KHR"), Self::PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT => { Some("PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT") } diff --git a/ash/src/vk/definitions.rs b/ash/src/vk/definitions.rs index a0c447052..6f079205a 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 = 243; +pub const HEADER_VERSION: u32 = 244; #[doc = ""] pub const HEADER_VERSION_COMPLETE: u32 = make_api_version(0, 1, 3, HEADER_VERSION); #[doc = ""] @@ -328,6 +328,11 @@ vk_bitflags_wrapped!(VideoEncodeFlagsKHR, Flags); #[doc = ""] pub struct VideoEncodeRateControlFlagsKHR(pub(crate) Flags); vk_bitflags_wrapped!(VideoEncodeRateControlFlagsKHR, Flags); +#[repr(transparent)] +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] +#[doc = ""] +pub struct MemoryUnmapFlagsKHR(pub(crate) Flags); +vk_bitflags_wrapped!(MemoryUnmapFlagsKHR, Flags); define_handle!( Instance, INSTANCE, @@ -47127,3 +47132,93 @@ impl<'a> QueryLowLatencySupportNV<'a> { self } } +#[repr(C)] +#[cfg_attr(feature = "debug", derive(Debug))] +#[derive(Copy, Clone)] +#[doc = ""] +pub struct MemoryMapInfoKHR<'a> { + pub s_type: StructureType, + pub p_next: *const c_void, + pub flags: MemoryMapFlags, + pub memory: DeviceMemory, + pub offset: DeviceSize, + pub size: DeviceSize, + pub _marker: PhantomData<&'a ()>, +} +impl ::std::default::Default for MemoryMapInfoKHR<'_> { + #[inline] + fn default() -> Self { + Self { + s_type: Self::STRUCTURE_TYPE, + p_next: ::std::ptr::null(), + flags: MemoryMapFlags::default(), + memory: DeviceMemory::default(), + offset: DeviceSize::default(), + size: DeviceSize::default(), + _marker: PhantomData, + } + } +} +unsafe impl<'a> TaggedStructure for MemoryMapInfoKHR<'a> { + const STRUCTURE_TYPE: StructureType = StructureType::MEMORY_MAP_INFO_KHR; +} +impl<'a> MemoryMapInfoKHR<'a> { + #[inline] + pub fn flags(mut self, flags: MemoryMapFlags) -> Self { + self.flags = flags; + self + } + #[inline] + pub fn memory(mut self, memory: DeviceMemory) -> Self { + self.memory = memory; + self + } + #[inline] + pub fn offset(mut self, offset: DeviceSize) -> Self { + self.offset = offset; + self + } + #[inline] + pub fn size(mut self, size: DeviceSize) -> Self { + self.size = size; + self + } +} +#[repr(C)] +#[cfg_attr(feature = "debug", derive(Debug))] +#[derive(Copy, Clone)] +#[doc = ""] +pub struct MemoryUnmapInfoKHR<'a> { + pub s_type: StructureType, + pub p_next: *const c_void, + pub flags: MemoryUnmapFlagsKHR, + pub memory: DeviceMemory, + pub _marker: PhantomData<&'a ()>, +} +impl ::std::default::Default for MemoryUnmapInfoKHR<'_> { + #[inline] + fn default() -> Self { + Self { + s_type: Self::STRUCTURE_TYPE, + p_next: ::std::ptr::null(), + flags: MemoryUnmapFlagsKHR::default(), + memory: DeviceMemory::default(), + _marker: PhantomData, + } + } +} +unsafe impl<'a> TaggedStructure for MemoryUnmapInfoKHR<'a> { + const STRUCTURE_TYPE: StructureType = StructureType::MEMORY_UNMAP_INFO_KHR; +} +impl<'a> MemoryUnmapInfoKHR<'a> { + #[inline] + pub fn flags(mut self, flags: MemoryUnmapFlagsKHR) -> Self { + self.flags = flags; + self + } + #[inline] + pub fn memory(mut self, memory: DeviceMemory) -> Self { + self.memory = memory; + self + } +} diff --git a/ash/src/vk/extensions.rs b/ash/src/vk/extensions.rs index 609b85bc4..1fbc1bbc5 100644 --- a/ash/src/vk/extensions.rs +++ b/ash/src/vk/extensions.rs @@ -13937,6 +13937,74 @@ impl StructureType { pub const PIPELINE_EXECUTABLE_STATISTIC_KHR: Self = Self(1_000_269_004); pub const PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR: Self = Self(1_000_269_005); } +impl KhrMapMemory2Fn { + pub const NAME: &'static ::std::ffi::CStr = + unsafe { ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"VK_KHR_map_memory2\0") }; + pub const SPEC_VERSION: u32 = 1u32; +} +#[allow(non_camel_case_types)] +pub type PFN_vkMapMemory2KHR = unsafe extern "system" fn( + device: Device, + p_memory_map_info: *const MemoryMapInfoKHR, + pp_data: *mut *mut c_void, +) -> Result; +#[allow(non_camel_case_types)] +pub type PFN_vkUnmapMemory2KHR = unsafe extern "system" fn( + device: Device, + p_memory_unmap_info: *const MemoryUnmapInfoKHR, +) -> Result; +#[derive(Clone)] +pub struct KhrMapMemory2Fn { + pub map_memory2_khr: PFN_vkMapMemory2KHR, + pub unmap_memory2_khr: PFN_vkUnmapMemory2KHR, +} +unsafe impl Send for KhrMapMemory2Fn {} +unsafe impl Sync for KhrMapMemory2Fn {} +impl KhrMapMemory2Fn { + pub fn load(mut _f: F) -> Self + where + F: FnMut(&::std::ffi::CStr) -> *const c_void, + { + Self { + map_memory2_khr: unsafe { + unsafe extern "system" fn map_memory2_khr( + _device: Device, + _p_memory_map_info: *const MemoryMapInfoKHR, + _pp_data: *mut *mut c_void, + ) -> Result { + panic!(concat!("Unable to load ", stringify!(map_memory2_khr))) + } + let cname = ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"vkMapMemory2KHR\0"); + let val = _f(cname); + if val.is_null() { + map_memory2_khr + } else { + ::std::mem::transmute(val) + } + }, + unmap_memory2_khr: unsafe { + unsafe extern "system" fn unmap_memory2_khr( + _device: Device, + _p_memory_unmap_info: *const MemoryUnmapInfoKHR, + ) -> Result { + panic!(concat!("Unable to load ", stringify!(unmap_memory2_khr))) + } + let cname = ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"vkUnmapMemory2KHR\0"); + let val = _f(cname); + if val.is_null() { + unmap_memory2_khr + } else { + ::std::mem::transmute(val) + } + }, + } + } +} +#[doc = "Generated from 'VK_KHR_map_memory2'"] +impl StructureType { + pub const MEMORY_MAP_INFO_KHR: Self = Self(1_000_271_000); + pub const MEMORY_UNMAP_INFO_KHR: Self = Self(1_000_271_001); +} impl ExtShaderAtomicFloat2Fn { pub const NAME: &'static ::std::ffi::CStr = unsafe { ::std::ffi::CStr::from_bytes_with_nul_unchecked(b"VK_EXT_shader_atomic_float2\0") diff --git a/generator/Vulkan-Headers b/generator/Vulkan-Headers index d732b2de3..fa204df59 160000 --- a/generator/Vulkan-Headers +++ b/generator/Vulkan-Headers @@ -1 +1 @@ -Subproject commit d732b2de303ce505169011d438178191136bfb00 +Subproject commit fa204df59c6caea6b9be3cf0754a88cd89056a87