Modify ICPUVirtualTexture::getDescriptorSetWrites to directly update the given descriptor set and also renamed it.

Author: achalpandeyy

include/nbl/asset/utils/ICPUVirtualTexture.h

@@ -528,9 +528,38 @@ class ICPUVirtualTexture final : public IVirtualTexture<ICPUImageView, ICPUSampl
         return getDSlayoutBindings_internal<ICPUDescriptorSetLayout>(_outBindings, _outSamplers, _pgtBinding, _fsamplersBinding, _isamplersBinding, _usamplersBinding);
     }
 
-    auto getDescriptorSetWrites(ICPUDescriptorSet::SWriteDescriptorSet* _outWrites, ICPUDescriptorSet::SDescriptorInfo* _outInfo, ICPUDescriptorSet* _dstSet, uint32_t _pgtBinding = 0u, uint32_t _fsamplersBinding = 1u, uint32_t _isamplersBinding = 2u, uint32_t _usamplersBinding = 3u) const
+    bool updateDescriptorSet(ICPUDescriptorSet* _dstSet, uint32_t _pgtBinding = 0u, uint32_t _fsamplersBinding = 1u, uint32_t _isamplersBinding = 2u, uint32_t _usamplersBinding = 3u) const
     {
-        return getDescriptorSetWrites_internal<ICPUDescriptorSet>(_outWrites, _outInfo, _dstSet, _pgtBinding, _fsamplersBinding, _isamplersBinding, _usamplersBinding);
+        // Update _pgtBinding.
+        {
+            auto pgtInfos = _dstSet->getDescriptorInfos(_pgtBinding, IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER);
+            if (pgtInfos.empty())
+                return false;
+
+            assert(pgtInfos.size() == 1ull);
+            auto& info = pgtInfos.begin()[0];
+            info.info.image.imageLayout = IImage::EL_UNDEFINED;
+            info.info.image.sampler = nullptr;
+            info.desc = core::smart_refctd_ptr<ICPUImageView>(getPageTableView());
+        }
+
+        auto updateSamplersBinding = [&](const uint32_t binding, const auto& views)
+        {
+            auto infos = _dstSet->getDescriptorInfos(binding, IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER);
+
+            for (uint32_t i = 0; i < infos.size(); ++i)
+            {
+                auto& info = infos.begin()[i];
+
+                info.info.image.imageLayout = IImage::EL_UNDEFINED;
+                info.info.image.sampler = nullptr;
+                info.desc = views.begin()[i].view;
+            }
+        };
+
+        updateSamplersBinding(_fsamplersBinding, getFloatViews());
+        updateSamplersBinding(_isamplersBinding, getIntViews());
+        updateSamplersBinding(_usamplersBinding, getUintViews());
     }
 
 protected:

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -1189,21 +1189,8 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
 	auto* ds0layout = _layout->getDescriptorSetLayout(0u);
 
 	auto ds0 = core::make_smart_refctd_ptr<ICPUDescriptorSet>(core::smart_refctd_ptr<asset::ICPUDescriptorSetLayout>(ds0layout));
-	{
-		auto count = _ctx.backend_ctx.vt.vt->getDescriptorSetWrites(nullptr, nullptr, nullptr);
-
-		auto writes = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<asset::ICPUDescriptorSet::SWriteDescriptorSet>>(count.first);
-		auto info = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<asset::ICPUDescriptorSet::SDescriptorInfo>>(count.second);
-
-		_ctx.backend_ctx.vt.vt->getDescriptorSetWrites(writes->data(), info->data(), ds0.get());
-
-		for (const auto& w : (*writes))
-		{
-			auto descRng = ds0->getDescriptors(w.binding);
-			for (uint32_t i = 0u; i < w.count; ++i)
-				descRng.begin()[w.arrayElement+i].assign(w.info[i], w.descriptorType);
-		}
-	}
+	_ctx.backend_ctx.vt.vt->updateDescriptorSet(ds0.get());
+	
 	auto d = ds0->getDescriptors(PRECOMPUTED_VT_DATA_BINDING).begin();
 	{
 		auto precompDataBuf = core::make_smart_refctd_ptr<ICPUBuffer>(sizeof(asset::ICPUVirtualTexture::SPrecomputedData));