Add ShaderBinding

src/Nazara/Renderer/ShaderBinding.cpp

@@ -0,0 +1,11 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Renderer module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Renderer/ShaderBinding.hpp>
+#include <Nazara/Renderer/Debug.hpp>
+
+namespace Nz
+{
+	ShaderBinding::~ShaderBinding() = default;
+}

src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp

@@ -12,14 +12,17 @@
 
 namespace Nz
 {
-	Vk::DescriptorSet VulkanRenderPipelineLayout::AllocateDescriptorSet()
+	VulkanShaderBinding& VulkanRenderPipelineLayout::AllocateShaderBinding()
 	{
 		// TODO: Watch descriptor set count for each pool
 		for (auto& pool : m_descriptorPools)
 		{
+			if (pool.allocatedSets.capacity() <= pool.allocatedSets.size())
+				continue;
+
 			Vk::DescriptorSet descriptorSet = pool.descriptorPool.AllocateDescriptorSet(m_descriptorSetLayout);
 			if (descriptorSet)
-				return descriptorSet;
+				return pool.allocatedSets.emplace_back(*this, std::move(descriptorSet));
 		}
 
 		// Allocate a new descriptor pool
@@ -36,9 +39,16 @@ namespace Nz
 
 		DescriptorPool pool;
 		if (!pool.descriptorPool.Create(*m_device, MaxSet, UInt32(poolSizes.size()), poolSizes.data(), VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT))
-			return {};
+		{
+			//return {};
+		}
 
-		return m_descriptorPools.emplace_back(std::move(pool)).descriptorPool.AllocateDescriptorSet(m_descriptorSetLayout);
+		pool.allocatedSets.reserve(MaxSet);
+
+		auto& poolData = m_descriptorPools.emplace_back(std::move(pool));
+		Vk::DescriptorSet descriptorSet = poolData.descriptorPool.AllocateDescriptorSet(m_descriptorSetLayout);
+		//if (descriptorSet)
+			return poolData.allocatedSets.emplace_back(*this, std::move(descriptorSet));
 	}
 
 	bool VulkanRenderPipelineLayout::Create(Vk::Device& device, RenderPipelineLayoutInfo layoutInfo)

src/Nazara/VulkanRenderer/VulkanShaderBinding.cpp

@@ -0,0 +1,70 @@
+// Copyright (C) 2020 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Vulkan Renderer"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
+#include <Nazara/Core/Algorithm.hpp>
+#include <Nazara/Core/StackVector.hpp>
+#include <Nazara/VulkanRenderer/VulkanBuffer.hpp>
+#include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp>
+#include <Nazara/VulkanRenderer/VulkanTexture.hpp>
+#include <Nazara/VulkanRenderer/VulkanTextureSampler.hpp>
+#include <Nazara/VulkanRenderer/Debug.hpp>
+
+namespace Nz
+{
+	void VulkanShaderBinding::Update(std::initializer_list<Binding> bindings)
+	{
+		StackVector<VkDescriptorBufferInfo> bufferBinding = NazaraStackVector(VkDescriptorBufferInfo, bindings.size());
+		StackVector<VkDescriptorImageInfo> imageBinding = NazaraStackVector(VkDescriptorImageInfo, bindings.size());
+		StackVector<VkWriteDescriptorSet> writeOps = NazaraStackVector(VkWriteDescriptorSet, bindings.size());
+
+		for (const Binding& binding : bindings)
+		{
+			VkWriteDescriptorSet& writeOp = writeOps.emplace_back();
+			writeOp.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+			writeOp.dstSet = m_descriptorSet;
+			writeOp.dstBinding = UInt32(binding.bindingIndex);
+
+			std::visit([&](auto&& arg)
+			{
+				using T = std::decay_t<decltype(arg)>;
+
+				if constexpr (std::is_same_v<T, TextureBinding>)
+				{
+					VulkanTexture& vkTexture = *static_cast<VulkanTexture*>(arg.texture);
+					VulkanTextureSampler& vkSampler = *static_cast<VulkanTextureSampler*>(arg.sampler);
+
+					VkDescriptorImageInfo& imageInfo = imageBinding.emplace_back();
+					imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+					imageInfo.imageView = vkTexture.GetImageView();
+					imageInfo.sampler = vkSampler.GetSampler();
+
+					writeOp.descriptorCount = 1;
+					writeOp.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+
+					writeOp.pImageInfo = &imageInfo;
+				}
+				else if constexpr (std::is_same_v<T, UniformBufferBinding>)
+				{
+					VulkanBuffer& vkBuffer = *static_cast<VulkanBuffer*>(arg.buffer);
+
+					VkDescriptorBufferInfo& bufferInfo = bufferBinding.emplace_back();
+					bufferInfo.buffer = vkBuffer.GetBuffer();
+					bufferInfo.offset = arg.offset;
+					bufferInfo.range = arg.range;
+
+					writeOp.descriptorCount = 1;
+					writeOp.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+
+					writeOp.pBufferInfo = &bufferInfo;
+				}
+				else
+					static_assert(AlwaysFalse<T>::value, "non-exhaustive visitor");
+
+			}, binding.content);
+		}
+
+		m_owner.GetDevice()->vkUpdateDescriptorSets(*m_owner.GetDevice(), UInt32(writeOps.size()), writeOps.data(), 0U, nullptr);
+	}
+}