bunch of QOL improvements for handling null descriptor layouts in arrays

P.S. temporarily disabled queue cap checks in IGPUObjectFromAssetConverter

Author: devshgraphicsprogramming

examples_tests

@@ -244,10 +244,11 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
 
         core::smart_refctd_ptr<IDescriptorPool> createDescriptorPoolForDSLayouts(const IDescriptorPool::E_CREATE_FLAGS flags, const IGPUDescriptorSetLayout* const* const begin, const IGPUDescriptorSetLayout* const* const end, const uint32_t* setCounts=nullptr)
         {
-            IDescriptorPool::SCreateInfo createInfo;
+            IDescriptorPool::SCreateInfo createInfo = {};
 
             auto setCountsIt = setCounts;
             for (auto* curLayout = begin; curLayout!=end; curLayout++,setCountsIt++)
+            if (*curLayout)
             {
                 const auto setCount = setCounts ? (*setCountsIt):1u;
                 createInfo.maxSets += setCount;

include/nbl/video/ILogicalDevice.h

@@ -303,10 +303,13 @@ class IGPUObjectFromAssetConverter
         bool computeQueueSupportsGraphics(const SParams& _params)
         {
             // assert that ComputeQueue also supports Graphics
-            const uint32_t transferFamIx = _params.perQueue[EQU_TRANSFER].queue->getFamilyIndex();
+            const uint32_t transferFamIx = _params.perQueue[EQU_TRANSFER].queue ? _params.perQueue[EQU_TRANSFER].queue->getFamilyIndex():~0u;
             const uint32_t computeFamIx = _params.perQueue[EQU_COMPUTE].queue ? _params.perQueue[EQU_COMPUTE].queue->getFamilyIndex() : transferFamIx;
 
             auto queueFamProps = _params.device->getPhysicalDevice()->getQueueFamilyProperties();
+			if (computeFamIx>=queueFamProps.size())
+				return true; // no queue specified
+
             const auto& familyProperty = queueFamProps.begin()[computeFamIx];
             bool hasGraphicsFlag = (familyProperty.queueFlags & IPhysicalDevice::EQF_GRAPHICS_BIT).value != 0;
             return hasGraphicsFlag;

include/nbl/video/utilities/IGPUObjectFromAssetConverter.h

@@ -30,43 +30,55 @@ IDescriptorPool::IDescriptorPool(core::smart_refctd_ptr<const ILogicalDevice>&&
 
 uint32_t IDescriptorPool::createDescriptorSets(uint32_t count, const IGPUDescriptorSetLayout* const* layouts, core::smart_refctd_ptr<IGPUDescriptorSet>* output)
 {
+    core::vector<uint32_t> reverseMap(count,count);
+
+    core::vector<const IGPUDescriptorSetLayout*> repackedLayouts;
     core::vector<SStorageOffsets> offsets;
+    repackedLayouts.reserve(count);
     offsets.reserve(count);
-
-    for (uint32_t i = 0u; i < count; ++i)
+    for (uint32_t i=0u; i<count; ++i)
     {
+        if (!layouts[i])
+        {
+            m_logger.log("Null descriptor set layout found at index %u, skipping!", system::ILogger::ELL_PERFORMANCE, i);
+            continue;
+        }
+
         if (!isCompatibleDevicewise(layouts[i]))
         {
-            m_logger.log("Device-Incompatible descriptor set layout found at index %u. Sets for the layouts following this index will not be created.", system::ILogger::ELL_ERROR, i);
-            break;
+            m_logger.log("Device-Incompatible descriptor set layout found at index %u.", system::ILogger::ELL_ERROR, i);
+            continue;
         }
 
-        if (!allocateStorageOffsets(offsets.emplace_back(), layouts[i]))
+        if (!allocateStorageOffsets(offsets.emplace_back(),layouts[i]))
         {
-            m_logger.log("Failed to allocate descriptor or descriptor set offsets in the pool's storage for descriptor set layout at index %u. Sets for the layouts following this index will not be created.", system::ILogger::ELL_WARNING, i);
+            m_logger.log("Failed to allocate descriptor or descriptor set offsets in the pool's storage for descriptor set layout at index %u.", system::ILogger::ELL_WARNING, i);
             offsets.pop_back();
-            break;
+            continue;
         }
+        reverseMap[i] = repackedLayouts.size();
+        repackedLayouts.push_back(layouts[i]);
     }
-
     auto successCount = offsets.size();
 
-    const bool creationSuccess = createDescriptorSets_impl(successCount, layouts, offsets.data(), output);
+    const bool creationSuccess = createDescriptorSets_impl(successCount,repackedLayouts.data(),offsets.data(),output);
     if (creationSuccess)
     {
-        for (uint32_t i = 0u; i < successCount; ++i)
+        for (uint32_t i=0u; i<successCount; ++i)
             m_allocatedDescriptorSets[offsets[i].getSetOffset()] = output[i].get();
+        // shuffle the outputs
+        for (int32_t i=count-1; i>=0; i--)
+            output[i] = reverseMap[i]<count ? output[reverseMap[i]]:nullptr;
     }
     else
     {
         // Free the allocated offsets for all the successfully allocated descriptor sets and the offset of the descriptor sets themselves.
-        rewindLastStorageAllocations(successCount, offsets.data(), layouts);
+        rewindLastStorageAllocations(successCount,offsets.data(),layouts);
+        std::fill_n(output,count,nullptr);
         successCount = 0;
     }
 
     assert(count >= successCount);
-    std::fill_n(output + successCount, count - successCount, nullptr);
-
     return successCount;
 }