nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-22 06:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #645 Returning Result<(), OomError> for reset and multi_reset (#684)

Browse Source
This commit is contained in:
tyoc213 2017-07-26 08:43:41 -05:00 committed by tomaka
parent b8f0cfee2c
commit 549671a521
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vulkano/src/sync/fence.rs
View File

@ -261,11 +261,12 @@ impl<D> Fence<D>
// This function takes a `&mut self` because the Vulkan API requires that the fence be // This function takes a `&mut self` because the Vulkan API requires that the fence be
// externally synchronized. // externally synchronized.
#[inline] #[inline]
pub fn reset(&mut self) { pub fn reset(&mut self) -> Result<(), OomError> {
unsafe { unsafe {
let vk = self.device.pointers(); let vk = self.device.pointers();
vk.ResetFences(self.device.internal_object(), 1, &self.fence); check_errors(vk.ResetFences(self.device.internal_object(), 1, &self.fence))?;
self.signaled.store(false, Ordering::Relaxed); self.signaled.store(false, Ordering::Relaxed);
Ok(())
} }
} }
@ -275,7 +276,7 @@ impl<D> Fence<D>
/// ///
/// - Panics if not all fences belong to the same device. /// - Panics if not all fences belong to the same device.
/// ///
pub fn multi_reset<'a, I>(iter: I) pub fn multi_reset<'a, I>(iter: I) -> Result<(), OomError>
where I: IntoIterator<Item = &'a mut Fence<D>>, where I: IntoIterator<Item = &'a mut Fence<D>>,
D: 'a D: 'a
{ {
@ -299,11 +300,12 @@ impl<D> Fence<D>
if let Some(device) = device { if let Some(device) = device {
unsafe { unsafe {
let vk = device.pointers(); let vk = device.pointers();
vk.ResetFences(device.internal_object(), check_errors(vk.ResetFences(device.internal_object(),
fences.len() as u32, fences.len() as u32,
fences.as_ptr()); fences.as_ptr()))?;
} }
} }
Ok(())
} }
} }
@ -428,7 +430,7 @@ mod tests {
let (device, _) = gfx_dev_and_queue!(); let (device, _) = gfx_dev_and_queue!();
let mut fence = Fence::alloc_signaled(device.clone()).unwrap(); let mut fence = Fence::alloc_signaled(device.clone()).unwrap();
fence.reset(); fence.reset().unwrap();
assert!(!fence.ready().unwrap()); assert!(!fence.ready().unwrap());
} }