diff options
Diffstat (limited to 'stockton-render/src')
-rw-r--r-- | stockton-render/src/level.rs | 8 | ||||
-rw-r--r-- | stockton-render/src/ui.rs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/stockton-render/src/level.rs b/stockton-render/src/level.rs index ceb361b..fc5111e 100644 --- a/stockton-render/src/level.rs +++ b/stockton-render/src/level.rs @@ -15,7 +15,7 @@ use stockton_skeleton::{ }, context::RenderingContext, draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition}, - error::{EnvironmentError, LevelError, LockPoisoned}, + error::{LevelError, LockPoisoned}, mem::{DataPool, DepthBufferPool, StagingPool, TexturesPool}, queue_negotiator::QueueNegotiator, texture::{resolver::TextureResolver, TexLoadQueue, TextureLoadConfig, TextureRepo}, @@ -453,8 +453,8 @@ where ) -> Result<Vec<(&'c QueueFamilyT, Vec<f32>)>> { queue_negotiator.find(adapter, &TexLoadQueue)?; - Ok(vec![queue_negotiator - .family_spec::<TexLoadQueue>(&adapter.queue_families, 1) - .ok_or(EnvironmentError::NoSuitableFamilies)?]) + Ok(vec![ + queue_negotiator.family_spec::<TexLoadQueue>(&adapter.queue_families, 1)? + ]) } } diff --git a/stockton-render/src/ui.rs b/stockton-render/src/ui.rs index 2c8818c..ad53d80 100644 --- a/stockton-render/src/ui.rs +++ b/stockton-render/src/ui.rs @@ -9,7 +9,7 @@ use stockton_skeleton::{ }, context::RenderingContext, draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition}, - error::{EnvironmentError, LockPoisoned}, + error::LockPoisoned, mem::{DataPool, StagingPool, TexturesPool}, queue_negotiator::QueueNegotiator, texture::{ @@ -331,9 +331,9 @@ impl<'a, P: PassPosition> IntoDrawPass<UiDrawPass<'a>, P> for () { ) -> Result<Vec<(&'c QueueFamilyT, Vec<f32>)>> { queue_negotiator.find(adapter, &TexLoadQueue)?; - Ok(vec![queue_negotiator - .family_spec::<TexLoadQueue>(&adapter.queue_families, 1) - .ok_or(EnvironmentError::NoSuitableFamilies)?]) + Ok(vec![ + queue_negotiator.family_spec::<TexLoadQueue>(&adapter.queue_families, 1)? + ]) } } |