Skip to content

Commit

Permalink
Update Vulkan-Headers to 1.3.245
Browse files Browse the repository at this point in the history
  • Loading branch information
MarijnS95 committed Mar 27, 2023
1 parent a9fbc71 commit 67053a9
Show file tree
Hide file tree
Showing 7 changed files with 362 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.244 (#697)
- Update Vulkan-Headers to 1.3.245 (#697, #723)

### Changed

Expand Down
2 changes: 1 addition & 1 deletion ash/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ash"
version = "0.37.0+1.3.244"
version = "0.37.0+1.3.245"
authors = [
"Maik Klein <maikklein@googlemail.com>",
"Benjamin Saunders <ben.e.saunders@gmail.com>",
Expand Down
33 changes: 33 additions & 0 deletions ash/src/vk/const_debugs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,10 @@ impl fmt::Debug for BuildAccelerationStructureFlagsKHR {
BuildAccelerationStructureFlagsKHR::ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT.0,
"ALLOW_OPACITY_MICROMAP_DATA_UPDATE_EXT",
),
(
BuildAccelerationStructureFlagsKHR::ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV.0,
"ALLOW_DISPLACEMENT_MICROMAP_UPDATE_NV",
),
];
debug_flags(f, KNOWN, self.0)
}
Expand Down Expand Up @@ -1419,6 +1423,21 @@ impl fmt::Debug for DiscardRectangleModeEXT {
}
}
}
impl fmt::Debug for DisplacementMicromapFormatNV {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let name = match *self {
Self::TYPE_64_TRIANGLES_64_BYTES => Some("TYPE_64_TRIANGLES_64_BYTES"),
Self::TYPE_256_TRIANGLES_128_BYTES => Some("TYPE_256_TRIANGLES_128_BYTES"),
Self::TYPE_1024_TRIANGLES_128_BYTES => Some("TYPE_1024_TRIANGLES_128_BYTES"),
_ => None,
};
if let Some(x) = name {
f.write_str(x)
} else {
self.0.fmt(f)
}
}
}
impl fmt::Debug for DisplayEventTypeEXT {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let name = match *self {
Expand Down Expand Up @@ -2926,6 +2945,7 @@ impl fmt::Debug for MicromapTypeEXT {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let name = match *self {
Self::OPACITY_MICROMAP => Some("OPACITY_MICROMAP"),
Self::DISPLACEMENT_MICROMAP_NV => Some("DISPLACEMENT_MICROMAP_NV"),
_ => None,
};
if let Some(x) = name {
Expand Down Expand Up @@ -3383,6 +3403,10 @@ impl fmt::Debug for PipelineCreateFlags {
PipelineCreateFlags::RAY_TRACING_OPACITY_MICROMAP_EXT.0,
"RAY_TRACING_OPACITY_MICROMAP_EXT",
),
(
PipelineCreateFlags::RAY_TRACING_DISPLACEMENT_MICROMAP_NV.0,
"RAY_TRACING_DISPLACEMENT_MICROMAP_NV",
),
(
PipelineCreateFlags::NO_PROTECTED_ACCESS_EXT.0,
"NO_PROTECTED_ACCESS_EXT",
Expand Down Expand Up @@ -5661,6 +5685,15 @@ impl fmt::Debug for StructureType {
Self::ACCELERATION_STRUCTURE_TRIANGLES_OPACITY_MICROMAP_EXT => {
Some("ACCELERATION_STRUCTURE_TRIANGLES_OPACITY_MICROMAP_EXT")
}
Self::PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV => {
Some("PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV")
}
Self::PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV => {
Some("PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV")
}
Self::ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV => {
Some("ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV")
}
Self::PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI => {
Some("PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI")
}
Expand Down
271 changes: 270 additions & 1 deletion ash/src/vk/definitions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ 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);
#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_HEADER_VERSION.html>"]
pub const HEADER_VERSION: u32 = 244;
pub const HEADER_VERSION: u32 = 245;
#[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>"]
Expand Down Expand Up @@ -44318,6 +44318,275 @@ impl<'a> AccelerationStructureTrianglesOpacityMicromapEXT<'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/VkPhysicalDeviceDisplacementMicromapFeaturesNV.html>"]
pub struct PhysicalDeviceDisplacementMicromapFeaturesNV<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub displacement_micromap: Bool32,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for PhysicalDeviceDisplacementMicromapFeaturesNV<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: Self::STRUCTURE_TYPE,
p_next: ::std::ptr::null_mut(),
displacement_micromap: Bool32::default(),
_marker: PhantomData,
}
}
}
unsafe impl<'a> TaggedStructure for PhysicalDeviceDisplacementMicromapFeaturesNV<'a> {
const STRUCTURE_TYPE: StructureType =
StructureType::PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV;
}
unsafe impl ExtendsPhysicalDeviceFeatures2 for PhysicalDeviceDisplacementMicromapFeaturesNV<'_> {}
unsafe impl ExtendsDeviceCreateInfo for PhysicalDeviceDisplacementMicromapFeaturesNV<'_> {}
impl<'a> PhysicalDeviceDisplacementMicromapFeaturesNV<'a> {
#[inline]
pub fn displacement_micromap(mut self, displacement_micromap: bool) -> Self {
self.displacement_micromap = displacement_micromap.into();
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/VkPhysicalDeviceDisplacementMicromapPropertiesNV.html>"]
pub struct PhysicalDeviceDisplacementMicromapPropertiesNV<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub max_displacement_micromap_subdivision_level: u32,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for PhysicalDeviceDisplacementMicromapPropertiesNV<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: Self::STRUCTURE_TYPE,
p_next: ::std::ptr::null_mut(),
max_displacement_micromap_subdivision_level: u32::default(),
_marker: PhantomData,
}
}
}
unsafe impl<'a> TaggedStructure for PhysicalDeviceDisplacementMicromapPropertiesNV<'a> {
const STRUCTURE_TYPE: StructureType =
StructureType::PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV;
}
unsafe impl ExtendsPhysicalDeviceProperties2
for PhysicalDeviceDisplacementMicromapPropertiesNV<'_>
{
}
impl<'a> PhysicalDeviceDisplacementMicromapPropertiesNV<'a> {
#[inline]
pub fn max_displacement_micromap_subdivision_level(
mut self,
max_displacement_micromap_subdivision_level: u32,
) -> Self {
self.max_displacement_micromap_subdivision_level =
max_displacement_micromap_subdivision_level;
self
}
}
#[repr(C)]
#[derive(Copy, Clone)]
#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkAccelerationStructureTrianglesDisplacementMicromapNV.html>"]
pub struct AccelerationStructureTrianglesDisplacementMicromapNV<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub displacement_bias_and_scale_format: Format,
pub displacement_vector_format: Format,
pub displacement_bias_and_scale_buffer: DeviceOrHostAddressConstKHR,
pub displacement_bias_and_scale_stride: DeviceSize,
pub displacement_vector_buffer: DeviceOrHostAddressConstKHR,
pub displacement_vector_stride: DeviceSize,
pub displaced_micromap_primitive_flags: DeviceOrHostAddressConstKHR,
pub displaced_micromap_primitive_flags_stride: DeviceSize,
pub index_type: IndexType,
pub index_buffer: DeviceOrHostAddressConstKHR,
pub index_stride: DeviceSize,
pub base_triangle: u32,
pub usage_counts_count: u32,
pub p_usage_counts: *const MicromapUsageEXT,
pub pp_usage_counts: *const *const MicromapUsageEXT,
pub micromap: MicromapEXT,
pub _marker: PhantomData<&'a ()>,
}
#[cfg(feature = "debug")]
impl fmt::Debug for AccelerationStructureTrianglesDisplacementMicromapNV<'_> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt.debug_struct("AccelerationStructureTrianglesDisplacementMicromapNV")
.field("s_type", &self.s_type)
.field("p_next", &self.p_next)
.field(
"displacement_bias_and_scale_format",
&self.displacement_bias_and_scale_format,
)
.field(
"displacement_vector_format",
&self.displacement_vector_format,
)
.field("displacement_bias_and_scale_buffer", &"union")
.field(
"displacement_bias_and_scale_stride",
&self.displacement_bias_and_scale_stride,
)
.field("displacement_vector_buffer", &"union")
.field(
"displacement_vector_stride",
&self.displacement_vector_stride,
)
.field("displaced_micromap_primitive_flags", &"union")
.field(
"displaced_micromap_primitive_flags_stride",
&self.displaced_micromap_primitive_flags_stride,
)
.field("index_type", &self.index_type)
.field("index_buffer", &"union")
.field("index_stride", &self.index_stride)
.field("base_triangle", &self.base_triangle)
.field("usage_counts_count", &self.usage_counts_count)
.field("p_usage_counts", &self.p_usage_counts)
.field("pp_usage_counts", &self.pp_usage_counts)
.field("micromap", &self.micromap)
.finish()
}
}
impl ::std::default::Default for AccelerationStructureTrianglesDisplacementMicromapNV<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: Self::STRUCTURE_TYPE,
p_next: ::std::ptr::null_mut(),
displacement_bias_and_scale_format: Format::default(),
displacement_vector_format: Format::default(),
displacement_bias_and_scale_buffer: DeviceOrHostAddressConstKHR::default(),
displacement_bias_and_scale_stride: DeviceSize::default(),
displacement_vector_buffer: DeviceOrHostAddressConstKHR::default(),
displacement_vector_stride: DeviceSize::default(),
displaced_micromap_primitive_flags: DeviceOrHostAddressConstKHR::default(),
displaced_micromap_primitive_flags_stride: DeviceSize::default(),
index_type: IndexType::default(),
index_buffer: DeviceOrHostAddressConstKHR::default(),
index_stride: DeviceSize::default(),
base_triangle: u32::default(),
usage_counts_count: u32::default(),
p_usage_counts: ::std::ptr::null(),
pp_usage_counts: ::std::ptr::null(),
micromap: MicromapEXT::default(),
_marker: PhantomData,
}
}
}
unsafe impl<'a> TaggedStructure for AccelerationStructureTrianglesDisplacementMicromapNV<'a> {
const STRUCTURE_TYPE: StructureType =
StructureType::ACCELERATION_STRUCTURE_TRIANGLES_DISPLACEMENT_MICROMAP_NV;
}
unsafe impl ExtendsAccelerationStructureGeometryTrianglesDataKHR
for AccelerationStructureTrianglesDisplacementMicromapNV<'_>
{
}
impl<'a> AccelerationStructureTrianglesDisplacementMicromapNV<'a> {
#[inline]
pub fn displacement_bias_and_scale_format(
mut self,
displacement_bias_and_scale_format: Format,
) -> Self {
self.displacement_bias_and_scale_format = displacement_bias_and_scale_format;
self
}
#[inline]
pub fn displacement_vector_format(mut self, displacement_vector_format: Format) -> Self {
self.displacement_vector_format = displacement_vector_format;
self
}
#[inline]
pub fn displacement_bias_and_scale_buffer(
mut self,
displacement_bias_and_scale_buffer: DeviceOrHostAddressConstKHR,
) -> Self {
self.displacement_bias_and_scale_buffer = displacement_bias_and_scale_buffer;
self
}
#[inline]
pub fn displacement_bias_and_scale_stride(
mut self,
displacement_bias_and_scale_stride: DeviceSize,
) -> Self {
self.displacement_bias_and_scale_stride = displacement_bias_and_scale_stride;
self
}
#[inline]
pub fn displacement_vector_buffer(
mut self,
displacement_vector_buffer: DeviceOrHostAddressConstKHR,
) -> Self {
self.displacement_vector_buffer = displacement_vector_buffer;
self
}
#[inline]
pub fn displacement_vector_stride(mut self, displacement_vector_stride: DeviceSize) -> Self {
self.displacement_vector_stride = displacement_vector_stride;
self
}
#[inline]
pub fn displaced_micromap_primitive_flags(
mut self,
displaced_micromap_primitive_flags: DeviceOrHostAddressConstKHR,
) -> Self {
self.displaced_micromap_primitive_flags = displaced_micromap_primitive_flags;
self
}
#[inline]
pub fn displaced_micromap_primitive_flags_stride(
mut self,
displaced_micromap_primitive_flags_stride: DeviceSize,
) -> Self {
self.displaced_micromap_primitive_flags_stride = displaced_micromap_primitive_flags_stride;
self
}
#[inline]
pub fn index_type(mut self, index_type: IndexType) -> Self {
self.index_type = index_type;
self
}
#[inline]
pub fn index_buffer(mut self, index_buffer: DeviceOrHostAddressConstKHR) -> Self {
self.index_buffer = index_buffer;
self
}
#[inline]
pub fn index_stride(mut self, index_stride: DeviceSize) -> Self {
self.index_stride = index_stride;
self
}
#[inline]
pub fn base_triangle(mut self, base_triangle: u32) -> Self {
self.base_triangle = base_triangle;
self
}
#[inline]
pub fn usage_counts(mut self, usage_counts: &'a [MicromapUsageEXT]) -> Self {
self.usage_counts_count = usage_counts.len() as _;
self.p_usage_counts = usage_counts.as_ptr();
self
}
#[inline]
pub fn usage_counts_ptrs(mut self, usage_counts_ptrs: &'a [&'a MicromapUsageEXT]) -> Self {
self.usage_counts_count = usage_counts_ptrs.len() as _;
self.pp_usage_counts = usage_counts_ptrs.as_ptr().cast();
self
}
#[inline]
pub fn micromap(mut self, micromap: MicromapEXT) -> Self {
self.micromap = micromap;
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/VkPipelinePropertiesIdentifierEXT.html>"]
pub struct PipelinePropertiesIdentifierEXT<'a> {
pub s_type: StructureType,
Expand Down
19 changes: 19 additions & 0 deletions ash/src/vk/enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,25 @@ impl DeviceFaultVendorBinaryHeaderVersionEXT {
impl DeviceFaultVendorBinaryHeaderVersionEXT {
pub const ONE: Self = Self(1);
}
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
#[repr(transparent)]
#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkDisplacementMicromapFormatNV.html>"]
pub struct DisplacementMicromapFormatNV(pub(crate) i32);
impl DisplacementMicromapFormatNV {
#[inline]
pub const fn from_raw(x: i32) -> Self {
Self(x)
}
#[inline]
pub const fn as_raw(self) -> i32 {
self.0
}
}
impl DisplacementMicromapFormatNV {
pub const TYPE_64_TRIANGLES_64_BYTES: Self = Self(1);
pub const TYPE_256_TRIANGLES_128_BYTES: Self = Self(2);
pub const TYPE_1024_TRIANGLES_128_BYTES: Self = Self(3);
}
impl fmt::Debug for ObjectType {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let name = match *self {
Expand Down
Loading

0 comments on commit 67053a9

Please sign in to comment.