Some extra validation.

Author: achalpandeyy

include/nbl/asset/IDescriptorSetLayout.h

@@ -146,10 +146,10 @@ class IDescriptorSetLayout : public virtual core::IReferenceCounted
 		inline uint32_t getCount(const binding_number_t binding) const
 		{
 			const auto index = findBindingStorageIndex(binding);
-			if (index == Invalid)
+			if (index.data == Invalid)
 				return 0;
 
-			return getDescriptorCount(index);
+			return getCount(index);
 		}
 
 		inline storage_offset_t getStorageOffset(const binding_number_t binding) const

src/nbl/video/CVulkanLogicalDevice.h

@@ -549,11 +549,10 @@ class CVulkanLogicalDevice final : public ILogicalDevice
 
                 const auto* infoSrc = pDescriptorWrites[i].info;
                 auto* infoDst = const_cast<VkDescriptorImageInfo*>(vk_writeDescriptorSets[i].pImageInfo);
+
                 for (uint32_t j = 0; j < pDescriptorWrites[i].count; ++j, ++infoSrc, ++infoDst)
                 {
-                    VkSampler vk_sampler = VK_NULL_HANDLE;
-                    if (infoSrc->info.image.sampler && (infoSrc->info.image.sampler->getAPIType() == EAT_VULKAN))
-                        vk_sampler = static_cast<const CVulkanSampler*>(infoSrc->info.image.sampler.get())->getInternalObject();
+                    VkSampler vk_sampler = infoSrc->info.image.sampler ? static_cast<const CVulkanSampler*>(infoSrc->info.image.sampler.get())->getInternalObject() : VK_NULL_HANDLE;
 
                     infoDst->sampler = vk_sampler;
                     infoDst->imageView = static_cast<const CVulkanImageView*>(infoSrc->desc.get())->getInternalObject();

src/nbl/video/IGPUDescriptorSet.cpp

@@ -58,6 +58,16 @@ bool IGPUDescriptorSet::validateWrite(const IGPUDescriptorSet::SWriteDescriptorS
     core::smart_refctd_ptr<video::IGPUSampler>* mutableSamplers = nullptr;
     if (write.descriptorType == asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER && write.info->info.image.sampler)
     {
+#ifdef _NBL_DEBUG
+        if (m_layout->getImmutableSamplerRedirect().getCount(IGPUDescriptorSetLayout::CBindingRedirect::binding_number_t{ write.binding }) != 0)
+            return false;
+
+        for (uint32_t i = 0; i < write.count; ++i)
+        {
+            if (!write.info[i].info.image.sampler || !write.info[i].info.image.sampler->isCompatibleDevicewise(write.dstSet))
+                return false;
+        }
+#endif
         mutableSamplers = getMutableSamplers(write.binding);
         if (!mutableSamplers)
         {