Renderer: Fix MRT support

include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp

@@ -149,6 +149,7 @@ namespace Nz
 
 			DrawStates m_currentStates;
 			std::size_t m_bindingIndex;
+			std::size_t m_maxColorBufferCount;
 			std::size_t m_poolIndex;
 			std::vector<CommandData> m_commands;
 			OpenGLCommandPool* m_owner;

include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.inl

@@ -11,12 +11,14 @@
 namespace Nz
 {
 	inline OpenGLCommandBuffer::OpenGLCommandBuffer() :
+	m_maxColorBufferCount(0),
 	m_owner(nullptr)
 	{
 	}
 
 	inline OpenGLCommandBuffer::OpenGLCommandBuffer(OpenGLCommandPool& owner, std::size_t poolIndex, std::size_t bindingIndex) :
 	m_bindingIndex(bindingIndex),
+	m_maxColorBufferCount(0),
 	m_poolIndex(poolIndex),
 	m_owner(&owner)
 	{
@@ -135,6 +137,8 @@ namespace Nz
 
 	inline void OpenGLCommandBuffer::SetFramebuffer(const OpenGLFramebuffer& framebuffer, const RenderPass& /*renderPass*/, const CommandBufferBuilder::ClearValues* clearValues, std::size_t clearValueCount)
 	{
+		m_maxColorBufferCount = std::max(m_maxColorBufferCount, framebuffer.GetColorBufferCount());
+
 		SetFrameBufferData setFramebuffer;
 		setFramebuffer.framebuffer = &framebuffer;
 

include/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.hpp

@@ -60,6 +60,7 @@ namespace Nz
 		private:
 			Vk::CommandBuffer& m_commandBuffer;
 			const VulkanRenderPass* m_currentRenderPass;
+			std::size_t m_currentSubpassIndex;
 			std::size_t m_framebufferCount;
 			std::size_t m_imageIndex;
 	};

include/Nazara/VulkanRenderer/VulkanRenderPipeline.hpp

@@ -8,12 +8,13 @@
 #define NAZARA_VULKANRENDERER_VULKANRENDERPIPELINE_HPP
 
 #include <Nazara/Prerequisites.hpp>
+#include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Renderer/RenderPipeline.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
+#include <Nazara/VulkanRenderer/VulkanRenderPass.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Pipeline.hpp>
-#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
 #include <vector>
 
 namespace Nz
@@ -26,7 +27,7 @@ namespace Nz
 			VulkanRenderPipeline(Vk::Device& device, RenderPipelineInfo pipelineInfo);
 			~VulkanRenderPipeline() = default;
 
-			VkPipeline Get(const Vk::RenderPass& renderPass) const;
+			VkPipeline Get(const VulkanRenderPass& renderPass, std::size_t subpassIndex) const;
 
 			inline const RenderPipelineInfo& GetPipelineInfo() const override;
 
@@ -71,9 +72,16 @@ namespace Nz
 			};
 
 		private:
-			mutable std::unordered_map<VkRenderPass, Vk::Pipeline> m_pipelines;
+			void UpdateCreateInfo(std::size_t colorBufferCount) const;
+
+			struct PipelineHasher
+			{
+				inline std::size_t operator()(const std::pair<VkRenderPass, std::size_t>& renderPass) const;
+			};
+
+			mutable std::unordered_map<std::pair<VkRenderPass, std::size_t>, Vk::Pipeline, PipelineHasher> m_pipelines;
 			MovablePtr<Vk::Device> m_device;
-			CreateInfo m_pipelineCreateInfo;
+			mutable CreateInfo m_pipelineCreateInfo;
 			RenderPipelineInfo m_pipelineInfo;
 	};
 }

include/Nazara/VulkanRenderer/VulkanRenderPipeline.inl

@@ -7,6 +7,15 @@
 
 namespace Nz
 {
+	inline std::size_t VulkanRenderPipeline::PipelineHasher::operator()(const std::pair<VkRenderPass, std::size_t>& renderPass) const
+	{
+		std::size_t seed = 0;
+		HashCombine(seed, renderPass.first);
+		HashCombine(seed, renderPass.second);
+
+		return seed;
+	}
+
 	inline const RenderPipelineInfo& VulkanRenderPipeline::GetPipelineInfo() const
 	{
 		return m_pipelineInfo;