createGPUDescriptorSetLayout_impl use vector instead of stack fixed-length arrays

+ Test ImmutableSamplers on Example-09

Author: Erfan-Ahmadi

examples_tests/09.ColorSpaceTest/main.cpp

@@ -114,7 +114,10 @@ class ColorSpaceTestSampleApp : public ApplicationBase
 			}
 		};
 
-		video::IGPUDescriptorSetLayout::SBinding binding{ 0u, nbl::asset::EDT_COMBINED_IMAGE_SAMPLER, 1u, nbl::video::IGPUShader::ESS_FRAGMENT, nullptr };
+		nbl::asset::ISampler::SParams samplerParams = { nbl::asset::ISampler::ETC_CLAMP_TO_EDGE, nbl::asset::ISampler::ETC_CLAMP_TO_EDGE, nbl::asset::ISampler::ETC_CLAMP_TO_EDGE, nbl::asset::ISampler::ETBC_FLOAT_OPAQUE_BLACK, nbl::asset::ISampler::ETF_LINEAR, nbl::asset::ISampler::ETF_LINEAR, nbl::asset::ISampler::ESMM_LINEAR, 0u, false, nbl::asset::ECO_ALWAYS };
+		auto immutableSampler = logicalDevice->createGPUSampler(samplerParams);
+
+		video::IGPUDescriptorSetLayout::SBinding binding{ 0u, nbl::asset::EDT_COMBINED_IMAGE_SAMPLER, 1u, nbl::video::IGPUShader::ESS_FRAGMENT, &immutableSampler };
 		auto gpuDescriptorSetLayout3 = logicalDevice->createGPUDescriptorSetLayout(&binding, &binding + 1u);
 		auto gpuDescriptorPool = createDescriptorPool(1u); // per single texture
 		auto fstProtoPipeline = nbl::ext::FullScreenTriangle::createProtoPipeline(cpu2gpuParams);
@@ -299,8 +302,7 @@ class ColorSpaceTestSampleApp : public ApplicationBase
 			nbl::video::IGPUDescriptorSet::SDescriptorInfo info;
 			{
 				info.desc = gpuImageView;
-				nbl::asset::ISampler::SParams samplerParams = { nbl::asset::ISampler::ETC_CLAMP_TO_EDGE, nbl::asset::ISampler::ETC_CLAMP_TO_EDGE, nbl::asset::ISampler::ETC_CLAMP_TO_EDGE, nbl::asset::ISampler::ETBC_FLOAT_OPAQUE_BLACK, nbl::asset::ISampler::ETF_LINEAR, nbl::asset::ISampler::ETF_LINEAR, nbl::asset::ISampler::ESMM_LINEAR, 0u, false, nbl::asset::ECO_ALWAYS };
-				info.image.sampler = logicalDevice->createGPUSampler(samplerParams);
+				info.image.sampler = nullptr;
 				info.image.imageLayout = nbl::asset::EIL_SHADER_READ_ONLY_OPTIMAL;
 			}
 

src/nbl/video/CVulkanLogicalDevice.h

@@ -1249,42 +1249,51 @@ class CVulkanLogicalDevice final : public ILogicalDevice
         uint32_t bindingCount = std::distance(_begin, _end);
         assert(bindingCount <= MAX_BINDING_COUNT);
 
-        uint32_t samplerOffset = 0u;
-        VkSampler vk_samplers[MAX_SAMPLER_COUNT_PER_BINDING * MAX_BINDING_COUNT];
-        VkDescriptorSetLayoutBinding vk_dsLayoutBindings[MAX_BINDING_COUNT];
+        std::vector<VkSampler> vk_samplers;
+        std::vector<VkDescriptorSetLayoutBinding> vk_dsLayoutBindings;
 
         for (uint32_t b = 0u; b < bindingCount; ++b)
         {
             auto binding = _begin + b;
 
-            vk_dsLayoutBindings[b].binding = binding->binding;
-            vk_dsLayoutBindings[b].descriptorType = static_cast<VkDescriptorType>(binding->type);
-            vk_dsLayoutBindings[b].descriptorCount = binding->count;
-            vk_dsLayoutBindings[b].stageFlags = static_cast<VkShaderStageFlags>(binding->stageFlags);
-            vk_dsLayoutBindings[b].pImmutableSamplers = nullptr;
+            VkDescriptorSetLayoutBinding vkDescSetLayoutBinding = {};
+            vkDescSetLayoutBinding.binding = binding->binding;
+            vkDescSetLayoutBinding.descriptorType = static_cast<VkDescriptorType>(binding->type);
+            vkDescSetLayoutBinding.descriptorCount = binding->count;
+            vkDescSetLayoutBinding.stageFlags = static_cast<VkShaderStageFlags>(binding->stageFlags);
+            vkDescSetLayoutBinding.pImmutableSamplers = nullptr;
 
-            if (binding->samplers)
+            if (binding->samplers && binding->count > 0u)
             {
+                // If descriptorType is VK_DESCRIPTOR_TYPE_SAMPLER or VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, and descriptorCount is not 0 and pImmutableSamplers is not NULL:
+                // pImmutableSamplers must be a valid pointer to an array of descriptorCount valid VkSampler handles.
+
                 assert(binding->count <= MAX_SAMPLER_COUNT_PER_BINDING);
+                const uint32_t samplerOffset = vk_samplers.size();
 
                 for (uint32_t i = 0u; i < binding->count; ++i)
                 {
-                    if (binding->samplers[i]->getAPIType() != EAT_VULKAN)
+                    if (binding->samplers[i]->getAPIType() != EAT_VULKAN) {
+                        assert(false);
+                        vk_samplers.push_back(VK_NULL_HANDLE); // To get validation errors on Release Builds
                         continue;
+                    }
 
-                    vk_samplers[samplerOffset + i] = static_cast<const CVulkanSampler*>(binding->samplers[i].get())->getInternalObject();
+                    VkSampler vkSampler = static_cast<const CVulkanSampler*>(binding->samplers[i].get())->getInternalObject();
+                    vk_samplers.push_back(vkSampler);
                 }
 
-                vk_dsLayoutBindings[b].pImmutableSamplers = vk_samplers + samplerOffset;
-                samplerOffset += binding->count;
+                vkDescSetLayoutBinding.pImmutableSamplers = vk_samplers.data() + samplerOffset;
             }
+
+            vk_dsLayoutBindings.push_back(vkDescSetLayoutBinding);
         }
 
         VkDescriptorSetLayoutCreateInfo vk_createInfo = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO };
         vk_createInfo.pNext = nullptr; // Each pNext member of any structure (including this one) in the pNext chain must be either NULL or a pointer to a valid instance of VkDescriptorSetLayoutBindingFlagsCreateInfo or VkMutableDescriptorTypeCreateInfoVALVE
         vk_createInfo.flags = 0; // Todo(achal): I would need to create a IDescriptorSetLayout::SCreationParams for this
-        vk_createInfo.bindingCount = bindingCount;
-        vk_createInfo.pBindings = vk_dsLayoutBindings;
+        vk_createInfo.bindingCount = vk_dsLayoutBindings.size();
+        vk_createInfo.pBindings = vk_dsLayoutBindings.data();
 
         VkDescriptorSetLayout vk_dsLayout;
         if (m_devf.vk.vkCreateDescriptorSetLayout(m_vkdev, &vk_createInfo, nullptr, &vk_dsLayout) == VK_SUCCESS)