refactor(skeleton): type phases of queue negotiation

2 files changed, 10 insertions, 14 deletions

diff --git a/stockton-render/src/level.rs b/stockton-render/src/level.rs
index e288617..3851cee 100644
--- a/stockton-render/src/level.rs
+++ b/stockton-render/src/level.rs
@@ -17,7 +17,7 @@ use stockton_skeleton::{
     draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition},
     error::LockPoisoned,
     mem::{DataPool, DepthBufferPool, StagingPool, TexturesPool},
-    queue_negotiator::QueueNegotiator,
+    queue_negotiator::QueueFamilyNegotiator,
     texture::{resolver::TextureResolver, TexLoadQueue, TextureLoadConfig, TextureRepo},
     types::*,
 };
@@ -459,13 +459,11 @@ where
 
     fn find_aux_queues<'c>(
         adapter: &'c Adapter,
-        queue_negotiator: &mut QueueNegotiator,
-    ) -> Result<Vec<(&'c QueueFamilyT, Vec<f32>)>> {
-        queue_negotiator.find(adapter, &TexLoadQueue)?;
+        queue_negotiator: &mut QueueFamilyNegotiator,
+    ) -> Result<()> {
+        queue_negotiator.find(adapter, &TexLoadQueue, 1)?;
 
-        Ok(vec![
-            queue_negotiator.family_spec::<TexLoadQueue>(&adapter.queue_families, 1)?
-        ])
+        Ok(())
     }
 }
 
diff --git a/stockton-render/src/ui.rs b/stockton-render/src/ui.rs
index 89afe18..f688f42 100644
--- a/stockton-render/src/ui.rs
+++ b/stockton-render/src/ui.rs
@@ -11,7 +11,7 @@ use stockton_skeleton::{
     draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition},
     error::LockPoisoned,
     mem::{DataPool, StagingPool, TexturesPool},
-    queue_negotiator::QueueNegotiator,
+    queue_negotiator::QueueFamilyNegotiator,
     texture::{
         resolver::TextureResolver, LoadableImage, TexLoadQueue, TextureLoadConfig, TextureRepo,
     },
@@ -341,13 +341,11 @@ impl<'a, P: PassPosition> IntoDrawPass<UiDrawPass<'a>, P> for () {
 
     fn find_aux_queues<'c>(
         adapter: &'c Adapter,
-        queue_negotiator: &mut QueueNegotiator,
-    ) -> Result<Vec<(&'c QueueFamilyT, Vec<f32>)>> {
-        queue_negotiator.find(adapter, &TexLoadQueue)?;
+        queue_negotiator: &mut QueueFamilyNegotiator,
+    ) -> Result<()> {
+        queue_negotiator.find(adapter, &TexLoadQueue, 1)?;
 
-        Ok(vec![
-            queue_negotiator.family_spec::<TexLoadQueue>(&adapter.queue_families, 1)?
-        ])
+        Ok(())
     }
 }