Skip to content

Return error on out of date surface #266

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

Open
cetra3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return error on out of date surface #266

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions blade-graphics/src/vulkan/surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,8 @@ impl super::Surface {
}

pub fn acquire_frame(&mut self) -> super::Frame {
let acquire_semaphore = self.next_semaphore;
match unsafe {
self.device.acquire_next_image(
self.swapchain.raw,
!0,
acquire_semaphore,
vk::Fence::null(),
)
} {
Ok((index, _suboptimal)) => {
self.next_semaphore = mem::replace(
&mut self.frames[index as usize].acquire_semaphore,
acquire_semaphore,
);
super::Frame {
internal: self.frames[index as usize],
swapchain: self.swapchain,
image_index: Some(index),
}
}
match self.vulkan_try_acquire_frame() {
Ok(frame) => frame,
Err(vk::Result::ERROR_OUT_OF_DATE_KHR) => {
log::warn!("Acquire failed because the surface is out of date");
super::Frame {
Expand All @@ -50,6 +32,30 @@ impl super::Surface {
Err(other) => panic!("Aquire image error {}", other),
}
}

pub fn vulkan_try_acquire_frame(&mut self) -> Result<super::Frame, vk::Result> {
let acquire_semaphore = self.next_semaphore;

let (index, _suboptimal) = unsafe {
self.device.acquire_next_image(
self.swapchain.raw,
!0,
acquire_semaphore,
vk::Fence::null(),
)
}?;

self.next_semaphore = mem::replace(
&mut self.frames[index as usize].acquire_semaphore,
acquire_semaphore,
);

Ok(super::Frame {
internal: self.frames[index as usize],
swapchain: self.swapchain,
image_index: Some(index),
})
}
}

impl super::Context {
Expand Down