Add FrameGraph (WIP)

src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp

@@ -11,6 +11,7 @@
 #include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp>
 #include <Nazara/VulkanRenderer/VulkanSingleFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
+#include <Nazara/VulkanRenderer/VulkanTexture.hpp>
 #include <Nazara/VulkanRenderer/VulkanUploadPool.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
@@ -26,7 +27,7 @@ namespace Nz
 		m_commandBuffer.BeginDebugRegion(regionNameEOS.data(), color);
 	}
 
-	void VulkanCommandBufferBuilder::BeginRenderPass(const Framebuffer& framebuffer, const RenderPass& renderPass, Nz::Recti renderRect, std::initializer_list<ClearValues> clearValues)
+	void VulkanCommandBufferBuilder::BeginRenderPass(const Framebuffer& framebuffer, const RenderPass& renderPass, Nz::Recti renderRect, const ClearValues* clearValues, std::size_t clearValueCount)
 	{
 		const VulkanRenderPass& vkRenderPass = static_cast<const VulkanRenderPass&>(renderPass);
 
@@ -49,14 +50,15 @@ namespace Nz
 			throw std::runtime_error("Unhandled framebuffer type " + std::to_string(UnderlyingCast(vkFramebuffer.GetType())));
 		}();
 
-		StackArray<VkClearValue> vkClearValues = NazaraStackArray(VkClearValue, clearValues.size());
+		std::size_t attachmentCount = vkRenderPass.GetAttachmentCount();
 
-		std::size_t index = 0;
-		for (const ClearValues& values : clearValues)
+		StackArray<VkClearValue> vkClearValues = NazaraStackArray(VkClearValue, attachmentCount);
+		for (std::size_t i = 0; i < attachmentCount; ++i)
 		{
-			auto& vkValues = vkClearValues[index];
+			const auto& values = (i < clearValueCount) ? clearValues[i] : CommandBufferBuilder::ClearValues{};
+			auto& vkValues = vkClearValues[i];
 
-			if (PixelFormatInfo::GetContent(vkRenderPass.GetAttachment(index).format) == PixelFormatContent_ColorRGBA)
+			if (PixelFormatInfo::GetContent(vkRenderPass.GetAttachment(i).format) == PixelFormatContent_ColorRGBA)
 			{
 				vkValues.color.float32[0] = values.color.r / 255.f;
 				vkValues.color.float32[1] = values.color.g / 255.f;
@@ -68,8 +70,6 @@ namespace Nz
 				vkValues.depthStencil.depth = values.depth;
 				vkValues.depthStencil.stencil = values.stencil;
 			}
-
-			index++;
 		}
 
 		VkRenderPassBeginInfo beginInfo = { VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO };
@@ -157,6 +157,11 @@ namespace Nz
 		m_currentRenderPass = nullptr;
 	}
 
+	void VulkanCommandBufferBuilder::NextSubpass()
+	{
+		m_commandBuffer.NextSubpass();
+	}
+
 	void VulkanCommandBufferBuilder::PreTransferBarrier()
 	{
 		m_commandBuffer.MemoryBarrier(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0U, VK_ACCESS_TRANSFER_READ_BIT);
@@ -176,4 +181,11 @@ namespace Nz
 	{
 		m_commandBuffer.SetViewport(Nz::Rectf(viewportRegion), 0.f, 1.f);
 	}
+
+	void VulkanCommandBufferBuilder::TextureBarrier(PipelineStageFlags srcStageMask, PipelineStageFlags dstStageMask, MemoryAccessFlags srcAccessMask, MemoryAccessFlags dstAccessMask, TextureLayout oldLayout, TextureLayout newLayout, const Texture& texture)
+	{
+		const VulkanTexture& vkTexture = static_cast<const VulkanTexture&>(texture);
+
+		m_commandBuffer.ImageBarrier(ToVulkan(srcStageMask), ToVulkan(dstStageMask), VkDependencyFlags(0), ToVulkan(srcAccessMask), ToVulkan(dstAccessMask), ToVulkan(oldLayout), ToVulkan(newLayout), vkTexture.GetImage(), VK_IMAGE_ASPECT_COLOR_BIT);
+	}
 }

src/Nazara/VulkanRenderer/VulkanRenderPass.cpp

@@ -40,6 +40,7 @@ namespace Nz
 		}
 
 		StackVector<VkAttachmentReference> vkAttachmentReferences = NazaraStackVector(VkAttachmentReference, totalAttachmentReference);
+		StackVector<UInt32> vkPreserveAttachments = NazaraStackVector(UInt32, attachments.size());
 
 		StackVector<VkSubpassDescription> vkSubpassDescs = NazaraStackVector(VkSubpassDescription, m_subpassDescriptions.size());
 		for (const SubpassDescription& subpassInfo : m_subpassDescriptions)
@@ -72,6 +73,10 @@ namespace Nz
 				});
 			}
 
+			assert(subpassInfo.preserveAttachments.size() <= vkPreserveAttachments.size());
+			for (std::size_t attachmentIndex : subpassInfo.preserveAttachments)
+				vkPreserveAttachments.push_back(UInt32(attachmentIndex));
+
 			vkSubpassDescs.push_back({
 				VkSubpassDescriptionFlags(0),
 				VK_PIPELINE_BIND_POINT_GRAPHICS,
@@ -81,17 +86,25 @@ namespace Nz
 				(!subpassInfo.colorAttachment.empty()) ? &vkAttachmentReferences[colorAttachmentIndex] : nullptr,
 				nullptr,
 				(subpassInfo.depthStencilAttachment) ? &vkAttachmentReferences[depthStencilAttachmentIndex] : nullptr,
-				0,
-				nullptr
+				UInt32(vkPreserveAttachments.size()),
+				(!vkPreserveAttachments.empty()) ? &vkPreserveAttachments[0] : nullptr
 			});
 		}
 
 		StackVector<VkSubpassDependency> vkSubpassDeps = NazaraStackVector(VkSubpassDependency, m_subpassDependencies.size());
 		for (const SubpassDependency& subpassDependency : m_subpassDependencies)
 		{
+			auto ToSubPassIndex = [](std::size_t subpassIndex) -> UInt32
+			{
+				if (subpassIndex == ExternalSubpassIndex)
+					return VK_SUBPASS_EXTERNAL;
+
+				return UInt32(subpassIndex);
+			};
+
 			vkSubpassDeps.push_back({
-				UInt32(subpassDependency.fromSubpassIndex),
-				UInt32(subpassDependency.toSubpassIndex),
+				ToSubPassIndex(subpassDependency.fromSubpassIndex),
+				ToSubPassIndex(subpassDependency.toSubpassIndex),
 				ToVulkan(subpassDependency.fromStages),
 				ToVulkan(subpassDependency.toStages),
 				ToVulkan(subpassDependency.fromAccessFlags),

src/Nazara/VulkanRenderer/VulkanSurface.cpp

@@ -4,6 +4,7 @@
 
 #include <Nazara/VulkanRenderer/VulkanSurface.hpp>
 #include <Nazara/VulkanRenderer/Vulkan.hpp>
+#include <vulkan/vk_sdk_platform.h>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz