Skip to content

Commit

Permalink
Update Vulkan-Headers to 1.3.219
Browse files Browse the repository at this point in the history
  • Loading branch information
MarijnS95 committed Jun 30, 2022
1 parent 29cc2ce commit b71f2d4
Show file tree
Hide file tree
Showing 8 changed files with 394 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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.218 (#605, #608, #619)
- Update Vulkan-Headers to 1.3.219 (#605, #608, #619)
- Added `VK_EXT_image_drm_format_modifier` device extension (#603)
- Added new functions to `VK_KHR_swapchain`, available since Vulkan 1.1 (#629)
- Added `VK_KHR_device_group_creation` instance extension (#630)
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.218"
version = "0.37.0+1.3.219"
authors = ["maik klein <maikklein@googlemail.com>"]
description = "Vulkan bindings for Rust"
license = "MIT"
Expand Down
26 changes: 25 additions & 1 deletion ash/src/vk/const_debugs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@ impl fmt::Debug for BufferUsageFlags {
BufferUsageFlags::CONDITIONAL_RENDERING_EXT.0,
"CONDITIONAL_RENDERING_EXT",
),
(BufferUsageFlags::RESERVED_25_AMD.0, "RESERVED_25_AMD"),
(
BufferUsageFlags::ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_KHR.0,
"ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_KHR",
Expand Down Expand Up @@ -1350,6 +1351,7 @@ impl fmt::Debug for DriverId {
Self::MESA_PANVK => Some("MESA_PANVK"),
Self::SAMSUNG_PROPRIETARY => Some("SAMSUNG_PROPRIETARY"),
Self::MESA_VENUS => Some("MESA_VENUS"),
Self::MESA_DOZEN => Some("MESA_DOZEN"),
_ => None,
};
if let Some(x) = name {
Expand Down Expand Up @@ -2309,7 +2311,10 @@ impl fmt::Debug for ImageCreateFlags {
),
(ImageCreateFlags::SUBSAMPLED_EXT.0, "SUBSAMPLED_EXT"),
(ImageCreateFlags::RESERVED_16_AMD.0, "RESERVED_16_AMD"),
(ImageCreateFlags::RESERVED_18_EXT.0, "RESERVED_18_EXT"),
(
ImageCreateFlags::MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_EXT.0,
"MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_EXT",
),
(
ImageCreateFlags::TYPE_2D_VIEW_COMPATIBLE_EXT.0,
"TYPE_2D_VIEW_COMPATIBLE_EXT",
Expand Down Expand Up @@ -5105,6 +5110,15 @@ impl fmt::Debug for StructureType {
Self::PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT => {
Some("PHYSICAL_DEVICE_PIPELINE_PROPERTIES_FEATURES_EXT")
}
Self::PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT => {
Some("PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT")
}
Self::SUBPASS_RESOLVE_PERFORMANCE_QUERY_EXT => {
Some("SUBPASS_RESOLVE_PERFORMANCE_QUERY_EXT")
}
Self::MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_INFO_EXT => {
Some("MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_INFO_EXT")
}
Self::PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT => {
Some("PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT")
}
Expand Down Expand Up @@ -5180,6 +5194,16 @@ impl fmt::Debug for StructureType {
Self::RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT => {
Some("RENDER_PASS_SUBPASS_FEEDBACK_CREATE_INFO_EXT")
}
Self::PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT => {
Some("PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT")
}
Self::PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT => {
Some("PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT")
}
Self::PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT => {
Some("PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT")
}
Self::SHADER_MODULE_IDENTIFIER_EXT => Some("SHADER_MODULE_IDENTIFIER_EXT"),
Self::PHYSICAL_DEVICE_SUBGROUP_PROPERTIES => {
Some("PHYSICAL_DEVICE_SUBGROUP_PROPERTIES")
}
Expand Down
1 change: 1 addition & 0 deletions ash/src/vk/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ pub const MAX_DRIVER_NAME_SIZE: usize = 256;
pub const MAX_DRIVER_INFO_SIZE: usize = 256;
pub const SHADER_UNUSED_KHR: u32 = !0;
pub const MAX_GLOBAL_PRIORITY_SIZE_KHR: usize = 16;
pub const MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT: usize = 32;
pub const SHADER_UNUSED_NV: u32 = SHADER_UNUSED_KHR;
250 changes: 246 additions & 4 deletions ash/src/vk/definitions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 218u32;
pub const HEADER_VERSION: u32 = 219u32;
#[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 @@ -32545,6 +32545,116 @@ impl<'a> PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT<'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/VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT.html>"]
pub struct PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub multisampled_render_to_single_sampled: Bool32,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type:
StructureType::PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT,
p_next: ::std::ptr::null_mut(),
multisampled_render_to_single_sampled: Bool32::default(),
_marker: PhantomData,
}
}
}
unsafe impl ExtendsPhysicalDeviceFeatures2
for PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT<'_>
{
}
unsafe impl ExtendsDeviceCreateInfo
for PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT<'_>
{
}
impl<'a> PhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT<'a> {
#[inline]
pub fn multisampled_render_to_single_sampled(
mut self,
multisampled_render_to_single_sampled: bool,
) -> Self {
self.multisampled_render_to_single_sampled = multisampled_render_to_single_sampled.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/VkSubpassResolvePerformanceQueryEXT.html>"]
pub struct SubpassResolvePerformanceQueryEXT<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub optimal: Bool32,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for SubpassResolvePerformanceQueryEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: StructureType::SUBPASS_RESOLVE_PERFORMANCE_QUERY_EXT,
p_next: ::std::ptr::null_mut(),
optimal: Bool32::default(),
_marker: PhantomData,
}
}
}
unsafe impl ExtendsFormatProperties2 for SubpassResolvePerformanceQueryEXT<'_> {}
impl<'a> SubpassResolvePerformanceQueryEXT<'a> {
#[inline]
pub fn optimal(mut self, optimal: bool) -> Self {
self.optimal = optimal.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/VkMultisampledRenderToSingleSampledInfoEXT.html>"]
pub struct MultisampledRenderToSingleSampledInfoEXT<'a> {
pub s_type: StructureType,
pub p_next: *const c_void,
pub multisampled_render_to_single_sampled_enable: Bool32,
pub rasterization_samples: SampleCountFlags,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for MultisampledRenderToSingleSampledInfoEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: StructureType::MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_INFO_EXT,
p_next: ::std::ptr::null(),
multisampled_render_to_single_sampled_enable: Bool32::default(),
rasterization_samples: SampleCountFlags::default(),
_marker: PhantomData,
}
}
}
unsafe impl ExtendsSubpassDescription2 for MultisampledRenderToSingleSampledInfoEXT<'_> {}
unsafe impl ExtendsRenderingInfo for MultisampledRenderToSingleSampledInfoEXT<'_> {}
impl<'a> MultisampledRenderToSingleSampledInfoEXT<'a> {
#[inline]
pub fn multisampled_render_to_single_sampled_enable(
mut self,
multisampled_render_to_single_sampled_enable: bool,
) -> Self {
self.multisampled_render_to_single_sampled_enable =
multisampled_render_to_single_sampled_enable.into();
self
}
#[inline]
pub fn rasterization_samples(mut self, rasterization_samples: SampleCountFlags) -> Self {
self.rasterization_samples = rasterization_samples;
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/VkVideoQueueFamilyProperties2KHR.html>"]
pub struct VideoQueueFamilyProperties2KHR<'a> {
pub s_type: StructureType,
Expand Down Expand Up @@ -38727,6 +38837,141 @@ impl<'a> DescriptorSetLayoutHostMappingInfoVALVE<'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/VkPhysicalDeviceShaderModuleIdentifierFeaturesEXT.html>"]
pub struct PhysicalDeviceShaderModuleIdentifierFeaturesEXT<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub shader_module_identifier: Bool32,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for PhysicalDeviceShaderModuleIdentifierFeaturesEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: StructureType::PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_FEATURES_EXT,
p_next: ::std::ptr::null_mut(),
shader_module_identifier: Bool32::default(),
_marker: PhantomData,
}
}
}
unsafe impl ExtendsPhysicalDeviceFeatures2 for PhysicalDeviceShaderModuleIdentifierFeaturesEXT<'_> {}
unsafe impl ExtendsDeviceCreateInfo for PhysicalDeviceShaderModuleIdentifierFeaturesEXT<'_> {}
impl<'a> PhysicalDeviceShaderModuleIdentifierFeaturesEXT<'a> {
#[inline]
pub fn shader_module_identifier(mut self, shader_module_identifier: bool) -> Self {
self.shader_module_identifier = shader_module_identifier.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/VkPhysicalDeviceShaderModuleIdentifierPropertiesEXT.html>"]
pub struct PhysicalDeviceShaderModuleIdentifierPropertiesEXT<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub shader_module_identifier_algorithm_uuid: [u8; UUID_SIZE],
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for PhysicalDeviceShaderModuleIdentifierPropertiesEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: StructureType::PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT,
p_next: ::std::ptr::null_mut(),
shader_module_identifier_algorithm_uuid: unsafe { ::std::mem::zeroed() },
_marker: PhantomData,
}
}
}
unsafe impl ExtendsPhysicalDeviceProperties2
for PhysicalDeviceShaderModuleIdentifierPropertiesEXT<'_>
{
}
impl<'a> PhysicalDeviceShaderModuleIdentifierPropertiesEXT<'a> {
#[inline]
pub fn shader_module_identifier_algorithm_uuid(
mut self,
shader_module_identifier_algorithm_uuid: [u8; UUID_SIZE],
) -> Self {
self.shader_module_identifier_algorithm_uuid = shader_module_identifier_algorithm_uuid;
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/VkPipelineShaderStageModuleIdentifierCreateInfoEXT.html>"]
pub struct PipelineShaderStageModuleIdentifierCreateInfoEXT<'a> {
pub s_type: StructureType,
pub p_next: *const c_void,
pub identifier_size: u32,
pub p_identifier: *const u8,
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for PipelineShaderStageModuleIdentifierCreateInfoEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: StructureType::PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT,
p_next: ::std::ptr::null(),
identifier_size: u32::default(),
p_identifier: ::std::ptr::null(),
_marker: PhantomData,
}
}
}
unsafe impl ExtendsPipelineShaderStageCreateInfo
for PipelineShaderStageModuleIdentifierCreateInfoEXT<'_>
{
}
impl<'a> PipelineShaderStageModuleIdentifierCreateInfoEXT<'a> {
#[inline]
pub fn identifier(mut self, identifier: &'a [u8]) -> Self {
self.identifier_size = identifier.len() as _;
self.p_identifier = identifier.as_ptr();
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/VkShaderModuleIdentifierEXT.html>"]
pub struct ShaderModuleIdentifierEXT<'a> {
pub s_type: StructureType,
pub p_next: *mut c_void,
pub identifier_size: u32,
pub identifier: [u8; MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT],
pub _marker: PhantomData<&'a ()>,
}
impl ::std::default::Default for ShaderModuleIdentifierEXT<'_> {
#[inline]
fn default() -> Self {
Self {
s_type: StructureType::SHADER_MODULE_IDENTIFIER_EXT,
p_next: ::std::ptr::null_mut(),
identifier_size: u32::default(),
identifier: unsafe { ::std::mem::zeroed() },
_marker: PhantomData,
}
}
}
impl<'a> ShaderModuleIdentifierEXT<'a> {
#[inline]
pub fn identifier_size(mut self, identifier_size: u32) -> Self {
self.identifier_size = identifier_size;
self
}
#[inline]
pub fn identifier(mut self, identifier: [u8; MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT]) -> Self {
self.identifier = identifier;
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/VkImageCompressionControlEXT.html>"]
pub struct ImageCompressionControlEXT<'a> {
pub s_type: StructureType,
Expand Down Expand Up @@ -39161,9 +39406,6 @@ 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<'_> {}
impl<'a> PipelinePropertiesIdentifierEXT<'a> {
#[inline]
pub fn pipeline_identifier(mut self, pipeline_identifier: [u8; UUID_SIZE]) -> Self {
Expand Down
2 changes: 2 additions & 0 deletions ash/src/vk/enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1665,6 +1665,8 @@ impl DriverId {
pub const SAMSUNG_PROPRIETARY: Self = Self(21);
#[doc = "Mesa open source project"]
pub const MESA_VENUS: Self = Self(22);
#[doc = "Mesa open source project"]
pub const MESA_DOZEN: Self = Self(23);
}
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
#[repr(transparent)]
Expand Down
Loading

0 comments on commit b71f2d4

Please sign in to comment.