Work on nullifying descriptors

Author: deprilula28

include/nbl/video/IGPUDescriptorSet.h

@@ -45,6 +45,14 @@ class IGPUDescriptorSet : public asset::IDescriptorSet<const IGPUDescriptorSetLa
             uint32_t count;
         };
 
+        struct SDropDescriptorSet
+        {
+            IGPUDescriptorSet* dstSet;
+            uint32_t binding;
+            uint32_t arrayElement;
+            uint32_t count;
+        };
+
         inline uint64_t getVersion() const { return m_version.load(); }
         inline IDescriptorPool* getPool() const { return m_pool.get(); }
         inline bool isZombie() const { return (m_pool.get() == nullptr); }
@@ -61,6 +69,7 @@ class IGPUDescriptorSet : public asset::IDescriptorSet<const IGPUDescriptorSetLa
         void processWrite(const IGPUDescriptorSet::SWriteDescriptorSet& write, const asset::IDescriptor::E_TYPE type);
         bool validateCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy) const;
         void processCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy);
+        void dropDescriptors(const IGPUDescriptorSet::SDropDescriptorSet& drop);
 
         using redirect_t = IGPUDescriptorSetLayout::CBindingRedirect;
         // This assumes that descriptors of a particular type in the set will always be contiguous in pool's storage memory, regardless of which binding in the set they belong to.

include/nbl/video/ILogicalDevice.h

@@ -620,6 +620,9 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
             return updateDescriptorSets({pDescriptorWrites,descriptorWriteCount},{pDescriptorCopies,descriptorCopyCount});
         }
 
+        // should this be joined together with the existing updateDescriptorSets?
+        void nullifyDescriptors(const std::span<const IGPUDescriptorSet::SDropDescriptorSet> dropDescriptors);
+
         //! Renderpasses and Framebuffers
         core::smart_refctd_ptr<IGPURenderpass> createRenderpass(const IGPURenderpass::SCreationParams& params);
         inline core::smart_refctd_ptr<IGPUFramebuffer> createFramebuffer(IGPUFramebuffer::SCreationParams&& params)
@@ -836,6 +839,10 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
         };
         virtual void updateDescriptorSets_impl(const SUpdateDescriptorSetsParams& params) = 0;
 
+        // Drops refcounted references of the descriptors in these indices for the descriptor lifetime tracking 
+        // If the nullDescriptor device feature is enabled, this would also write a null descriptor to the descriptor set
+        virtual void nullifyDescriptors_impl(const std::span<const IGPUDescriptorSet::SDropDescriptorSet> dropDescriptors) = 0;
+
         virtual core::smart_refctd_ptr<IGPURenderpass> createRenderpass_impl(const IGPURenderpass::SCreationParams& params, IGPURenderpass::SCreationParamValidationResult&& validation) = 0;
         virtual core::smart_refctd_ptr<IGPUFramebuffer> createFramebuffer_impl(IGPUFramebuffer::SCreationParams&& params) = 0;
 

include/nbl/video/alloc/SubAllocatedDescriptorSet.h

@@ -285,6 +285,12 @@ class SubAllocatedDescriptorSet : public core::IReferenceCounted
 			//
 			// this needs to be done as a IGPUDescriptorSet::nullify(const uint32_t binding, 
 			// std::span<uint32_t> indices) function + a virtual nullify_impl
+			video::IGPUDescriptorSet::SDropDescriptorSet dropDescriptorSet;
+			dropDescriptorSet.dstSet = m_descriptorSet.get();
+			dropDescriptorSet.binding = binding;
+			dropDescriptorSet.arrayElement = i;
+			dropDescriptorSet.count = 1;
+			m_logicalDevice->nullifyDescriptors({ &dropDescriptorSet, 1 });
 		}
 	}
 

src/nbl/video/CVulkanLogicalDevice.cpp

@@ -717,6 +717,14 @@ void CVulkanLogicalDevice::updateDescriptorSets_impl(const SUpdateDescriptorSets
     m_devf.vk.vkUpdateDescriptorSets(m_vkdev,vk_writeDescriptorSets.size(),vk_writeDescriptorSets.data(),vk_copyDescriptorSets.size(),vk_copyDescriptorSets.data());
 }
 
+void CVulkanLogicalDevice::nullifyDescriptors_impl(const std::span<const IGPUDescriptorSet::SDropDescriptorSet> dropDescriptors)
+{
+    if (getEnabledFeatures().nullDescriptor)
+    {
+        // TODO: Write null descriptors here
+    }
+}
+
 
 core::smart_refctd_ptr<IGPURenderpass> CVulkanLogicalDevice::createRenderpass_impl(const IGPURenderpass::SCreationParams& params, IGPURenderpass::SCreationParamValidationResult&& validation)
 {

src/nbl/video/CVulkanLogicalDevice.h

@@ -281,6 +281,7 @@ class CVulkanLogicalDevice final : public ILogicalDevice
         // descriptor sets
         core::smart_refctd_ptr<IDescriptorPool> createDescriptorPool_impl(const IDescriptorPool::SCreateInfo& createInfo) override;
         void updateDescriptorSets_impl(const SUpdateDescriptorSetsParams& params) override;
+        void nullifyDescriptors_impl(const std::span<const IGPUDescriptorSet::SDropDescriptorSet> dropDescriptors) override;
 
         // renderpasses and framebuffers
         core::smart_refctd_ptr<IGPURenderpass> createRenderpass_impl(const IGPURenderpass::SCreationParams& params, IGPURenderpass::SCreationParamValidationResult&& validation) override;

src/nbl/video/IGPUDescriptorSet.cpp

@@ -124,6 +124,29 @@ void IGPUDescriptorSet::processWrite(const IGPUDescriptorSet::SWriteDescriptorSe
     incrementVersion();
 }
 
+void IGPUDescriptorSet::dropDescriptors(const IGPUDescriptorSet::SDropDescriptorSet& drop)
+{
+    assert(drop.dstSet == this);
+
+    for (uint32_t t = 0; t < static_cast<uint32_t>(asset::IDescriptor::E_TYPE::ET_COUNT); ++t)
+    {
+        const auto type = static_cast<asset::IDescriptor::E_TYPE>(t);
+
+        auto* dstDescriptors = drop.dstSet->getDescriptors(type, drop.binding);
+        auto* dstSamplers = drop.dstSet->getMutableSamplers(drop.binding);
+
+        if (dstDescriptors)
+            for (uint32_t i = 0; i < drop.count; i++)
+                dstDescriptors[drop.arrayElement + i] = nullptr;
+
+        if (dstSamplers)
+            for (uint32_t i = 0; i < drop.count; i++)
+                dstSamplers[drop.arrayElement + i] = nullptr;
+    }
+
+    incrementVersion();
+}
+
 bool IGPUDescriptorSet::validateCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy) const
 {
     assert(copy.dstSet == this);

src/nbl/video/ILogicalDevice.cpp

@@ -420,6 +420,14 @@ bool ILogicalDevice::updateDescriptorSets(const std::span<const IGPUDescriptorSe
     return true;
 }
 
+void ILogicalDevice::nullifyDescriptors(const std::span<const IGPUDescriptorSet::SDropDescriptorSet> dropDescriptors)
+{
+    for (const auto& drop : dropDescriptors)
+        drop.dstSet->dropDescriptors(drop);
+
+    nullifyDescriptors_impl(dropDescriptors);
+}
+
 core::smart_refctd_ptr<IGPURenderpass> ILogicalDevice::createRenderpass(const IGPURenderpass::SCreationParams& params)
 {
     IGPURenderpass::SCreationParamValidationResult validation = IGPURenderpass::validateCreationParams(params);