Calculate set count from pool sizes

vulkan-rs/src/descriptorpool.rs

@@ -6,7 +6,6 @@ use std::sync::Arc;
 
 pub struct DescriptorPoolBuilder {
     layout: Option<Arc<DescriptorSetLayout>>,
-    descriptor_count: u32,
     flags: VkDescriptorPoolCreateFlagBits,
 }
 
@@ -17,12 +16,6 @@ impl DescriptorPoolBuilder {
         self
     }
 
-    pub fn set_descriptor_set_count(mut self, count: u32) -> Self {
-        self.descriptor_count = count;
-
-        self
-    }
-
     pub fn set_layout(mut self, layout: Arc<DescriptorSetLayout>) -> Self {
         self.layout = Some(layout);
 
@@ -34,16 +27,24 @@ impl DescriptorPoolBuilder {
             if self.layout.is_none() {
                 panic!("no layout set!");
             }
-
-            if self.descriptor_count == 0 {
-                panic!("descriptor count must be greater than 0");
-            }
         }
 
         let layout = self.layout.expect("descriptor set layout was not set!");
 
+        let descriptor_count: u32 = layout
+            .pool_sizes()
+            .iter()
+            .map(|pool| pool.descriptorCount)
+            .sum();
+
+        if cfg!(debug_assertions) {
+            if descriptor_count == 0 {
+                panic!("descriptor count must be greater than 0");
+            }
+        }
+
         let descriptor_pool_ci =
-            VkDescriptorPoolCreateInfo::new(self.flags, self.descriptor_count, layout.pool_sizes());
+            VkDescriptorPoolCreateInfo::new(self.flags, descriptor_count, layout.pool_sizes());
 
         let descriptor_pool = device.create_descriptor_pool(&descriptor_pool_ci)?;
 
@@ -66,7 +67,6 @@ impl DescriptorPool {
     pub fn builder() -> DescriptorPoolBuilder {
         DescriptorPoolBuilder {
             layout: None,
-            descriptor_count: 1,
             flags: VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT.into(),
         }
     }
@@ -124,7 +124,6 @@ use crate::{ffi::*, handle_ffi_result};
 #[no_mangle]
 pub extern "C" fn create_descriptor_pool(
     flags: VkDescriptorPoolCreateFlagBits,
-    descriptor_count: u32,
     descriptor_set_layout: *const DescriptorSetLayout,
     device: *const Device,
 ) -> *const DescriptorPool {
@@ -133,7 +132,6 @@ pub extern "C" fn create_descriptor_pool(
 
     let pool_res = DescriptorPool::builder()
         .set_flags(flags)
-        .set_descriptor_set_count(descriptor_count)
         .set_layout(layout)
         .build(device);
 

vulkan-rs/src/descriptorsetlayout.rs

@@ -105,7 +105,7 @@ impl DescriptorSetLayout {
         }
     }
 
-    pub fn pool_sizes(&self) -> &[VkDescriptorPoolSize] {
+    pub(crate) fn pool_sizes(&self) -> &[VkDescriptorPoolSize] {
         self.pool_sizes.as_slice()
     }
 }