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

Add acquire_next_image_raw2

Browse Source
This commit is contained in:
Pierre Krieger 2017-07-08 18:30:29 +02:00
parent d4ebf0a549
commit 7744fbba08
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vulkano/src/swapchain/swapchain.rs
View File

@ -43,6 +43,7 @@ use swapchain::SurfaceTransform;
use sync::AccessCheckError;
use sync::AccessError;
use sync::AccessFlagBits;
use sync::Fence;
use sync::FlushError;
use sync::GpuFuture;
use sync::PipelineStages;
@ -80,7 +81,7 @@ pub fn acquire_next_image(swapchain: Arc<Swapchain>, timeout: Option<Duration>)
return Err(AcquireError::OutOfDate);
}
unsafe { acquire_next_image_raw(&swapchain, timeout, &semaphore) }?
unsafe { acquire_next_image_raw2(&swapchain, timeout, Some(&semaphore), None) }?
};
Ok((id,
@ -1054,8 +1055,17 @@ pub struct AcquiredImage {
///
/// - The semaphore must be kept alive until it is signaled.
/// - The swapchain must not have been replaced by being passed as the old swapchain when creating a new one.
#[inline]
pub unsafe fn acquire_next_image_raw(swapchain: &Swapchain, timeout: Option<Duration>, semaphore: &Semaphore)
-> Result<AcquiredImage, AcquireError>
{
acquire_next_image_raw2(swapchain, timeout, Some(semaphore), None)
}
// TODO: this should replace `acquire_next_image_raw`, but requires an API break
unsafe fn acquire_next_image_raw2(swapchain: &Swapchain, timeout: Option<Duration>,
semaphore: Option<&Semaphore>, fence: Option<&Fence>)
-> Result<AcquiredImage, AcquireError>
{
let vk = swapchain.device.pointers();
@ -1072,8 +1082,8 @@ pub unsafe fn acquire_next_image_raw(swapchain: &Swapchain, timeout: Option<Dura
let r = check_errors(vk.AcquireNextImageKHR(swapchain.device.internal_object(),
swapchain.swapchain,
timeout_ns,
semaphore.internal_object(),
0,
semaphore.map(|s| s.internal_object()).unwrap_or(0),
fence.map(|f| f.internal_object()).unwrap_or(0),
&mut out))?;
let (id, suboptimal) = match r {