Add remaining ext_descriptor_indexing flags

vulkano/src/descriptor_set/mod.rs

@@ -87,7 +87,10 @@ pub use self::{
         WriteDescriptorSetElements,
     },
 };
-use self::{layout::DescriptorSetLayout, pool::DescriptorPoolAlloc};
+use self::{
+    layout::DescriptorSetLayout,
+    pool::{DescriptorPool, DescriptorPoolAlloc},
+};
 use crate::{
     acceleration_structure::AccelerationStructure,
     buffer::view::BufferView,
@@ -122,6 +125,9 @@ pub unsafe trait DescriptorSet:
     /// Returns the allocation of the descriptor set.
     fn alloc(&self) -> &DescriptorPoolAlloc;
 
+    /// Returns the descriptor pool that the descriptor set was allocated from.
+    fn pool(&self) -> &DescriptorPool;
+
     /// Returns the layout of this descriptor set.
     #[inline]
     fn layout(&self) -> &Arc<DescriptorSetLayout> {

vulkano/src/descriptor_set/persistent.rs

@@ -21,7 +21,11 @@
 //! # Examples
 //! TODO:
 
-use super::{pool::DescriptorPoolAlloc, sys::UnsafeDescriptorSet, CopyDescriptorSet};
+use super::{
+    pool::{DescriptorPool, DescriptorPoolAlloc},
+    sys::UnsafeDescriptorSet,
+    CopyDescriptorSet,
+};
 use crate::{
     descriptor_set::{
         allocator::{DescriptorSetAlloc, DescriptorSetAllocator, StandardDescriptorSetAlloc},
@@ -126,6 +130,10 @@ where
         self.inner.alloc().inner()
     }
 
+    fn pool(&self) -> &DescriptorPool {
+        self.inner.alloc().pool()
+    }
+
     fn resources(&self) -> &DescriptorSetResources {
         &self.resources
     }

vulkano/src/descriptor_set/pool.rs

@@ -220,6 +220,33 @@ impl DescriptorPool {
         for (index, info) in allocate_infos.iter().enumerate() {
             info.validate(self.device())
                 .map_err(|err| err.add_context(format!("allocate_infos[{}]", index)))?;
+
+            let &DescriptorSetAllocateInfo {
+                ref layout,
+                variable_descriptor_count: _,
+                _ne: _,
+            } = info;
+
+            if layout
+                .flags()
+                .intersects(DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL)
+                && !self
+                    .flags
+                    .intersects(DescriptorPoolCreateFlags::UPDATE_AFTER_BIND)
+            {
+                return Err(Box::new(ValidationError {
+                    problem: format!(
+                        "`allocate_infos[{}].layout.flags()` contains \
+                        `DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL`, but \
+                        `self.flags` does not contain \
+                        `DescriptorPoolCreateFlags::UPDATE_AFTER_BIND`",
+                        index
+                    )
+                    .into(),
+                    vuids: &["VUID-VkDescriptorSetAllocateInfo-pSetLayouts-03044"],
+                    ..Default::default()
+                }));
+            }
         }
 
         Ok(())
@@ -558,13 +585,18 @@ vulkan_bitflags! {
     /// destroy the whole pool at once.
     FREE_DESCRIPTOR_SET = FREE_DESCRIPTOR_SET,
 
-    /* TODO: enable
-    // TODO: document
+    /// The pool can allocate descriptor sets with a layout whose flags include
+    /// [`DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL`].
+    ///
+    /// A pool created with this flag can still allocate descriptor sets without the flag.
+    /// However, descriptor copy operations are only allowed between pools of the same type;
+    /// it is not possible to copy between a descriptor set whose pool has `UPDATE_AFTER_BIND`,
+    /// and a descriptor set whose pool does not have this flag.
     UPDATE_AFTER_BIND = UPDATE_AFTER_BIND
     RequiresOneOf([
         RequiresAllOf([APIVersion(V1_2)]),
         RequiresAllOf([DeviceExtension(ext_descriptor_indexing)]),
-    ]), */
+    ]),
 
     /* TODO: enable
     // TODO: document

vulkano/src/descriptor_set/sys.rs

@@ -11,6 +11,7 @@
 
 use super::{
     allocator::{DescriptorSetAlloc, DescriptorSetAllocator, StandardDescriptorSetAlloc},
+    pool::DescriptorPool,
     CopyDescriptorSet,
 };
 use crate::{
@@ -60,6 +61,12 @@ where
         &self.alloc
     }
 
+    /// Returns the descriptor pool that the descriptor set was allocated from.
+    #[inline]
+    pub fn pool(&self) -> &DescriptorPool {
+        self.alloc.pool()
+    }
+
     /// Returns the layout of this descriptor set.
     #[inline]
     pub fn layout(&self) -> &Arc<DescriptorSetLayout> {
@@ -104,7 +111,7 @@ where
         }
 
         for (index, copy) in descriptor_copies.iter().enumerate() {
-            copy.validate(self.layout(), self.variable_descriptor_count())
+            copy.validate(self)
                 .map_err(|err| err.add_context(format!("descriptor_copies[{}]", index)))?;
         }
 

vulkano/src/descriptor_set/update.rs

@@ -8,13 +8,18 @@
 // according to those terms.
 
 use super::{
+    allocator::DescriptorSetAlloc,
     layout::{DescriptorSetLayout, DescriptorType},
+    sys::UnsafeDescriptorSet,
     DescriptorSet,
 };
 use crate::{
     acceleration_structure::{AccelerationStructure, AccelerationStructureType},
     buffer::{view::BufferView, BufferUsage, Subbuffer},
-    descriptor_set::layout::{DescriptorBindingFlags, DescriptorSetLayoutCreateFlags},
+    descriptor_set::{
+        layout::{DescriptorBindingFlags, DescriptorSetLayoutCreateFlags},
+        pool::DescriptorPoolCreateFlags,
+    },
     device::DeviceOwned,
     image::{
         sampler::Sampler,
@@ -1629,11 +1634,13 @@ impl CopyDescriptorSet {
         }
     }
 
-    pub(crate) fn validate(
+    pub(crate) fn validate<P>(
         &self,
-        dst_set_layout: &DescriptorSetLayout,
-        dst_set_variable_descriptor_count: u32,
-    ) -> Result<(), Box<ValidationError>> {
+        dst_set: &UnsafeDescriptorSet<P>,
+    ) -> Result<(), Box<ValidationError>>
+    where
+        P: DescriptorSetAlloc,
+    {
         let &Self {
             ref src_set,
             src_binding,
@@ -1645,7 +1652,73 @@ impl CopyDescriptorSet {
         } = self;
 
         // VUID-VkCopyDescriptorSet-commonparent
-        assert_eq!(src_set.device(), dst_set_layout.device());
+        assert_eq!(src_set.device(), dst_set.device());
+
+        match (
+            src_set
+                .layout()
+                .flags()
+                .intersects(DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL),
+            dst_set
+                .layout()
+                .flags()
+                .intersects(DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL),
+        ) {
+            (true, false) => {
+                return Err(Box::new(ValidationError {
+                    problem: "`src_set.layout().flags()` contains \
+                        `DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL`, but \
+                        `dst_set.layout().flags()` does not also contain it"
+                        .into(),
+                    vuids: &["VUID-VkCopyDescriptorSet-srcSet-01918"],
+                    ..Default::default()
+                }));
+            }
+            (false, true) => {
+                return Err(Box::new(ValidationError {
+                    problem: "`src_set.layout().flags()` does not contain \
+                        `DescriptorSetLayoutCreateFlags::UPDATE_AFTER_BIND_POOL`, but \
+                        `dst_set.layout().flags()` does contain it"
+                        .into(),
+                    vuids: &["VUID-VkCopyDescriptorSet-srcSet-04885"],
+                    ..Default::default()
+                }));
+            }
+            _ => (),
+        }
+
+        match (
+            src_set
+                .pool()
+                .flags()
+                .intersects(DescriptorPoolCreateFlags::UPDATE_AFTER_BIND),
+            dst_set
+                .pool()
+                .flags()
+                .intersects(DescriptorPoolCreateFlags::UPDATE_AFTER_BIND),
+        ) {
+            (true, false) => {
+                return Err(Box::new(ValidationError {
+                    problem: "`src_set.pool().flags()` contains \
+                        `DescriptorPoolCreateFlags::UPDATE_AFTER_BIND`, but \
+                        `dst_set.pool().flags()` does not also contain it"
+                        .into(),
+                    vuids: &["VUID-VkCopyDescriptorSet-srcSet-01920"],
+                    ..Default::default()
+                }));
+            }
+            (false, true) => {
+                return Err(Box::new(ValidationError {
+                    problem: "`src_set.pool().flags()` does not contain \
+                        `DescriptorPoolCreateFlags::UPDATE_AFTER_BIND`, but \
+                        `dst_set.pool().flags()` does contain it"
+                        .into(),
+                    vuids: &["VUID-VkCopyDescriptorSet-srcSet-04887"],
+                    ..Default::default()
+                }));
+            }
+            _ => (),
+        }
 
         let src_layout_binding = match src_set.layout().bindings().get(&src_binding) {
             Some(layout_binding) => layout_binding,
@@ -1679,7 +1752,7 @@ impl CopyDescriptorSet {
             }));
         }
 
-        let dst_layout_binding = match dst_set_layout.bindings().get(&dst_binding) {
+        let dst_layout_binding = match dst_set.layout().bindings().get(&dst_binding) {
             Some(layout_binding) => layout_binding,
             None => {
                 return Err(Box::new(ValidationError {
@@ -1696,7 +1769,7 @@ impl CopyDescriptorSet {
             .binding_flags
             .intersects(DescriptorBindingFlags::VARIABLE_DESCRIPTOR_COUNT)
         {
-            dst_set_variable_descriptor_count
+            dst_set.variable_descriptor_count()
         } else {
             dst_layout_binding.descriptor_count
         };