Some tiny changes and cleanups.

Author: achalpandeyy

include/nbl/video/utilities/IGPUObjectFromAssetConverter.h

@@ -1772,8 +1772,11 @@ inline created_gpu_object_array<asset::ICPUDescriptorSet> IGPUObjectFromAssetCon
                             if (!isStorageImgDesc(type))
                             {
                                 const bool isMutableSamplerBinding = (mutableSamplerBindingRedirect.findBindingStorageIndex(asset::ICPUDescriptorSetLayout::CBindingRedirect::binding_number_t{ write_it->binding }).data != mutableSamplerBindingRedirect.Invalid);
-                                if (descriptorInfos.begin()[offset + d].info.image.sampler && isMutableSamplerBinding)
+                                if (isMutableSamplerBinding)
+                                {
+                                    assert(descriptorInfos.begin()[offset + d].info.image.sampler);
                                     info->info.image.sampler = gpuSamplers->operator[](smplrRedirs[si++]);
+                                }
                             }
                         }
                         allDescriptorsPresent = allDescriptorsPresent && info->desc;

src/nbl/video/CVulkanLogicalDevice.h

@@ -487,57 +487,37 @@ class CVulkanLogicalDevice final : public ILogicalDevice
             vk_writeDescriptorSets[i].descriptorType = getVkDescriptorTypeFromDescriptorType(pDescriptorWrites[i].descriptorType);
             vk_writeDescriptorSets[i].descriptorCount = pDescriptorWrites[i].count;
 
-            assert(pDescriptorWrites[i].info[0].desc);
+            const auto bindingWriteCount = pDescriptorWrites[i].count;
 
             switch (pDescriptorWrites[i].info->desc->getTypeCategory())
             {
             case asset::IDescriptor::EC_BUFFER:
             {
-                VkDescriptorBufferInfo dummyInfo = {};
-                dummyInfo.buffer = static_cast<const CVulkanBuffer*>(pDescriptorWrites[i].info[0].desc.get())->getInternalObject();
-                dummyInfo.offset = pDescriptorWrites[i].info[0].info.buffer.offset;
-                dummyInfo.range = pDescriptorWrites[i].info[0].info.buffer.size;
-
                 vk_writeDescriptorSets[i].pBufferInfo = reinterpret_cast<VkDescriptorBufferInfo*>(vk_bufferInfos.size());
-                for (uint32_t j = 0u; j < pDescriptorWrites[i].count; ++j)
-                    vk_bufferInfos.push_back(dummyInfo);
+                vk_bufferInfos.resize(vk_bufferInfos.size() + bindingWriteCount);
             } break;
 
             case asset::IDescriptor::EC_IMAGE:
             {
-                const auto& firstDescWriteImageInfo = pDescriptorWrites[i].info[0].info.image;
-
-                VkDescriptorImageInfo dummyInfo = { VK_NULL_HANDLE };
-                if (firstDescWriteImageInfo.sampler && (firstDescWriteImageInfo.sampler->getAPIType() == EAT_VULKAN))
-                    dummyInfo.sampler = static_cast<const CVulkanSampler*>(firstDescWriteImageInfo.sampler.get())->getInternalObject();
-                dummyInfo.imageView = static_cast<const CVulkanImageView*>(pDescriptorWrites[i].info[0].desc.get())->getInternalObject();
-                dummyInfo.imageLayout = static_cast<VkImageLayout>(pDescriptorWrites[i].info[0].info.image.imageLayout);
-
                 vk_writeDescriptorSets[i].pImageInfo = reinterpret_cast<VkDescriptorImageInfo*>(vk_imageInfos.size());
-                for (uint32_t j = 0u; j < pDescriptorWrites[i].count; ++j)
-                    vk_imageInfos.push_back(dummyInfo);
+                vk_imageInfos.resize(vk_imageInfos.size() + bindingWriteCount);
             } break;
 
             case asset::IDescriptor::EC_BUFFER_VIEW:
             {
-                VkBufferView dummyBufferView = static_cast<const CVulkanBufferView*>(pDescriptorWrites[i].info[0].desc.get())->getInternalObject();
-
                 vk_writeDescriptorSets[i].pTexelBufferView = reinterpret_cast<VkBufferView*>(vk_bufferViews.size());
-                for (uint32_t j = 0u; j < pDescriptorWrites[i].count; ++j)
-                    vk_bufferViews.push_back(dummyBufferView);
+                vk_bufferViews.resize(vk_bufferViews.size() + bindingWriteCount);
             } break;
 
             case asset::IDescriptor::EC_ACCELERATION_STRUCTURE:
             {
                 auto& writeAS = vk_writeDescriptorSetAS[i];
                 writeAS = { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR, nullptr };
-                writeAS.accelerationStructureCount = pDescriptorWrites[i].count;
-
+                writeAS.accelerationStructureCount = bindingWriteCount;
                 vk_writeDescriptorSets[i].pNext = &writeAS;
 
                 writeAS.pAccelerationStructures = reinterpret_cast<VkAccelerationStructureKHR*>(vk_accelerationStructures.size());
-                for (uint32_t j = 0u; j < pDescriptorWrites[i].count; ++j)
-                    vk_accelerationStructures.push_back({});
+                vk_accelerationStructures.resize(vk_accelerationStructures.size() + bindingWriteCount);
             } break;
 
             default:

src/nbl/video/IDescriptorPool.cpp

@@ -72,12 +72,21 @@ uint32_t IDescriptorPool::createDescriptorSets(uint32_t count, const IGPUDescrip
 
 bool IDescriptorPool::reset()
 {
+    // something else except for the allocated sets needs to be holding onto the pool, so that
+    // we don't have an implicit call to `~IDescriptorPool` on `this` before we get out of the current stackframe  
+    assert(getReferenceCount() > m_descriptorSetAllocator.get_allocated_size());
+
     const auto& compilerIsRetarded = m_descriptorSetAllocator;
     for (const uint32_t setIndex : compilerIsRetarded)
         deleteSetStorage(setIndex);
 
+    // the `reset` doesn't deallocate anything, but it rearranges the free address stack in order to
+    // not make the future allocated addresses dependent on what happened before a reset
+    assert(m_descriptorSetAllocator.get_allocated_size() == 0);
     m_descriptorSetAllocator.reset();
 
+    // see the comment at the first assert
+    assert(getReferenceCount() >= 1);
     return reset_impl();
 }
 

src/nbl/video/ILogicalDevice.cpp

@@ -36,8 +36,7 @@ bool ILogicalDevice::updateDescriptorSets(uint32_t descriptorWriteCount, const I
         const auto& write = pDescriptorWrites[i];
         auto* ds = static_cast<IGPUDescriptorSet*>(write.dstSet);
 
-        if (!ds->getLayout()->isCompatibleDevicewise(ds))
-            return false;
+        assert(ds->getLayout()->isCompatibleDevicewise(ds));
 
         if (!ds->validateWrite(write))
             return false;
@@ -49,7 +48,7 @@ bool ILogicalDevice::updateDescriptorSets(uint32_t descriptorWriteCount, const I
         const auto* srcDS = static_cast<const IGPUDescriptorSet*>(copy.srcSet);
         const auto* dstDS = static_cast<IGPUDescriptorSet*>(copy.dstSet);
 
-        if ((!srcDS->getLayout()->isCompatibleDevicewise(srcDS)) || (!dstDS->getLayout()->isCompatibleDevicewise(dstDS)))
+        if (!dstDS->isCompatibleDevicewise(srcDS))
             return false;
 
         if (!dstDS->validateCopy(copy))