Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

extensions: Only call assume_init() when Vulkan returns SUCCESS #669

Merged
merged 1 commit into from Oct 14, 2022
Merged

extensions: Only call assume_init() when Vulkan returns SUCCESS #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ash/src/extensions/ext/acquire_drm_display.rs
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ impl AcquireDrmDisplay {
) -> VkResult<vk::DisplayKHR> {
let mut display = mem::MaybeUninit::uninit();
(self.fp.get_drm_display_ext)(physical_device, drm_fd, connector_id, display.as_mut_ptr())
.result_with_success(display.assume_init())
.assume_init_on_success(display)
}

#[inline]
Expand Down
6 changes: 3 additions & 3 deletions ash/src/extensions/khr/display.rs
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@ impl Display {
allocation_callbacks.as_raw_ptr(),
display_mode.as_mut_ptr(),
)
.result_with_success(display_mode.assume_init())
.assume_init_on_success(display_mode)
}

/// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkGetDisplayPlaneCapabilitiesKHR.html>
Expand All @@ -106,7 +106,7 @@ impl Display {
plane_index,
display_plane_capabilities.as_mut_ptr(),
)
.result_with_success(display_plane_capabilities.assume_init())
.assume_init_on_success(display_plane_capabilities)
}

/// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkCreateDisplayPlaneSurfaceKHR.html>
Expand All @@ -123,7 +123,7 @@ impl Display {
allocation_callbacks.as_raw_ptr(),
surface.as_mut_ptr(),
)
.result_with_success(surface.assume_init())
.assume_init_on_success(surface)
}

#[inline]
Expand Down
6 changes: 6 additions & 0 deletions ash/src/prelude.rs
View file
Open in desktop
@@ -1,6 +1,7 @@
use std::convert::TryInto;
#[cfg(feature = "debug")]
use std::fmt;
use std::mem;

use crate::vk;
pub type VkResult<T> = Result<T, vk::Result>;
Expand All @@ -18,6 +19,11 @@ impl vk::Result {
_ => Err(self),
}
}

#[inline]
pub unsafe fn assume_init_on_success<T>(self, v: mem::MaybeUninit<T>) -> VkResult<T> {
self.result().map(move |()| v.assume_init())
}
}

/// Repeatedly calls `f` until it does not return [`vk::Result::INCOMPLETE`] anymore,
Expand Down