Pipelines now share ownership of their pipeline-layout

stuart6854 · Dec 11, 2023 · 91a8249 · 91a8249
1 parent 3d42735
commit 91a8249
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/samples_app/src/samples/HelloTriangle/HelloTriangle.cpp b/samples_app/src/samples/HelloTriangle/HelloTriangle.cpp
@@ -74,7 +74,7 @@ namespace VkMana::SamplesApp
 			.Fragment = fragSpirvOpt.value(),
 			.Topology = vk::PrimitiveTopology::eTriangleList,
 			.ColorTargetFormats = { vk::Format::eB8G8R8A8Srgb },
-			.Layout = pipelineLayout.Get(),
+			.Layout = pipelineLayout,
 		};
 		m_pipeline = ctx.CreateGraphicsPipeline(pipelineInfo);
 

diff --git a/samples_app/src/samples/ModelLoading/ModelLoading.cpp b/samples_app/src/samples/ModelLoading/ModelLoading.cpp
@@ -109,7 +109,7 @@ namespace VkMana::SamplesApp
 			.Topology = vk::PrimitiveTopology::eTriangleList,
 			.ColorTargetFormats = { vk::Format::eB8G8R8A8Srgb },
 			.DepthTargetFormat = vk::Format::eD24UnormS8Uint,
-			.Layout = m_pipelineLayout.Get(),
+			.Layout = m_pipelineLayout,
 		};
 		m_pipeline = ctx.CreateGraphicsPipeline(pipelineInfo);
 		if (m_pipeline == nullptr)

diff --git a/samples_app/src/samples/Sandbox/Renderer.cpp b/samples_app/src/samples/Sandbox/Renderer.cpp
@@ -172,7 +172,7 @@ namespace VkMana::SamplesApp
 			.Topology =  vk::PrimitiveTopology::eTriangleList,
 			.ColorTargetFormats = { positionImageInfo.Format, normalImageInfo.Format, albedoImageInfo.Format },
 			.DepthTargetFormat = depthImageInfo.Format,
-			.Layout = m_gBufferPipelineLayout.Get(),
+			.Layout = m_gBufferPipelineLayout,
 		};
 		m_gBufferStaticPipeline = m_ctx->CreateGraphicsPipeline(pipelineInfo);
 
@@ -227,7 +227,7 @@ namespace VkMana::SamplesApp
 			.Fragment = fragmentSpirvOpt.value(),
 			.Topology = vk::PrimitiveTopology::eTriangleList,
 			.ColorTargetFormats = { compositionImageInfo.Format },
-			.Layout = m_compositionPipelineLayout.Get(),
+			.Layout = m_compositionPipelineLayout,
 		};
 		m_compositionPipeline = m_ctx->CreateGraphicsPipeline(pipelineInfo);
 	}
@@ -270,7 +270,7 @@ namespace VkMana::SamplesApp
 			.Fragment = fragmentSpirvOpt.value(),
 			.Topology = vk::PrimitiveTopology::eTriangleList,
 			.ColorTargetFormats = { vk::Format::eB8G8R8A8Srgb },
-			.Layout = m_screenPipelineLayout.Get(),
+			.Layout = m_screenPipelineLayout,
 		};
 		m_screenPipeline = m_ctx->CreateGraphicsPipeline(pipelineInfo);
 	}

diff --git a/src/VkMana/CommandBuffer.cpp b/src/VkMana/CommandBuffer.cpp
@@ -113,7 +113,7 @@ namespace VkMana
 
 	void CommandBuffer::SetPushConstants(vk::ShaderStageFlags shaderStages, uint32_t offset, uint32_t size, const void* data)
 	{
-		m_cmd.pushConstants(m_pipeline->GetLayout(), shaderStages, offset, size, data);
+		m_cmd.pushConstants(m_pipeline->GetLayout()->GetLayout(), shaderStages, offset, size, data);
 	}
 
 	void CommandBuffer::BindDescriptorSets(
@@ -123,7 +123,7 @@ namespace VkMana
 		for (auto i = 0u; i < sets.size(); ++i)
 			descSets[i] = sets[i]->GetSet();
 
-		m_cmd.bindDescriptorSets(m_pipeline->GetBindPoint(), m_pipeline->GetLayout(), firstSet, descSets, dynamicOffsets);
+		m_cmd.bindDescriptorSets(m_pipeline->GetBindPoint(), m_pipeline->GetLayout()->GetLayout(), firstSet, descSets, dynamicOffsets);
 	}
 
 	void CommandBuffer::BindIndexBuffer(const Buffer* buffer, uint64_t offsetBytes, vk::IndexType indexType)

diff --git a/src/VkMana/Context.cpp b/src/VkMana/Context.cpp
@@ -449,7 +449,7 @@ namespace VkMana
 		pipelineInfo.setPNext(&renderingInfo);
 		auto pipeline = m_device.createGraphicsPipeline({}, pipelineInfo).value; // #TODO: Pipeline Cache
 
-		return IntrusivePtr(new Pipeline(this, info.Layout->GetLayout(), pipeline, vk::PipelineBindPoint::eGraphics));
+		return IntrusivePtr(new Pipeline(this, info.Layout, pipeline, vk::PipelineBindPoint::eGraphics));
 	}
 
 	auto Context::CreateImage(ImageCreateInfo info, const ImageDataSource* initialData) -> ImageHandle

diff --git a/src/VkMana/Pipeline.cpp b/src/VkMana/Pipeline.cpp
@@ -24,7 +24,7 @@ namespace VkMana
 			m_ctx->DestroyPipeline(m_pipeline);
 	}
 
-	Pipeline::Pipeline(Context* context, vk::PipelineLayout layout, vk::Pipeline pipeline, vk::PipelineBindPoint bindPoint)
+	Pipeline::Pipeline(Context* context, const IntrusivePtr<PipelineLayout>& layout, vk::Pipeline pipeline, vk::PipelineBindPoint bindPoint)
 		: m_ctx(context)
 		, m_layout(layout)
 		, m_pipeline(pipeline)

diff --git a/src/VkMana/Pipeline.hpp b/src/VkMana/Pipeline.hpp
@@ -44,7 +44,7 @@ namespace VkMana
 		vk::Format DepthTargetFormat = vk::Format::eUndefined;
 		vk::Format StencilTargetFormat = vk::Format::eUndefined;
 
-		PipelineLayout* Layout = nullptr;
+		IntrusivePtr<PipelineLayout> Layout = nullptr;
 	};
 
 	class PipelineLayout : public IntrusivePtrEnabled<PipelineLayout>
@@ -80,11 +80,11 @@ namespace VkMana
 	private:
 		friend class Context;
 
-		Pipeline(Context* context, vk::PipelineLayout layout, vk::Pipeline pipeline, vk::PipelineBindPoint bindPoint);
+		Pipeline(Context* context, const IntrusivePtr<PipelineLayout>& layout, vk::Pipeline pipeline, vk::PipelineBindPoint bindPoint);
 
 	private:
 		Context* m_ctx;
-		vk::PipelineLayout m_layout;
+		IntrusivePtr<PipelineLayout> m_layout;
 		vk::Pipeline m_pipeline;
 		vk::PipelineBindPoint m_bindPoint;
 	};