nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-23 07:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #819

Browse Source 
819: swap_chain_present returns SwapChainStatus r=kvark a=rukai

**Connections**
Needed by https://github.com/gfx-rs/wgpu-rs/pull/452

**Description**
For `swap_chain_present` moves the PresentError cases out of the Err and into the Ok.
This means we can `.unwrap()` the result in wgpu and it will only panic on an error that the user cant handle.

**Testing**
Ran the wgpu-rs examples.


Co-authored-by: Rukai <rubickent@gmail.com>
This commit is contained in:
bors[bot] 2020-07-20 14:48:46 +00:00 committed by GitHub
commit 10c1f85e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wgpu-core/src/swap_chain.rs
View File

@ -42,7 +42,7 @@ use crate::{
};
use hal::{
self, device::Device as _, queue::CommandQueue as _, window::PresentError,
self, device::Device as _, queue::CommandQueue as _,
window::PresentationSurface as _,
};
use thiserror::Error;
@ -129,12 +129,12 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
Err(err) => (
None,
match err {
hal::window::AcquireError::OutOfMemory(_) => SwapChainStatus::OutOfMemory,
hal::window::AcquireError::OutOfMemory(_) => return Err(SwapChainError::OutOfMemory),
hal::window::AcquireError::NotReady => unreachable!(), // we always set a timeout
hal::window::AcquireError::Timeout => SwapChainStatus::Timeout,
hal::window::AcquireError::OutOfDate => SwapChainStatus::Outdated,
hal::window::AcquireError::SurfaceLost(_) => SwapChainStatus::Lost,
hal::window::AcquireError::DeviceLost(_) => SwapChainStatus::Lost,
hal::window::AcquireError::DeviceLost(_) => return Err(SwapChainError::DeviceLost),
},
),
};
@ -198,7 +198,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
pub fn swap_chain_present<B: GfxBackend>(
&self,
swap_chain_id: SwapChainId,
) -> Result<(), SwapChainError> {
) -> Result<SwapChainStatus, SwapChainError> {
span!(_guard, INFO, "SwapChain::present");
let hub = B::hub(self);
@ -233,9 +233,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
None
};
let queue = &mut device.queue_group.queues[0];
unsafe {
queue.present_surface(B::get_surface_mut(surface), image, sem)?;
}
let result = unsafe { queue.present_surface(B::get_surface_mut(surface), image, sem) };
tracing::debug!(trace = true, "Presented. End of Frame");
@ -245,7 +243,16 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
}
Ok(())
match result {
Ok(None) => Ok(SwapChainStatus::Good),
Ok(Some(_)) => Ok(SwapChainStatus::Suboptimal),
Err(err) => match err {
hal::window::PresentError::OutOfMemory(_) => Err(SwapChainError::OutOfMemory),
hal::window::PresentError::OutOfDate => Ok(SwapChainStatus::Outdated),
hal::window::PresentError::SurfaceLost(_) => Ok(SwapChainStatus::Lost),
hal::window::PresentError::DeviceLost(_) => Err(SwapChainError::DeviceLost),
},
}
}
}
@ -253,6 +260,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
pub enum SwapChainError {
#[error("swap chain image is already acquired")]
AlreadyAcquired,
#[error(transparent)]
PresentError(#[from] PresentError),
#[error("Graphics backend is out of memory")]
OutOfMemory,
#[error("graphics backend device lost")]
DeviceLost,
}

1
wgpu-types/src/lib.rs
View File

@ -1137,7 +1137,6 @@ pub enum SwapChainStatus {
Timeout,
Outdated,
Lost,
OutOfMemory,
}
/// Describes the attachments of a render pass.