Rework DescriptorSetDesc and require it

Author: tomaka

vulkano/src/descriptor/descriptor_set/collection.rs

@@ -73,12 +73,18 @@ unsafe impl<T> DescriptorSetsCollection for T
 
     #[inline]
     fn num_bindings_in_set(&self, set: usize) -> Option<usize> {
-        unimplemented!()
+        match set {
+            0 => Some(self.num_bindings()),
+            _ => None
+        }
     }
 
     #[inline]
     fn descriptor(&self, set: usize, binding: usize) -> Option<DescriptorDesc> {
-        unimplemented!()
+        match set {
+            0 => self.descriptor(binding),
+            _ => None
+        }
     }
 }
 
@@ -116,13 +122,45 @@ macro_rules! impl_collection {
             }
 
             #[inline]
-            fn num_bindings_in_set(&self, set: usize) -> Option<usize> {
-                unimplemented!()
+            fn num_bindings_in_set(&self, mut set: usize) -> Option<usize> {
+                #![allow(non_snake_case)]
+                #![allow(unused_mut)]       // For the `set` parameter.
+
+                if set == 0 {
+                    return Some(self.0.num_bindings());
+                }
+
+                let &(_, $(ref $others,)*) = self;
+
+                $(
+                    set -= 1;
+                    if set == 0 {
+                        return Some($others.num_bindings());
+                    }
+                )*
+
+                None
             }
 
             #[inline]
-            fn descriptor(&self, set: usize, binding: usize) -> Option<DescriptorDesc> {
-                unimplemented!()
+            fn descriptor(&self, mut set: usize, binding: usize) -> Option<DescriptorDesc> {
+                #![allow(non_snake_case)]
+                #![allow(unused_mut)]       // For the `set` parameter.
+
+                if set == 0 {
+                    return self.0.descriptor(binding);
+                }
+
+                let &(_, $(ref $others,)*) = self;
+
+                $(
+                    set -= 1;
+                    if set == 0 {
+                        return $others.descriptor(binding);
+                    }
+                )*
+
+                None
             }
         }
 

vulkano/src/descriptor/descriptor_set/mod.rs

@@ -62,7 +62,7 @@ mod unsafe_layout;
 /// Trait for objects that contain a collection of resources that will be accessible by shaders.
 ///
 /// Objects of this type can be passed when submitting a draw command.
-pub unsafe trait DescriptorSet {
+pub unsafe trait DescriptorSet: DescriptorSetDesc {
     /// Returns the inner `UnsafeDescriptorSet`.
     fn inner(&self) -> &UnsafeDescriptorSet;
 }
@@ -76,18 +76,21 @@ unsafe impl<T> DescriptorSet for T where T: SafeDeref, T::Target: DescriptorSet
 
 /// Trait for objects that describe the layout of the descriptors of a set.
 pub unsafe trait DescriptorSetDesc {
-    /// Iterator that describes individual descriptors.
-    type Iter: ExactSizeIterator<Item = DescriptorDesc>;
+    /// Returns the number of binding slots in the set.
+    fn num_bindings(&self) -> usize;
 
-    /// Describes the layout of the descriptors of the pipeline.
-    fn desc(&self) -> Self::Iter;
+    /// Returns a description of a descriptor, or `None` if out of range.
+    fn descriptor(&self, binding: usize) -> Option<DescriptorDesc>;
 }
 
 unsafe impl<T> DescriptorSetDesc for T where T: SafeDeref, T::Target: DescriptorSetDesc {
-    type Iter = <T::Target as DescriptorSetDesc>::Iter;
+    #[inline]
+    fn num_bindings(&self) -> usize {
+        (**self).num_bindings()
+    }
 
     #[inline]
-    fn desc(&self) -> Self::Iter {
-        (**self).desc()
+    fn descriptor(&self, binding: usize) -> Option<DescriptorDesc> {
+        (**self).descriptor(binding)
     }
 }

vulkano/src/descriptor/descriptor_set/simple.rs

@@ -11,8 +11,10 @@ use std::sync::Arc;
 
 use buffer::Buffer;
 use buffer::BufferViewRef;
+use descriptor::descriptor::DescriptorDesc;
 use descriptor::descriptor::DescriptorType;
 use descriptor::descriptor_set::DescriptorSet;
+use descriptor::descriptor_set::DescriptorSetDesc;
 use descriptor::descriptor_set::UnsafeDescriptorSetLayout;
 use descriptor::descriptor_set::DescriptorPool;
 use descriptor::descriptor_set::DescriptorPoolAlloc;
@@ -65,6 +67,18 @@ unsafe impl<R, P> DescriptorSet for SimpleDescriptorSet<R, P> where P: Descripto
     }
 }
 
+unsafe impl<R, P> DescriptorSetDesc for SimpleDescriptorSet<R, P> where P: DescriptorPool {
+    #[inline]
+    fn num_bindings(&self) -> usize {
+        unimplemented!()        // FIXME:
+    }
+
+    #[inline]
+    fn descriptor(&self, binding: usize) -> Option<DescriptorDesc> {
+        unimplemented!()        // FIXME:
+    }
+}
+
 /// Builds a descriptor set in the form of a `SimpleDescriptorSet` object.
 // TODO: more doc
 #[macro_export]