Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ members = [
"generator",
"generator-rewrite",
]

# [patch.crates-io]
# # https://github.com/krolli/vk-parse/pull/36
# vk-parse = { git = "https://github.com/krolli/vk-parse", rev = "dfe8863" }
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Added `push()` method to all root structs to insert a single extension-struct in the pointer chain. (#909)
- Update Vulkan-Headers to 1.3.296 (#910)
- Update Vulkan-Headers to 1.4.329 (#910, #951)
- Added `VK_KHR_get_display_properties2` instance extension (#932)
- Added `VK_EXT_metal_objects` device extension (#942)
- Added `VK_AMD_anti_lag` device extension (#943)
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.38.0+1.3.296"
version = "0.38.0+1.4.329"
authors = [
"Maik Klein <[email protected]>",
"Benjamin Saunders <[email protected]>",
Expand Down
19 changes: 19 additions & 0 deletions ash/src/extensions/amd/buffer_marker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,23 @@ impl crate::amd::buffer_marker::Device {
marker,
)
}

/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdWriteBufferMarker2AMD.html>
#[inline]
pub unsafe fn cmd_write_buffer_marker2(
&self,
command_buffer: vk::CommandBuffer,
stage: vk::PipelineStageFlags2,
dst_buffer: vk::Buffer,
dst_offset: vk::DeviceSize,
marker: u32,
) {
(self.fp.cmd_write_buffer_marker2_amd)(
command_buffer,
stage,
dst_buffer,
dst_offset,
marker,
)
}
}
28 changes: 24 additions & 4 deletions ash/src/extensions/amdx/shader_enqueue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,16 @@ impl crate::amdx::shader_enqueue::Device {
pub unsafe fn cmd_initialize_graph_scratch_memory(
&self,
command_buffer: vk::CommandBuffer,
execution_graph: vk::Pipeline,
scratch: vk::DeviceAddress,
scratch_size: vk::DeviceSize,
) {
(self.fp.cmd_initialize_graph_scratch_memory_amdx)(command_buffer, scratch)
(self.fp.cmd_initialize_graph_scratch_memory_amdx)(
command_buffer,
execution_graph,
scratch,
scratch_size,
)
}

/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdDispatchGraphAMDX.html>
Expand All @@ -83,9 +90,10 @@ impl crate::amdx::shader_enqueue::Device {
&self,
command_buffer: vk::CommandBuffer,
scratch: vk::DeviceAddress,
scratch_size: vk::DeviceSize,
count_info: &vk::DispatchGraphCountInfoAMDX,
) {
(self.fp.cmd_dispatch_graph_amdx)(command_buffer, scratch, count_info)
(self.fp.cmd_dispatch_graph_amdx)(command_buffer, scratch, scratch_size, count_info)
}

/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdDispatchGraphIndirectAMDX.html>
Expand All @@ -94,9 +102,15 @@ impl crate::amdx::shader_enqueue::Device {
&self,
command_buffer: vk::CommandBuffer,
scratch: vk::DeviceAddress,
scratch_size: vk::DeviceSize,
count_info: &vk::DispatchGraphCountInfoAMDX,
) {
(self.fp.cmd_dispatch_graph_indirect_amdx)(command_buffer, scratch, count_info)
(self.fp.cmd_dispatch_graph_indirect_amdx)(
command_buffer,
scratch,
scratch_size,
count_info,
)
}

/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdDispatchGraphIndirectCountAMDX.html>
Expand All @@ -105,8 +119,14 @@ impl crate::amdx::shader_enqueue::Device {
&self,
command_buffer: vk::CommandBuffer,
scratch: vk::DeviceAddress,
scratch_size: vk::DeviceSize,
count_info: vk::DeviceAddress,
) {
(self.fp.cmd_dispatch_graph_indirect_count_amdx)(command_buffer, scratch, count_info)
(self.fp.cmd_dispatch_graph_indirect_count_amdx)(
command_buffer,
scratch,
scratch_size,
count_info,
)
}
}
23 changes: 23 additions & 0 deletions ash/src/extensions/nv/device_diagnostic_checkpoints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,27 @@ impl crate::nv::device_diagnostic_checkpoints::Device {
(self.fp.get_queue_checkpoint_data_nv)(queue, &mut count, out.as_mut_ptr());
assert_eq!(count as usize, out.len());
}

/// Retrieve the number of elements to pass to [`get_queue_checkpoint_data()`][Self::get_queue_checkpoint_data2()]
#[inline]
pub unsafe fn get_queue_checkpoint_data2_len(&self, queue: vk::Queue) -> usize {
let mut count = mem::MaybeUninit::uninit();
(self.fp.get_queue_checkpoint_data2_nv)(queue, count.as_mut_ptr(), ptr::null_mut());
count.assume_init() as usize
}

/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkGetQueueCheckpointData2NV.html>
///
/// Call [`get_queue_checkpoint_data2_len()`][Self::get_queue_checkpoint_data2_len()] to query the number of elements to pass to `out`.
/// Be sure to [`Default::default()`]-initialize these elements and optionally set their `p_next` pointer.
#[inline]
pub unsafe fn get_queue_checkpoint_data2(
&self,
queue: vk::Queue,
out: &mut [vk::CheckpointData2NV<'_>],
) {
let mut count = out.len() as u32;
(self.fp.get_queue_checkpoint_data2_nv)(queue, &mut count, out.as_mut_ptr());
assert_eq!(count as usize, out.len());
}
}
Loading
Loading