Skip to content

Commit 62d06ee

Browse files
MarijnS95MarijnS95
committed
Update Vulkan-Headers to 1.3.298
1 parent 19a25b9 commit 62d06ee

File tree

8 files changed

+96
-18
lines changed

8 files changed

+96
-18
lines changed

‎Changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12-
- Update Vulkan-Headers to 1.3.297 (#910, #951)
12+
- Update Vulkan-Headers to 1.3.298 (#910, #951)
1313
- Added `VK_KHR_get_display_properties2` instance extension (#932)
1414
- Added `VK_EXT_metal_objects` device extension (#942)
1515

‎ash/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ash"
3-
version = "0.38.0+1.3.297"
3+
version = "0.38.0+1.3.298"
44
authors = [
55
"Maik Klein <[email protected]>",
66
"Benjamin Saunders <[email protected]>",

‎ash/src/extensions/amdx/shader_enqueue.rs

+24-4
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,16 @@ impl crate::amdx::shader_enqueue::Device {
7272
pub unsafe fn cmd_initialize_graph_scratch_memory(
7373
&self,
7474
command_buffer: vk::CommandBuffer,
75+
execution_graph: vk::Pipeline,
7576
scratch: vk::DeviceAddress,
77+
scratch_size: vk::DeviceSize,
7678
) {
77-
(self.fp.cmd_initialize_graph_scratch_memory_amdx)(command_buffer, scratch)
79+
(self.fp.cmd_initialize_graph_scratch_memory_amdx)(
80+
command_buffer,
81+
execution_graph,
82+
scratch,
83+
scratch_size,
84+
)
7885
}
7986

8087
/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdDispatchGraphAMDX.html>
@@ -83,9 +90,10 @@ impl crate::amdx::shader_enqueue::Device {
8390
&self,
8491
command_buffer: vk::CommandBuffer,
8592
scratch: vk::DeviceAddress,
93+
scratch_size: vk::DeviceSize,
8694
count_info: &vk::DispatchGraphCountInfoAMDX,
8795
) {
88-
(self.fp.cmd_dispatch_graph_amdx)(command_buffer, scratch, count_info)
96+
(self.fp.cmd_dispatch_graph_amdx)(command_buffer, scratch, scratch_size, count_info)
8997
}
9098

9199
/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdDispatchGraphIndirectAMDX.html>
@@ -94,9 +102,15 @@ impl crate::amdx::shader_enqueue::Device {
94102
&self,
95103
command_buffer: vk::CommandBuffer,
96104
scratch: vk::DeviceAddress,
105+
scratch_size: vk::DeviceSize,
97106
count_info: &vk::DispatchGraphCountInfoAMDX,
98107
) {
99-
(self.fp.cmd_dispatch_graph_indirect_amdx)(command_buffer, scratch, count_info)
108+
(self.fp.cmd_dispatch_graph_indirect_amdx)(
109+
command_buffer,
110+
scratch,
111+
scratch_size,
112+
count_info,
113+
)
100114
}
101115

102116
/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdDispatchGraphIndirectCountAMDX.html>
@@ -105,8 +119,14 @@ impl crate::amdx::shader_enqueue::Device {
105119
&self,
106120
command_buffer: vk::CommandBuffer,
107121
scratch: vk::DeviceAddress,
122+
scratch_size: vk::DeviceSize,
108123
count_info: vk::DeviceAddress,
109124
) {
110-
(self.fp.cmd_dispatch_graph_indirect_count_amdx)(command_buffer, scratch, count_info)
125+
(self.fp.cmd_dispatch_graph_indirect_count_amdx)(
126+
command_buffer,
127+
scratch,
128+
scratch_size,
129+
count_info,
130+
)
111131
}
112132
}

‎ash/src/extensions_generated.rs

+5
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,9 @@ pub mod amdx {
631631
cmd_initialize_graph_scratch_memory_amdx: unsafe {
632632
unsafe extern "system" fn cmd_initialize_graph_scratch_memory_amdx(
633633
_command_buffer: CommandBuffer,
634+
_execution_graph: Pipeline,
634635
_scratch: DeviceAddress,
636+
_scratch_size: DeviceSize,
635637
) {
636638
panic!(concat!(
637639
"Unable to load ",
@@ -652,6 +654,7 @@ pub mod amdx {
652654
unsafe extern "system" fn cmd_dispatch_graph_amdx(
653655
_command_buffer: CommandBuffer,
654656
_scratch: DeviceAddress,
657+
_scratch_size: DeviceSize,
655658
_p_count_info: *const DispatchGraphCountInfoAMDX,
656659
) {
657660
panic!(concat!(
@@ -672,6 +675,7 @@ pub mod amdx {
672675
unsafe extern "system" fn cmd_dispatch_graph_indirect_amdx(
673676
_command_buffer: CommandBuffer,
674677
_scratch: DeviceAddress,
678+
_scratch_size: DeviceSize,
675679
_p_count_info: *const DispatchGraphCountInfoAMDX,
676680
) {
677681
panic!(concat!(
@@ -693,6 +697,7 @@ pub mod amdx {
693697
unsafe extern "system" fn cmd_dispatch_graph_indirect_count_amdx(
694698
_command_buffer: CommandBuffer,
695699
_scratch: DeviceAddress,
700+
_scratch_size: DeviceSize,
696701
_count_info: DeviceAddress,
697702
) {
698703
panic!(concat!(

‎ash/src/vk/const_debugs.rs

+4
Original file line numberDiff line numberDiff line change
@@ -3849,6 +3849,10 @@ impl fmt::Debug for PipelineCreateFlags2KHR {
38493849
"ALLOW_DERIVATIVES",
38503850
),
38513851
(PipelineCreateFlags2KHR::DERIVATIVE.0, "DERIVATIVE"),
3852+
(
3853+
PipelineCreateFlags2KHR::EXECUTION_GRAPH_AMDX.0,
3854+
"EXECUTION_GRAPH_AMDX",
3855+
),
38523856
(
38533857
PipelineCreateFlags2KHR::ENABLE_LEGACY_DITHERING_EXT.0,
38543858
"ENABLE_LEGACY_DITHERING_EXT",

‎ash/src/vk/definitions.rs

+46-8
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub const API_VERSION_1_2: u32 = make_api_version(0, 1, 2, 0);
5858
#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_API_VERSION_1_3.html>"]
5959
pub const API_VERSION_1_3: u32 = make_api_version(0, 1, 3, 0);
6060
#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_HEADER_VERSION.html>"]
61-
pub const HEADER_VERSION: u32 = 297;
61+
pub const HEADER_VERSION: u32 = 298;
6262
#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_HEADER_VERSION_COMPLETE.html>"]
6363
pub const HEADER_VERSION_COMPLETE: u32 = make_api_version(0, 1, 3, HEADER_VERSION);
6464
#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkSampleMask.html>"]
@@ -38722,7 +38722,7 @@ impl<'a> GeneratedCommandsShaderInfoEXT<'a> {
3872238722
#[must_use]
3872338723
pub struct GeneratedCommandsMemoryRequirementsInfoEXT<'a> {
3872438724
pub s_type: StructureType,
38725-
pub p_next: *mut c_void,
38725+
pub p_next: *const c_void,
3872638726
pub indirect_execution_set: IndirectExecutionSetEXT,
3872738727
pub indirect_commands_layout: IndirectCommandsLayoutEXT,
3872838728
pub max_sequence_count: u32,
@@ -38736,7 +38736,7 @@ impl ::core::default::Default for GeneratedCommandsMemoryRequirementsInfoEXT<'_>
3873638736
fn default() -> Self {
3873738737
Self {
3873838738
s_type: Self::STRUCTURE_TYPE,
38739-
p_next: ::core::ptr::null_mut(),
38739+
p_next: ::core::ptr::null(),
3874038740
indirect_execution_set: IndirectExecutionSetEXT::default(),
3874138741
indirect_commands_layout: IndirectCommandsLayoutEXT::default(),
3874238742
max_sequence_count: u32::default(),
@@ -38787,7 +38787,7 @@ impl<'a> GeneratedCommandsMemoryRequirementsInfoEXT<'a> {
3878738787
next: &'a mut T,
3878838788
) -> Self {
3878938789
unsafe {
38790-
let next_ptr = <*mut T>::cast(next);
38790+
let next_ptr = <*const T>::cast(next);
3879138791
let last_next = ptr_chain_iter(next).last().unwrap();
3879238792
(*last_next).p_next = self.p_next as _;
3879338793
self.p_next = next_ptr;
@@ -56705,6 +56705,8 @@ pub struct PhysicalDeviceShaderEnqueuePropertiesAMDX<'a> {
5670556705
pub max_execution_graph_shader_payload_size: u32,
5670656706
pub max_execution_graph_shader_payload_count: u32,
5670756707
pub execution_graph_dispatch_address_alignment: u32,
56708+
pub max_execution_graph_workgroup_count: [u32; 3],
56709+
pub max_execution_graph_workgroups: u32,
5670856710
pub _marker: PhantomData<&'a ()>,
5670956711
}
5671056712
unsafe impl Send for PhysicalDeviceShaderEnqueuePropertiesAMDX<'_> {}
@@ -56720,6 +56722,8 @@ impl ::core::default::Default for PhysicalDeviceShaderEnqueuePropertiesAMDX<'_>
5672056722
max_execution_graph_shader_payload_size: u32::default(),
5672156723
max_execution_graph_shader_payload_count: u32::default(),
5672256724
execution_graph_dispatch_address_alignment: u32::default(),
56725+
max_execution_graph_workgroup_count: unsafe { ::core::mem::zeroed() },
56726+
max_execution_graph_workgroups: u32::default(),
5672356727
_marker: PhantomData,
5672456728
}
5672556729
}
@@ -56768,6 +56772,19 @@ impl<'a> PhysicalDeviceShaderEnqueuePropertiesAMDX<'a> {
5676856772
execution_graph_dispatch_address_alignment;
5676956773
self
5677056774
}
56775+
#[inline]
56776+
pub fn max_execution_graph_workgroup_count(
56777+
mut self,
56778+
max_execution_graph_workgroup_count: [u32; 3],
56779+
) -> Self {
56780+
self.max_execution_graph_workgroup_count = max_execution_graph_workgroup_count;
56781+
self
56782+
}
56783+
#[inline]
56784+
pub fn max_execution_graph_workgroups(mut self, max_execution_graph_workgroups: u32) -> Self {
56785+
self.max_execution_graph_workgroups = max_execution_graph_workgroups;
56786+
self
56787+
}
5677156788
}
5677256789
#[repr(C)]
5677356790
#[cfg_attr(feature = "debug", derive(Debug))]
@@ -56778,6 +56795,7 @@ pub struct PhysicalDeviceShaderEnqueueFeaturesAMDX<'a> {
5677856795
pub s_type: StructureType,
5677956796
pub p_next: *mut c_void,
5678056797
pub shader_enqueue: Bool32,
56798+
pub shader_mesh_enqueue: Bool32,
5678156799
pub _marker: PhantomData<&'a ()>,
5678256800
}
5678356801
unsafe impl Send for PhysicalDeviceShaderEnqueueFeaturesAMDX<'_> {}
@@ -56789,6 +56807,7 @@ impl ::core::default::Default for PhysicalDeviceShaderEnqueueFeaturesAMDX<'_> {
5678956807
s_type: Self::STRUCTURE_TYPE,
5679056808
p_next: ::core::ptr::null_mut(),
5679156809
shader_enqueue: Bool32::default(),
56810+
shader_mesh_enqueue: Bool32::default(),
5679256811
_marker: PhantomData,
5679356812
}
5679456813
}
@@ -56805,6 +56824,11 @@ impl<'a> PhysicalDeviceShaderEnqueueFeaturesAMDX<'a> {
5680556824
self.shader_enqueue = shader_enqueue.into();
5680656825
self
5680756826
}
56827+
#[inline]
56828+
pub fn shader_mesh_enqueue(mut self, shader_mesh_enqueue: bool) -> Self {
56829+
self.shader_mesh_enqueue = shader_mesh_enqueue.into();
56830+
self
56831+
}
5680856832
}
5680956833
#[repr(C)]
5681056834
#[cfg_attr(feature = "debug", derive(Debug))]
@@ -56955,7 +56979,9 @@ impl<'a> PipelineShaderStageNodeCreateInfoAMDX<'a> {
5695556979
pub struct ExecutionGraphPipelineScratchSizeAMDX<'a> {
5695656980
pub s_type: StructureType,
5695756981
pub p_next: *mut c_void,
56958-
pub size: DeviceSize,
56982+
pub min_size: DeviceSize,
56983+
pub max_size: DeviceSize,
56984+
pub size_granularity: DeviceSize,
5695956985
pub _marker: PhantomData<&'a ()>,
5696056986
}
5696156987
unsafe impl Send for ExecutionGraphPipelineScratchSizeAMDX<'_> {}
@@ -56966,7 +56992,9 @@ impl ::core::default::Default for ExecutionGraphPipelineScratchSizeAMDX<'_> {
5696656992
Self {
5696756993
s_type: Self::STRUCTURE_TYPE,
5696856994
p_next: ::core::ptr::null_mut(),
56969-
size: DeviceSize::default(),
56995+
min_size: DeviceSize::default(),
56996+
max_size: DeviceSize::default(),
56997+
size_granularity: DeviceSize::default(),
5697056998
_marker: PhantomData,
5697156999
}
5697257000
}
@@ -56976,8 +57004,18 @@ unsafe impl<'a> TaggedStructure for ExecutionGraphPipelineScratchSizeAMDX<'a> {
5697657004
}
5697757005
impl<'a> ExecutionGraphPipelineScratchSizeAMDX<'a> {
5697857006
#[inline]
56979-
pub fn size(mut self, size: DeviceSize) -> Self {
56980-
self.size = size;
57007+
pub fn min_size(mut self, min_size: DeviceSize) -> Self {
57008+
self.min_size = min_size;
57009+
self
57010+
}
57011+
#[inline]
57012+
pub fn max_size(mut self, max_size: DeviceSize) -> Self {
57013+
self.max_size = max_size;
57014+
self
57015+
}
57016+
#[inline]
57017+
pub fn size_granularity(mut self, size_granularity: DeviceSize) -> Self {
57018+
self.size_granularity = size_granularity;
5698157019
self
5698257020
}
5698357021
}

‎ash/src/vk/extensions.rs

+14-3
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,10 @@ impl PipelineBindPoint {
984984
pub const EXECUTION_GRAPH_AMDX: Self = Self(1_000_134_000);
985985
}
986986
#[doc = "Generated from 'VK_AMDX_shader_enqueue'"]
987+
impl PipelineCreateFlags2KHR {
988+
pub const EXECUTION_GRAPH_AMDX: Self = Self(0b1_0000_0000_0000_0000_0000_0000_0000_0000);
989+
}
990+
#[doc = "Generated from 'VK_AMDX_shader_enqueue'"]
987991
impl StructureType {
988992
pub const PHYSICAL_DEVICE_SHADER_ENQUEUE_FEATURES_AMDX: Self = Self(1_000_134_000);
989993
pub const PHYSICAL_DEVICE_SHADER_ENQUEUE_PROPERTIES_AMDX: Self = Self(1_000_134_001);
@@ -5440,7 +5444,7 @@ pub const AMD_GPU_SHADER_INT16_NAME: &CStr =
54405444
pub const AMD_GPU_SHADER_INT16_SPEC_VERSION: u32 = 2u32;
54415445
pub const AMDX_SHADER_ENQUEUE_NAME: &CStr =
54425446
unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_AMDX_shader_enqueue\0") };
5443-
pub const AMDX_SHADER_ENQUEUE_SPEC_VERSION: u32 = 1u32;
5447+
pub const AMDX_SHADER_ENQUEUE_SPEC_VERSION: u32 = 2u32;
54445448
#[allow(non_camel_case_types)]
54455449
pub type PFN_vkCreateExecutionGraphPipelinesAMDX = unsafe extern "system" fn(
54465450
device: crate::vk::Device,
@@ -5464,24 +5468,31 @@ pub type PFN_vkGetExecutionGraphPipelineNodeIndexAMDX = unsafe extern "system" f
54645468
p_node_index: *mut u32,
54655469
) -> Result;
54665470
#[allow(non_camel_case_types)]
5467-
pub type PFN_vkCmdInitializeGraphScratchMemoryAMDX =
5468-
unsafe extern "system" fn(command_buffer: CommandBuffer, scratch: DeviceAddress);
5471+
pub type PFN_vkCmdInitializeGraphScratchMemoryAMDX = unsafe extern "system" fn(
5472+
command_buffer: CommandBuffer,
5473+
execution_graph: Pipeline,
5474+
scratch: DeviceAddress,
5475+
scratch_size: DeviceSize,
5476+
);
54695477
#[allow(non_camel_case_types)]
54705478
pub type PFN_vkCmdDispatchGraphAMDX = unsafe extern "system" fn(
54715479
command_buffer: CommandBuffer,
54725480
scratch: DeviceAddress,
5481+
scratch_size: DeviceSize,
54735482
p_count_info: *const DispatchGraphCountInfoAMDX,
54745483
);
54755484
#[allow(non_camel_case_types)]
54765485
pub type PFN_vkCmdDispatchGraphIndirectAMDX = unsafe extern "system" fn(
54775486
command_buffer: CommandBuffer,
54785487
scratch: DeviceAddress,
5488+
scratch_size: DeviceSize,
54795489
p_count_info: *const DispatchGraphCountInfoAMDX,
54805490
);
54815491
#[allow(non_camel_case_types)]
54825492
pub type PFN_vkCmdDispatchGraphIndirectCountAMDX = unsafe extern "system" fn(
54835493
command_buffer: CommandBuffer,
54845494
scratch: DeviceAddress,
5495+
scratch_size: DeviceSize,
54855496
count_info: DeviceAddress,
54865497
);
54875498
pub const AMD_MIXED_ATTACHMENT_SAMPLES_NAME: &CStr =

‎generator/Vulkan-Headers

0 commit comments

Comments
 (0)