From 1979b0e4c0960d3187ad1089edbcb655894badf0 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Fri, 4 Aug 2023 21:59:45 +0200 Subject: [PATCH] Update Vulkan-Headers to 1.3.261 --- Changelog.md | 2 +- ash/Cargo.toml | 2 +- ash/src/vk/const_debugs.rs | 87 +++++++++++++++++++++----------------- ash/src/vk/definitions.rs | 2 +- ash/src/vk/extensions.rs | 49 +++++++++++---------- generator/Vulkan-Headers | 2 +- 6 files changed, 76 insertions(+), 68 deletions(-) diff --git a/Changelog.md b/Changelog.md index d8ac0961a..f85de0635 100644 --- a/Changelog.md +++ b/Changelog.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `Handle::is_null()` to allow checking if a handle is a `NULL` value (#694) - Allow building `Entry`/`Instance`/`Device` from handle+fns (see their `from_parts_1_x()` associated functions) (#748) -- Update Vulkan-Headers to 1.3.260 (#760, #763) +- Update Vulkan-Headers to 1.3.261 (#760, #763, #783) - Added `VK_NV_memory_decompression` device extension (#761) - Added `VK_GOOGLE_display_timing` device extension (#765) - Added `VK_ANDROID_external_memory_android_hardware_buffer` device extension (#769) diff --git a/ash/Cargo.toml b/ash/Cargo.toml index db8516987..481ed5162 100644 --- a/ash/Cargo.toml +++ b/ash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ash" -version = "0.37.0+1.3.260" +version = "0.37.0+1.3.261" authors = [ "Maik Klein ", "Benjamin Saunders ", diff --git a/ash/src/vk/const_debugs.rs b/ash/src/vk/const_debugs.rs index 4923a8a53..ffd7f946a 100644 --- a/ash/src/vk/const_debugs.rs +++ b/ash/src/vk/const_debugs.rs @@ -636,20 +636,20 @@ impl fmt::Debug for BufferUsageFlags2KHR { "EXECUTION_GRAPH_SCRATCH_AMDX", ), ( - BufferUsageFlags2KHR::CONDITIONAL_RENDERING.0, - "CONDITIONAL_RENDERING", + BufferUsageFlags2KHR::CONDITIONAL_RENDERING_EXT.0, + "CONDITIONAL_RENDERING_EXT", ), ( BufferUsageFlags2KHR::SHADER_BINDING_TABLE.0, "SHADER_BINDING_TABLE", ), ( - BufferUsageFlags2KHR::TRANSFORM_FEEDBACK_BUFFER.0, - "TRANSFORM_FEEDBACK_BUFFER", + BufferUsageFlags2KHR::TRANSFORM_FEEDBACK_BUFFER_EXT.0, + "TRANSFORM_FEEDBACK_BUFFER_EXT", ), ( - BufferUsageFlags2KHR::TRANSFORM_FEEDBACK_COUNTER_BUFFER.0, - "TRANSFORM_FEEDBACK_COUNTER_BUFFER", + BufferUsageFlags2KHR::TRANSFORM_FEEDBACK_COUNTER_BUFFER_EXT.0, + "TRANSFORM_FEEDBACK_COUNTER_BUFFER_EXT", ), (BufferUsageFlags2KHR::VIDEO_DECODE_SRC.0, "VIDEO_DECODE_SRC"), (BufferUsageFlags2KHR::VIDEO_DECODE_DST.0, "VIDEO_DECODE_DST"), @@ -668,22 +668,25 @@ impl fmt::Debug for BufferUsageFlags2KHR { "ACCELERATION_STRUCTURE_STORAGE", ), ( - BufferUsageFlags2KHR::SAMPLER_DESCRIPTOR_BUFFER.0, - "SAMPLER_DESCRIPTOR_BUFFER", + BufferUsageFlags2KHR::SAMPLER_DESCRIPTOR_BUFFER_EXT.0, + "SAMPLER_DESCRIPTOR_BUFFER_EXT", ), ( - BufferUsageFlags2KHR::RESOURCE_DESCRIPTOR_BUFFER.0, - "RESOURCE_DESCRIPTOR_BUFFER", + BufferUsageFlags2KHR::RESOURCE_DESCRIPTOR_BUFFER_EXT.0, + "RESOURCE_DESCRIPTOR_BUFFER_EXT", ), ( - BufferUsageFlags2KHR::PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER.0, - "PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER", + BufferUsageFlags2KHR::PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_EXT.0, + "PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_EXT", ), ( - BufferUsageFlags2KHR::MICROMAP_BUILD_INPUT_READ_ONLY.0, - "MICROMAP_BUILD_INPUT_READ_ONLY", + BufferUsageFlags2KHR::MICROMAP_BUILD_INPUT_READ_ONLY_EXT.0, + "MICROMAP_BUILD_INPUT_READ_ONLY_EXT", + ), + ( + BufferUsageFlags2KHR::MICROMAP_STORAGE_EXT.0, + "MICROMAP_STORAGE_EXT", ), - (BufferUsageFlags2KHR::MICROMAP_STORAGE.0, "MICROMAP_STORAGE"), ]; debug_flags(f, KNOWN, self.0) } @@ -3567,13 +3570,15 @@ impl fmt::Debug for PipelineCreateFlags2KHR { "ALLOW_DERIVATIVES", ), (PipelineCreateFlags2KHR::DERIVATIVE.0, "DERIVATIVE"), - (PipelineCreateFlags2KHR::RESERVED_28_NV.0, "RESERVED_28_NV"), ( PipelineCreateFlags2KHR::VIEW_INDEX_FROM_DEVICE_INDEX.0, "VIEW_INDEX_FROM_DEVICE_INDEX", ), (PipelineCreateFlags2KHR::DISPATCH_BASE.0, "DISPATCH_BASE"), - (PipelineCreateFlags2KHR::DEFER_COMPILE.0, "DEFER_COMPILE"), + ( + PipelineCreateFlags2KHR::DEFER_COMPILE_NV.0, + "DEFER_COMPILE_NV", + ), ( PipelineCreateFlags2KHR::CAPTURE_STATISTICS.0, "CAPTURE_STATISTICS", @@ -3591,12 +3596,12 @@ impl fmt::Debug for PipelineCreateFlags2KHR { "EARLY_RETURN_ON_FAILURE", ), ( - PipelineCreateFlags2KHR::LINK_TIME_OPTIMIZATION.0, - "LINK_TIME_OPTIMIZATION", + PipelineCreateFlags2KHR::LINK_TIME_OPTIMIZATION_EXT.0, + "LINK_TIME_OPTIMIZATION_EXT", ), ( - PipelineCreateFlags2KHR::RETAIN_LINK_TIME_OPTIMIZATION_INFO.0, - "RETAIN_LINK_TIME_OPTIMIZATION_INFO", + PipelineCreateFlags2KHR::RETAIN_LINK_TIME_OPTIMIZATION_INFO_EXT.0, + "RETAIN_LINK_TIME_OPTIMIZATION_INFO_EXT", ), (PipelineCreateFlags2KHR::LIBRARY.0, "LIBRARY"), ( @@ -3628,44 +3633,48 @@ impl fmt::Debug for PipelineCreateFlags2KHR { "RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY", ), ( - PipelineCreateFlags2KHR::INDIRECT_BINDABLE.0, - "INDIRECT_BINDABLE", + PipelineCreateFlags2KHR::INDIRECT_BINDABLE_NV.0, + "INDIRECT_BINDABLE_NV", ), ( - PipelineCreateFlags2KHR::RAY_TRACING_ALLOW_MOTION.0, - "RAY_TRACING_ALLOW_MOTION", + PipelineCreateFlags2KHR::RAY_TRACING_ALLOW_MOTION_NV.0, + "RAY_TRACING_ALLOW_MOTION_NV", ), ( PipelineCreateFlags2KHR::RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT.0, "RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT", ), ( - PipelineCreateFlags2KHR::RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT.0, - "RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT", + PipelineCreateFlags2KHR::RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_EXT.0, + "RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_EXT", ), ( - PipelineCreateFlags2KHR::RAY_TRACING_OPACITY_MICROMAP.0, - "RAY_TRACING_OPACITY_MICROMAP", + PipelineCreateFlags2KHR::RAY_TRACING_OPACITY_MICROMAP_EXT.0, + "RAY_TRACING_OPACITY_MICROMAP_EXT", ), ( - PipelineCreateFlags2KHR::COLOR_ATTACHMENT_FEEDBACK_LOOP.0, - "COLOR_ATTACHMENT_FEEDBACK_LOOP", + PipelineCreateFlags2KHR::COLOR_ATTACHMENT_FEEDBACK_LOOP_EXT.0, + "COLOR_ATTACHMENT_FEEDBACK_LOOP_EXT", ), ( - PipelineCreateFlags2KHR::DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP.0, - "DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP", + PipelineCreateFlags2KHR::DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_EXT.0, + "DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_EXT", ), ( - PipelineCreateFlags2KHR::NO_PROTECTED_ACCESS.0, - "NO_PROTECTED_ACCESS", + PipelineCreateFlags2KHR::NO_PROTECTED_ACCESS_EXT.0, + "NO_PROTECTED_ACCESS_EXT", + ), + ( + PipelineCreateFlags2KHR::PROTECTED_ACCESS_ONLY_EXT.0, + "PROTECTED_ACCESS_ONLY_EXT", ), ( - PipelineCreateFlags2KHR::PROTECTED_ACCESS_ONLY.0, - "PROTECTED_ACCESS_ONLY", + PipelineCreateFlags2KHR::RAY_TRACING_DISPLACEMENT_MICROMAP_NV.0, + "RAY_TRACING_DISPLACEMENT_MICROMAP_NV", ), ( - PipelineCreateFlags2KHR::DESCRIPTOR_BUFFER.0, - "DESCRIPTOR_BUFFER", + PipelineCreateFlags2KHR::DESCRIPTOR_BUFFER_EXT.0, + "DESCRIPTOR_BUFFER_EXT", ), ]; debug_flags(f, KNOWN, self.0) diff --git a/ash/src/vk/definitions.rs b/ash/src/vk/definitions.rs index c5ab81ebd..1f741397e 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 = 260; +pub const HEADER_VERSION: u32 = 261; #[doc = ""] pub const HEADER_VERSION_COMPLETE: u32 = make_api_version(0, 1, 3, HEADER_VERSION); #[doc = ""] diff --git a/ash/src/vk/extensions.rs b/ash/src/vk/extensions.rs index 53571df99..61db4eb3c 100644 --- a/ash/src/vk/extensions.rs +++ b/ash/src/vk/extensions.rs @@ -17718,10 +17718,6 @@ impl PipelineCreateFlags { Self(0b1_0000_0000_0000_0000_0000_0000_0000); } #[doc = "Generated from 'VK_NV_displacement_micromap'"] -impl PipelineCreateFlags2KHR { - pub const RESERVED_28_NV: Self = Self(0b1_0000_0000_0000_0000_0000_0000_0000); -} -#[doc = "Generated from 'VK_NV_displacement_micromap'"] impl StructureType { pub const PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_FEATURES_NV: Self = Self(1_000_397_000); pub const PHYSICAL_DEVICE_DISPLACEMENT_MICROMAP_PROPERTIES_NV: Self = Self(1_000_397_001); @@ -19927,11 +19923,11 @@ impl KhrMaintenance5Fn { } #[doc = "Generated from 'VK_KHR_maintenance5'"] impl BufferUsageFlags2KHR { - pub const CONDITIONAL_RENDERING: Self = Self(0b10_0000_0000); + pub const CONDITIONAL_RENDERING_EXT: Self = Self(0b10_0000_0000); pub const SHADER_BINDING_TABLE: Self = Self(0b100_0000_0000); - pub const RAY_TRACING: Self = Self::SHADER_BINDING_TABLE; - pub const TRANSFORM_FEEDBACK_BUFFER: Self = Self(0b1000_0000_0000); - pub const TRANSFORM_FEEDBACK_COUNTER_BUFFER: Self = Self(0b1_0000_0000_0000); + pub const RAY_TRACING_NV: Self = Self::SHADER_BINDING_TABLE; + pub const TRANSFORM_FEEDBACK_BUFFER_EXT: Self = Self(0b1000_0000_0000); + pub const TRANSFORM_FEEDBACK_COUNTER_BUFFER_EXT: Self = Self(0b1_0000_0000_0000); pub const VIDEO_DECODE_SRC: Self = Self(0b10_0000_0000_0000); pub const VIDEO_DECODE_DST: Self = Self(0b100_0000_0000_0000); pub const VIDEO_ENCODE_DST: Self = Self(0b1000_0000_0000_0000); @@ -19939,11 +19935,12 @@ impl BufferUsageFlags2KHR { pub const SHADER_DEVICE_ADDRESS: Self = Self(0b10_0000_0000_0000_0000); pub const ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY: Self = Self(0b1000_0000_0000_0000_0000); pub const ACCELERATION_STRUCTURE_STORAGE: Self = Self(0b1_0000_0000_0000_0000_0000); - pub const SAMPLER_DESCRIPTOR_BUFFER: Self = Self(0b10_0000_0000_0000_0000_0000); - pub const RESOURCE_DESCRIPTOR_BUFFER: Self = Self(0b100_0000_0000_0000_0000_0000); - pub const PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER: Self = Self(0b100_0000_0000_0000_0000_0000_0000); - pub const MICROMAP_BUILD_INPUT_READ_ONLY: Self = Self(0b1000_0000_0000_0000_0000_0000); - pub const MICROMAP_STORAGE: Self = Self(0b1_0000_0000_0000_0000_0000_0000); + pub const SAMPLER_DESCRIPTOR_BUFFER_EXT: Self = Self(0b10_0000_0000_0000_0000_0000); + pub const RESOURCE_DESCRIPTOR_BUFFER_EXT: Self = Self(0b100_0000_0000_0000_0000_0000); + pub const PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_EXT: Self = + Self(0b100_0000_0000_0000_0000_0000_0000); + pub const MICROMAP_BUILD_INPUT_READ_ONLY_EXT: Self = Self(0b1000_0000_0000_0000_0000_0000); + pub const MICROMAP_STORAGE_EXT: Self = Self(0b1_0000_0000_0000_0000_0000_0000); } #[doc = "Generated from 'VK_KHR_maintenance5'"] impl Format { @@ -19954,13 +19951,13 @@ impl Format { impl PipelineCreateFlags2KHR { pub const VIEW_INDEX_FROM_DEVICE_INDEX: Self = Self(0b1000); pub const DISPATCH_BASE: Self = Self(0b1_0000); - pub const DEFER_COMPILE: Self = Self(0b10_0000); + pub const DEFER_COMPILE_NV: Self = Self(0b10_0000); pub const CAPTURE_STATISTICS: Self = Self(0b100_0000); pub const CAPTURE_INTERNAL_REPRESENTATIONS: Self = Self(0b1000_0000); pub const FAIL_ON_PIPELINE_COMPILE_REQUIRED: Self = Self(0b1_0000_0000); pub const EARLY_RETURN_ON_FAILURE: Self = Self(0b10_0000_0000); - pub const LINK_TIME_OPTIMIZATION: Self = Self(0b100_0000_0000); - pub const RETAIN_LINK_TIME_OPTIMIZATION_INFO: Self = Self(0b1000_0000_0000_0000_0000_0000); + pub const LINK_TIME_OPTIMIZATION_EXT: Self = Self(0b100_0000_0000); + pub const RETAIN_LINK_TIME_OPTIMIZATION_INFO_EXT: Self = Self(0b1000_0000_0000_0000_0000_0000); pub const LIBRARY: Self = Self(0b1000_0000_0000); pub const RAY_TRACING_SKIP_TRIANGLES: Self = Self(0b1_0000_0000_0000); pub const RAY_TRACING_SKIP_AABBS: Self = Self(0b10_0000_0000_0000); @@ -19970,19 +19967,21 @@ impl PipelineCreateFlags2KHR { pub const RAY_TRACING_NO_NULL_INTERSECTION_SHADERS: Self = Self(0b10_0000_0000_0000_0000); pub const RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY: Self = Self(0b1000_0000_0000_0000_0000); - pub const INDIRECT_BINDABLE: Self = Self(0b100_0000_0000_0000_0000); - pub const RAY_TRACING_ALLOW_MOTION: Self = Self(0b1_0000_0000_0000_0000_0000); + pub const INDIRECT_BINDABLE_NV: Self = Self(0b100_0000_0000_0000_0000); + pub const RAY_TRACING_ALLOW_MOTION_NV: Self = Self(0b1_0000_0000_0000_0000_0000); pub const RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT: Self = Self(0b10_0000_0000_0000_0000_0000); - pub const RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT: Self = + pub const RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_EXT: Self = Self(0b100_0000_0000_0000_0000_0000); - pub const RAY_TRACING_OPACITY_MICROMAP: Self = Self(0b1_0000_0000_0000_0000_0000_0000); - pub const COLOR_ATTACHMENT_FEEDBACK_LOOP: Self = Self(0b10_0000_0000_0000_0000_0000_0000); - pub const DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP: Self = + pub const RAY_TRACING_OPACITY_MICROMAP_EXT: Self = Self(0b1_0000_0000_0000_0000_0000_0000); + pub const COLOR_ATTACHMENT_FEEDBACK_LOOP_EXT: Self = Self(0b10_0000_0000_0000_0000_0000_0000); + pub const DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_EXT: Self = Self(0b100_0000_0000_0000_0000_0000_0000); - pub const NO_PROTECTED_ACCESS: Self = Self(0b1000_0000_0000_0000_0000_0000_0000); - pub const PROTECTED_ACCESS_ONLY: Self = Self(0b100_0000_0000_0000_0000_0000_0000_0000); - pub const DESCRIPTOR_BUFFER: Self = Self(0b10_0000_0000_0000_0000_0000_0000_0000); + pub const NO_PROTECTED_ACCESS_EXT: Self = Self(0b1000_0000_0000_0000_0000_0000_0000); + pub const PROTECTED_ACCESS_ONLY_EXT: Self = Self(0b100_0000_0000_0000_0000_0000_0000_0000); + pub const RAY_TRACING_DISPLACEMENT_MICROMAP_NV: Self = + Self(0b1_0000_0000_0000_0000_0000_0000_0000); + pub const DESCRIPTOR_BUFFER_EXT: Self = Self(0b10_0000_0000_0000_0000_0000_0000_0000); } #[doc = "Generated from 'VK_KHR_maintenance5'"] impl StructureType { diff --git a/generator/Vulkan-Headers b/generator/Vulkan-Headers index 94bb3c998..450ead13e 160000 --- a/generator/Vulkan-Headers +++ b/generator/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 94bb3c998b9156b9101421f7614617dfcf7f4256 +Subproject commit 450ead13e1064584da027d91192bd7bfb724640f