device_diagnostic_checkpoints: Enable passing pNext-initialized structs to get_queue_checkpoint_data (#588)

To match all other functions which accept an array of to-be-initialized
structs with a `pNext` pointer that is possibly initialized by the
caller.
This commit is contained in:
Marijn Suijten 2022-03-23 00:03:34 +01:00 committed by GitHub
parent 84cddb7383
commit 777977174a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions

View file

@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased ## Unreleased
### Changed
- Dropped auto-generated wrapper methods from function pointer structs - Dropped auto-generated wrapper methods from function pointer structs
in favor of direct invocation of function pointers (#599) in favor of direct invocation of function pointers (#599)
- `VK_NV_device_diagnostic_checkpoints`: Enable passing `pNext`-initialized structs to `get_queue_checkpoint_data` (#588)
### Added ### Added

View file

@ -4,6 +4,7 @@ use std::ffi::CStr;
use std::mem; use std::mem;
use std::os::raw::c_void; use std::os::raw::c_void;
/// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_NV_device_diagnostic_checkpoints.html>
#[derive(Clone)] #[derive(Clone)]
pub struct DeviceDiagnosticCheckpoints { pub struct DeviceDiagnosticCheckpoints {
fp: vk::NvDeviceDiagnosticCheckpointsFn, fp: vk::NvDeviceDiagnosticCheckpointsFn,
@ -26,22 +27,25 @@ impl DeviceDiagnosticCheckpoints {
(self.fp.cmd_set_checkpoint_nv)(command_buffer, p_checkpoint_marker); (self.fp.cmd_set_checkpoint_nv)(command_buffer, p_checkpoint_marker);
} }
/// Retrieve the number of elements to pass to [`get_queue_checkpoint_data()`][Self::get_queue_checkpoint_data()]
pub unsafe fn get_queue_checkpoint_data_len(&self, queue: vk::Queue) -> usize {
let mut count = 0;
(self.fp.get_queue_checkpoint_data_nv)(queue, &mut count, std::ptr::null_mut());
count as usize
}
/// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkGetQueueCheckpointDataNV.html> /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkGetQueueCheckpointDataNV.html>
pub unsafe fn get_queue_checkpoint_data(&self, queue: vk::Queue) -> Vec<vk::CheckpointDataNV> { ///
let mut checkpoint_data_count: u32 = 0; /// Call [`get_queue_checkpoint_data_len()`][Self::get_queue_checkpoint_data_len()] to query the number of elements to pass to `out`.
(self.fp.get_queue_checkpoint_data_nv)( /// Be sure to [`Default::default()`]-initialize these elements and optionally set their `p_next` pointer.
queue, pub unsafe fn get_queue_checkpoint_data(
&mut checkpoint_data_count, &self,
std::ptr::null_mut(), queue: vk::Queue,
); out: &mut [vk::CheckpointDataNV],
let mut checkpoint_data: Vec<vk::CheckpointDataNV> = ) {
vec![vk::CheckpointDataNV::default(); checkpoint_data_count as _]; let mut count = out.len() as u32;
(self.fp.get_queue_checkpoint_data_nv)( (self.fp.get_queue_checkpoint_data_nv)(queue, &mut count, out.as_mut_ptr());
queue, assert_eq!(count as usize, out.len());
&mut checkpoint_data_count,
checkpoint_data.as_mut_ptr(),
);
checkpoint_data
} }
pub const fn name() -> &'static CStr { pub const fn name() -> &'static CStr {