Vulkan: Replace ShaderBinding& by ShaderBindingPtr

src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp

@@ -4,6 +4,7 @@
 
 #include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
+#include <Nazara/Core/MemoryHelper.hpp>
 #include <Nazara/Core/StackVector.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <cassert>
@@ -12,43 +13,35 @@
 
 namespace Nz
 {
-	VulkanShaderBinding& VulkanRenderPipelineLayout::AllocateShaderBinding()
+	VulkanRenderPipelineLayout::~VulkanRenderPipelineLayout()
 	{
-		// TODO: Watch descriptor set count for each pool
 		for (auto& pool : m_descriptorPools)
 		{
-			if (pool.allocatedSets.capacity() <= pool.allocatedSets.size())
+			if (!pool.freeBindings.TestAll())
+				NazaraWarning("Not all ShaderBinding have been released!");
+		}
+	}
+
+	ShaderBindingPtr VulkanRenderPipelineLayout::AllocateShaderBinding()
+	{
+		for (std::size_t i = 0; i < m_descriptorPools.size(); ++i)
+		{
+			ShaderBindingPtr bindingPtr = AllocateFromPool(i);
+			if (!bindingPtr)
 				continue;
 
-			Vk::DescriptorSet descriptorSet = pool.descriptorPool.AllocateDescriptorSet(m_descriptorSetLayout);
-			if (descriptorSet)
-				return pool.allocatedSets.emplace_back(*this, std::move(descriptorSet));
+			return bindingPtr;
 		}
 
-		// Allocate a new descriptor pool
-		StackVector<VkDescriptorPoolSize> poolSizes = NazaraStackVector(VkDescriptorPoolSize, m_layoutInfo.bindings.size());
+		// No allocation could be made, time to allocate a new pool
+		std::size_t newPoolIndex = m_descriptorPools.size();
+		AllocatePool();
 
-		constexpr UInt32 MaxSet = 100;
+		ShaderBindingPtr bindingPtr = AllocateFromPool(newPoolIndex);
+		if (!bindingPtr)
+			throw std::runtime_error("Failed to allocate shader binding");
 
-		for (const auto& bindingInfo : m_layoutInfo.bindings)
-		{
-			VkDescriptorPoolSize& poolSize = poolSizes.emplace_back();
-			poolSize.descriptorCount = MaxSet;
-			poolSize.type = ToVulkan(bindingInfo.type);
-		}
-
-		DescriptorPool pool;
-		if (!pool.descriptorPool.Create(*m_device, MaxSet, UInt32(poolSizes.size()), poolSizes.data(), VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT))
-			throw std::runtime_error("Failed to allocate new descriptor pool: " + TranslateVulkanError(pool.descriptorPool.GetLastErrorCode()));
-
-		pool.allocatedSets.reserve(MaxSet);
-
-		auto& poolData = m_descriptorPools.emplace_back(std::move(pool));
-		Vk::DescriptorSet descriptorSet = poolData.descriptorPool.AllocateDescriptorSet(m_descriptorSetLayout);
-		if (!descriptorSet)
-			throw std::runtime_error("Failed to allocate descriptor set: " + TranslateVulkanError(pool.descriptorPool.GetLastErrorCode()));
-
-		return poolData.allocatedSets.emplace_back(*this, std::move(descriptorSet));
+		return bindingPtr;
 	}
 
 	bool VulkanRenderPipelineLayout::Create(Vk::Device& device, RenderPipelineLayoutInfo layoutInfo)
@@ -75,4 +68,69 @@ namespace Nz
 
 		return true;
 	}
+
+	auto VulkanRenderPipelineLayout::AllocatePool() -> DescriptorPool&
+	{
+		StackVector<VkDescriptorPoolSize> poolSizes = NazaraStackVector(VkDescriptorPoolSize, m_layoutInfo.bindings.size());
+
+		constexpr UInt32 MaxSet = 128;
+
+		for (const auto& bindingInfo : m_layoutInfo.bindings)
+		{
+			VkDescriptorPoolSize& poolSize = poolSizes.emplace_back();
+			poolSize.descriptorCount = MaxSet;
+			poolSize.type = ToVulkan(bindingInfo.type);
+		}
+
+		DescriptorPool pool;
+		if (!pool.descriptorPool.Create(*m_device, MaxSet, UInt32(poolSizes.size()), poolSizes.data(), VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT))
+			throw std::runtime_error("Failed to allocate new descriptor pool: " + TranslateVulkanError(pool.descriptorPool.GetLastErrorCode()));
+
+		pool.freeBindings.Resize(MaxSet, true);
+		pool.storage = std::make_unique<DescriptorPool::BindingStorage[]>(MaxSet);
+
+		return m_descriptorPools.emplace_back(std::move(pool));
+	}
+
+	ShaderBindingPtr VulkanRenderPipelineLayout::AllocateFromPool(std::size_t poolIndex)
+	{
+		auto& pool = m_descriptorPools[poolIndex];
+
+		std::size_t freeBindingId = pool.freeBindings.FindFirst();
+		if (freeBindingId == pool.freeBindings.npos)
+			return {}; //< No free binding in this pool
+
+		Vk::DescriptorSet descriptorSet = pool.descriptorPool.AllocateDescriptorSet(m_descriptorSetLayout);
+		if (!descriptorSet)
+		{
+			NazaraWarning("Failed to allocate descriptor set: " + TranslateVulkanError(pool.descriptorPool.GetLastErrorCode()));
+			return {};
+		}
+
+		pool.freeBindings.Reset(freeBindingId);
+
+		VulkanShaderBinding* freeBindingMemory = reinterpret_cast<VulkanShaderBinding*>(&pool.storage[freeBindingId]);
+		return ShaderBindingPtr(PlacementNew(freeBindingMemory, *this, poolIndex, freeBindingId, std::move(descriptorSet)));
+	}
+
+	void VulkanRenderPipelineLayout::Release(ShaderBinding& binding)
+	{
+		VulkanShaderBinding& vulkanBinding = static_cast<VulkanShaderBinding&>(binding);
+
+		std::size_t poolIndex = vulkanBinding.GetPoolIndex();
+		std::size_t bindingIndex = vulkanBinding.GetBindingIndex();
+
+		assert(poolIndex < m_descriptorPools.size());
+		auto& pool = m_descriptorPools[poolIndex];
+		assert(!pool.freeBindings.Test(bindingIndex));
+
+		VulkanShaderBinding* bindingMemory = reinterpret_cast<VulkanShaderBinding*>(&pool.storage[bindingIndex]);
+		PlacementDestroy(bindingMemory);
+
+		pool.freeBindings.Set(bindingIndex);
+
+		// Try to free pool if it's one of the last one
+		if (poolIndex >= m_descriptorPools.size() - 1 && poolIndex <= m_descriptorPools.size())
+			TryToShrink();
+	}
 }

src/Nazara/VulkanRenderer/VulkanShaderBinding.cpp

@@ -67,4 +67,9 @@ namespace Nz
 
 		m_owner.GetDevice()->vkUpdateDescriptorSets(*m_owner.GetDevice(), UInt32(writeOps.size()), writeOps.data(), 0U, nullptr);
 	}
+
+	void VulkanShaderBinding::Release()
+	{
+		m_owner.Release(*this);
+	}
 }