Cache STL pipeline, adjust to changes

AnastaZIuk · AnastaZIuk · commit f24ddece4c06 · 2021-02-14T16:48:03.000+01:00
diff --git a/examples_tests/27.LoaderFixes/main.cpp b/examples_tests/27.LoaderFixes/main.cpp
@@ -118,7 +118,7 @@ int main()
 		{
 			size_t neededDS1UboSize = 0ull;
 			{
-				for (const auto& shaderInputs : pipelineMetadata->getRequiredShaderInputs())
+				for (const auto& shaderInputs : pipelineMetadata->m_inputSemantics)
 					if (shaderInputs.descriptorSection.type == asset::IRenderpassIndependentPipelineMetadata::ShaderInput::ET_UNIFORM_BUFFER && shaderInputs.descriptorSection.uniformBufferObject.set == 1u && shaderInputs.descriptorSection.uniformBufferObject.binding == ds1UboBinding)
 						neededDS1UboSize = std::max<size_t>(neededDS1UboSize, shaderInputs.descriptorSection.uniformBufferObject.relByteoffset + shaderInputs.descriptorSection.uniformBufferObject.bytesize);
 			}
@@ -189,7 +189,7 @@ int main()
 			core::matrix4SIMD mvp = core::concatenateBFollowedByA(viewProjection, modelMatrix);
 
 			core::vector<uint8_t> uboData(gpuubo->getSize());
-			for (const auto& shaderInputs : pipelineMetadata->getRequiredShaderInputs())
+			for (const auto& shaderInputs : pipelineMetadata->m_inputSemantics)
 			{
 				if (shaderInputs.descriptorSection.type == asset::IRenderpassIndependentPipelineMetadata::ShaderInput::ET_UNIFORM_BUFFER && shaderInputs.descriptorSection.uniformBufferObject.set == 1u && shaderInputs.descriptorSection.uniformBufferObject.binding == ds1UboBinding)
 				{
diff --git a/src/nbl/asset/interchange/CPLYMeshFileLoader.cpp b/src/nbl/asset/interchange/CPLYMeshFileLoader.cpp
@@ -298,6 +298,7 @@ asset::SAssetBundle CPLYMeshFileLoader::loadAsset(io::IReadFile* _file, const as
 	}
 	
 	constexpr uint32_t WHAT_IS_THE_HASH_SUPPOSED_TO_BE = 69u; // TODO: @Crisspl / @Anastazluk figure it out!
+	
 	auto meta = core::make_smart_refctd_ptr<CPLYMetadata>(std::move(ctx.hashes4pplns),core::smart_refctd_ptr(m_basicViewParamsSemantics));
 	{
 		uint32_t offset = 0u;
diff --git a/src/nbl/asset/interchange/CSTLMeshFileLoader.cpp b/src/nbl/asset/interchange/CSTLMeshFileLoader.cpp
@@ -24,6 +24,105 @@ constexpr auto COLOR_ATTRIBUTE = 1;
 constexpr auto UV_ATTRIBUTE = 2;
 constexpr auto NORMAL_ATTRIBUTE = 3;
 
+CSTLMeshFileLoader::CSTLMeshFileLoader(asset::IAssetManager* _m_assetMgr)
+	: IRenderpassIndependentPipelineLoader(_m_assetMgr), m_assetMgr(_m_assetMgr)
+{
+	initialize();
+	IRenderpassIndependentPipelineLoader::initialize();
+}
+
+void CSTLMeshFileLoader::initialize()
+{
+	auto precomputeAndCachePipeline = [&](bool withColorAttribute)
+	{
+		auto getShaderDefaultPaths = [&]() -> std::pair<std::string_view, std::string_view>
+		{
+			if (withColorAttribute)
+				return std::make_pair("nbl/builtin/material/debug/vertex_color/specialized_shader.vert", "nbl/builtin/material/debug/vertex_color/specialized_shader.frag");
+			else
+				return std::make_pair("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert", "nbl/builtin/material/debug/vertex_normal/specialized_shader.frag");
+		 };
+
+		auto defaultOverride = IAssetLoaderOverride(m_assetMgr);
+		const std::string pipelineCacheHash = getPipelineCacheKey(withColorAttribute).data();
+		const uint32_t _hierarchyLevel = 0;
+		const IAssetLoader::SAssetLoadContext fakeContext(IAssetLoader::SAssetLoadParams{}, nullptr);
+
+		const asset::IAsset::E_TYPE types[]{ asset::IAsset::ET_RENDERPASS_INDEPENDENT_PIPELINE, (asset::IAsset::E_TYPE)0u };
+		auto pipelineBundle = defaultOverride.findCachedAsset(pipelineCacheHash, types, fakeContext, _hierarchyLevel + ICPURenderpassIndependentPipeline::DESC_SET_HIERARCHYLEVELS_BELOW);
+		if (pipelineBundle.getContents().empty())
+		{
+			auto mbVertexShader = core::smart_refctd_ptr<ICPUSpecializedShader>();
+			auto mbFragmentShader = core::smart_refctd_ptr<ICPUSpecializedShader>();
+			{
+				const IAsset::E_TYPE types[]{ IAsset::E_TYPE::ET_SPECIALIZED_SHADER, static_cast<IAsset::E_TYPE>(0u) };
+				const auto shaderPaths = getShaderDefaultPaths();
+
+				auto vertexShaderBundle = m_assetMgr->findAssets(shaderPaths.first.data(), types);
+				auto fragmentShaderBundle = m_assetMgr->findAssets(shaderPaths.second.data(), types);
+
+				mbVertexShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(vertexShaderBundle->begin()->getContents().begin()[0]);
+				mbFragmentShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(fragmentShaderBundle->begin()->getContents().begin()[0]);
+			}
+
+			auto defaultOverride = IAssetLoaderOverride(m_assetMgr);
+
+			const IAssetLoader::SAssetLoadContext fakeContext(IAssetLoader::SAssetLoadParams{}, nullptr);
+			auto mbBundlePipelineLayout = defaultOverride.findDefaultAsset<ICPUPipelineLayout>("nbl/builtin/pipeline_layout/loader/STL", fakeContext, _hierarchyLevel + ICPURenderpassIndependentPipeline::PIPELINE_LAYOUT_HIERARCHYLEVELS_BELOW);
+			auto mbPipelineLayout = mbBundlePipelineLayout.first;
+
+			auto const positionFormatByteSize = getTexelOrBlockBytesize(EF_R32G32B32_SFLOAT);
+			auto const colorFormatByteSize = withColorAttribute ? getTexelOrBlockBytesize(EF_B8G8R8A8_UNORM) : 0;
+			auto const normalFormatByteSize = getTexelOrBlockBytesize(EF_A2B10G10R10_SNORM_PACK32);
+
+			SVertexInputParams mbInputParams;
+			const auto stride = positionFormatByteSize + colorFormatByteSize + normalFormatByteSize;
+			mbInputParams.enabledBindingFlags |= core::createBitmask({ 0 });
+			mbInputParams.enabledAttribFlags |= core::createBitmask({ POSITION_ATTRIBUTE, NORMAL_ATTRIBUTE, withColorAttribute ? COLOR_ATTRIBUTE : 0 });
+			mbInputParams.bindings[0] = { stride, EVIR_PER_VERTEX };
+
+			mbInputParams.attributes[POSITION_ATTRIBUTE].format = EF_R32G32B32_SFLOAT;
+			mbInputParams.attributes[POSITION_ATTRIBUTE].relativeOffset = 0;
+			mbInputParams.attributes[POSITION_ATTRIBUTE].binding = 0;
+
+			if (withColorAttribute)
+			{
+				mbInputParams.attributes[COLOR_ATTRIBUTE].format = EF_R32G32B32_SFLOAT;
+				mbInputParams.attributes[COLOR_ATTRIBUTE].relativeOffset = positionFormatByteSize;
+				mbInputParams.attributes[COLOR_ATTRIBUTE].binding = 0;
+			}
+
+			mbInputParams.attributes[NORMAL_ATTRIBUTE].format = EF_R32G32B32_SFLOAT;
+			mbInputParams.attributes[NORMAL_ATTRIBUTE].relativeOffset = positionFormatByteSize + colorFormatByteSize;
+			mbInputParams.attributes[NORMAL_ATTRIBUTE].binding = 0;
+
+			SBlendParams blendParams;
+			SPrimitiveAssemblyParams primitiveAssemblyParams;
+			primitiveAssemblyParams.primitiveType = E_PRIMITIVE_TOPOLOGY::EPT_TRIANGLE_LIST;
+
+			SRasterizationParams rastarizationParmas;
+
+			auto mbPipeline = core::make_smart_refctd_ptr<ICPURenderpassIndependentPipeline>(std::move(mbPipelineLayout), nullptr, nullptr, mbInputParams, blendParams, primitiveAssemblyParams, rastarizationParmas); // TODO: @Crisspl/@Anastazluk pipeline should also be builtin because no need to customize the metadata anymore
+			{
+				mbPipeline->setShaderAtIndex(ICPURenderpassIndependentPipeline::ESSI_VERTEX_SHADER_IX, mbVertexShader.get());
+				mbPipeline->setShaderAtIndex(ICPURenderpassIndependentPipeline::ESSI_FRAGMENT_SHADER_IX, mbFragmentShader.get());
+			}
+
+			asset::SAssetBundle newPipelineBundle(nullptr, {core::smart_refctd_ptr<asset::ICPURenderpassIndependentPipeline>(mbPipeline)});
+			defaultOverride.insertAssetIntoCache(newPipelineBundle, pipelineCacheHash, fakeContext, _hierarchyLevel + ICPURenderpassIndependentPipeline::DESC_SET_HIERARCHYLEVELS_BELOW);
+		}
+		else
+			return;
+	};
+
+	/*
+		Pipeline with color and no-coolr attribute is cached
+	*/
+
+	precomputeAndCachePipeline(true);
+	precomputeAndCachePipeline(false);
+}
+
 SAssetBundle CSTLMeshFileLoader::loadAsset(IReadFile* _file, const IAssetLoader::SAssetLoadParams& _params, IAssetLoader::IAssetLoaderOverride* _override, uint32_t _hierarchyLevel)
 {
 	if (_params.meshManipulatorOverride == nullptr)
@@ -166,119 +265,27 @@ SAssetBundle CSTLMeshFileLoader::loadAsset(IReadFile* _file, const IAssetLoader:
 			memcpy(ptr + 16, colors.data() + i / 3, 4);
 	}
 
-	// TODO: @Anastazluk PRECOMPUTE THE ENTIRE PIPELINE (since metadata is now free to change for every time the same handle gets returned)
-	auto getShaderDefaultPaths = [&]() -> std::pair<std::string_view, std::string_view>
-	{
-		if (hasColor)
-			return std::make_pair("nbl/builtin/material/debug/vertex_color/specialized_shader.vert", "nbl/builtin/material/debug/vertex_color/specialized_shader.frag");
-		else
-			return std::make_pair("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert", "nbl/builtin/material/debug/vertex_normal/specialized_shader.frag");
-	};
-	auto mbVertexShader = core::smart_refctd_ptr<ICPUSpecializedShader>();
-	auto mbFragmentShader = core::smart_refctd_ptr<ICPUSpecializedShader>();
-	{
-		const IAsset::E_TYPE types[]{ IAsset::E_TYPE::ET_SPECIALIZED_SHADER, static_cast<IAsset::E_TYPE>(0u) };
-		const auto shaderPaths = getShaderDefaultPaths();
-
-		auto vertexShaderBundle = m_assetMgr->findAssets(shaderPaths.first.data(), types);
-		auto fragmentShaderBundle = m_assetMgr->findAssets(shaderPaths.second.data(), types);
-
-		mbVertexShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(vertexShaderBundle->begin()->getContents().begin()[0]);
-		mbFragmentShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(fragmentShaderBundle->begin()->getContents().begin()[0]);
-	}
-
 	const IAssetLoader::SAssetLoadContext fakeContext(IAssetLoader::SAssetLoadParams{}, nullptr);
-	auto mbBundlePipelineLayout = _override->findDefaultAsset<ICPUPipelineLayout>("nbl/builtin/pipeline_layout/loader/STL", fakeContext, _hierarchyLevel+ICPURenderpassIndependentPipeline::PIPELINE_LAYOUT_HIERARCHYLEVELS_BELOW);
-	auto mbPipelineLayout = mbBundlePipelineLayout.first;
-
-	constexpr size_t DS1_METADATA_ENTRY_CNT = 3ull;
-
-	// TODO: @Anastazluk use `m_basicViewParamsSemantics` from IRenderpassIndependentPipelineLoader
-	core::smart_refctd_dynamic_array<IRenderpassIndependentPipelineMetadata::ShaderInputSemantic> shaderInputsMetadata = core::make_refctd_dynamic_array<decltype(shaderInputsMetadata)>(DS1_METADATA_ENTRY_CNT);
+	const asset::IAsset::E_TYPE types[]{ asset::IAsset::ET_RENDERPASS_INDEPENDENT_PIPELINE, (asset::IAsset::E_TYPE)0u };
+	auto pipelineBundle = _override->findCachedAsset(getPipelineCacheKey(hasColor).data(), types, fakeContext, _hierarchyLevel + ICPURenderpassIndependentPipeline::DESC_SET_HIERARCHYLEVELS_BELOW);
 	{
-		ICPUDescriptorSetLayout* ds1layout = mbPipelineLayout->getDescriptorSetLayout(1u); // this metadata should probably go into pipeline layout's asset bundle (@Crisspl TODO: review)
-
-		// TODO: I will move all below to IAssetManager and put it into Pipeline Layout's metadata
-
-		constexpr IRenderpassIndependentPipelineMetadata::E_COMMON_SHADER_INPUT types[DS1_METADATA_ENTRY_CNT] =
-		{
-			IRenderpassIndependentPipelineMetadata::ECSI_WORLD_VIEW_PROJ,
-			IRenderpassIndependentPipelineMetadata::ECSI_WORLD_VIEW,
-			IRenderpassIndependentPipelineMetadata::ECSI_WORLD_VIEW_INVERSE_TRANSPOSE
-		};
-		constexpr uint32_t sizes[DS1_METADATA_ENTRY_CNT] =
-		{
-			sizeof(SBasicViewParameters::MVP),
-			sizeof(SBasicViewParameters::MV),
-			sizeof(SBasicViewParameters::NormalMat)
-		};
-		constexpr uint32_t relOffsets[DS1_METADATA_ENTRY_CNT] =
-		{
-			offsetof(SBasicViewParameters,MVP),
-			offsetof(SBasicViewParameters,MV),
-			offsetof(SBasicViewParameters,NormalMat)
-		};
-		for (uint32_t i = 0u; i < DS1_METADATA_ENTRY_CNT; ++i)
-		{
-			auto& semantic = (shaderInputsMetadata->end() - i - 1u)[0];
-			semantic.type = types[i];
-			semantic.descriptorSection.type = IRenderpassIndependentPipelineMetadata::ShaderInput::ET_UNIFORM_BUFFER;
-			semantic.descriptorSection.uniformBufferObject.binding = ds1layout->getBindings().begin()[0].binding;
-			semantic.descriptorSection.uniformBufferObject.set = 1u;
-			semantic.descriptorSection.uniformBufferObject.relByteoffset = relOffsets[i];
-			semantic.descriptorSection.uniformBufferObject.bytesize = sizes[i];
-			semantic.descriptorSection.shaderAccessFlags = ICPUSpecializedShader::ESS_VERTEX;
-		}
+		bool status = !pipelineBundle.getContents().empty();
+		assert(status);
 	}
 
-	auto const positionFormatByteSize = getTexelOrBlockBytesize(EF_R32G32B32_SFLOAT);
-	auto const colorFormatByteSize = hasColor ? getTexelOrBlockBytesize(EF_B8G8R8A8_UNORM) : 0;
-	auto const normalFormatByteSize = getTexelOrBlockBytesize(EF_A2B10G10R10_SNORM_PACK32);
-
-	SVertexInputParams mbInputParams;
-	const auto stride = positionFormatByteSize + colorFormatByteSize + normalFormatByteSize;
-	mbInputParams.enabledBindingFlags |= core::createBitmask({0});
-	mbInputParams.enabledAttribFlags |= core::createBitmask({POSITION_ATTRIBUTE, NORMAL_ATTRIBUTE, hasColor ? COLOR_ATTRIBUTE : 0});
-	mbInputParams.bindings[0] = { stride, EVIR_PER_VERTEX };
-
-	mbInputParams.attributes[POSITION_ATTRIBUTE].format = EF_R32G32B32_SFLOAT;
-	mbInputParams.attributes[POSITION_ATTRIBUTE].relativeOffset = 0;
-	mbInputParams.attributes[POSITION_ATTRIBUTE].binding = 0;
-
-	if (hasColor)
-	{
-		mbInputParams.attributes[COLOR_ATTRIBUTE].format = EF_R32G32B32_SFLOAT;
-		mbInputParams.attributes[COLOR_ATTRIBUTE].relativeOffset = positionFormatByteSize;
-		mbInputParams.attributes[COLOR_ATTRIBUTE].binding = 0;
-	}
+	auto mbPipeline = core::smart_refctd_ptr_static_cast<asset::ICPURenderpassIndependentPipeline>(pipelineBundle.getContents().begin()[0]);
 
-	mbInputParams.attributes[NORMAL_ATTRIBUTE].format = EF_R32G32B32_SFLOAT;
-	mbInputParams.attributes[NORMAL_ATTRIBUTE].relativeOffset = positionFormatByteSize + colorFormatByteSize;
-	mbInputParams.attributes[NORMAL_ATTRIBUTE].binding = 0;
-
-	SBlendParams blendParams;
-	SPrimitiveAssemblyParams primitiveAssemblyParams;
-	primitiveAssemblyParams.primitiveType = E_PRIMITIVE_TOPOLOGY::EPT_TRIANGLE_LIST;
-
-	SRasterizationParams rastarizationParmas;
-
-	auto mbPipeline = core::make_smart_refctd_ptr<ICPURenderpassIndependentPipeline>(std::move(mbPipelineLayout), nullptr, nullptr, mbInputParams, blendParams, primitiveAssemblyParams, rastarizationParmas); // TODO: @Crisspl/@Anastazluk pipeline should also be builtin because no need to customize the metadata anymore
-	{
-		mbPipeline->setShaderAtIndex(ICPURenderpassIndependentPipeline::ESSI_VERTEX_SHADER_IX, mbVertexShader.get());
-		mbPipeline->setShaderAtIndex(ICPURenderpassIndependentPipeline::ESSI_FRAGMENT_SHADER_IX, mbFragmentShader.get());
-		meshbuffer->setVertexBufferBinding({ 0ul, vertexBuf }, 0);
-	}
-
-	auto meta = core::make_smart_refctd_ptr<CSTLMetadata>(1u);
-	meta->placeMeta(0u,mbPipeline.get(),std::move(shaderInputsMetadata));
+	auto meta = core::make_smart_refctd_ptr<CSTLMetadata>(1u, std::move(m_basicViewParamsSemantics));
+	meta->placeMeta(0u, mbPipeline.get());
 
 	meshbuffer->setPipeline(std::move(mbPipeline));
 	meshbuffer->setIndexCount(positions.size());
 	meshbuffer->setIndexType(asset::EIT_UNKNOWN);
 
+	meshbuffer->setVertexBufferBinding({ 0ul, vertexBuf }, 0);
 	mesh->getMeshBufferVector().emplace_back(std::move(meshbuffer));
-
-	return SAssetBundle(std::move(meta),{ std::move(mesh) });
+	
+	return SAssetBundle(std::move(meta), { std::move(mesh) });
 }
 
 
diff --git a/src/nbl/asset/interchange/CSTLMeshFileLoader.h b/src/nbl/asset/interchange/CSTLMeshFileLoader.h
@@ -15,11 +15,11 @@ namespace asset
 {
 
 //! Meshloader capable of loading STL meshes.
-class CSTLMeshFileLoader final : public IAssetLoader
+class CSTLMeshFileLoader final : public IAssetLoader, public IRenderpassIndependentPipelineLoader
 {
 	public:
 
-		CSTLMeshFileLoader(asset::IAssetManager* _m_assetMgr) : m_assetMgr(_m_assetMgr) {}
+		CSTLMeshFileLoader(asset::IAssetManager* _m_assetMgr);
 
 		asset::SAssetBundle loadAsset(io::IReadFile* _file, const IAssetLoader::SAssetLoadParams& _params, IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override;
 
@@ -35,6 +35,14 @@ class CSTLMeshFileLoader final : public IAssetLoader
 
 	private:
 
+		/*
+			Precompute STL pipeline
+		*/
+
+		void initialize();
+
+		const std::string_view getPipelineCacheKey(bool withColorAttribute) { return withColorAttribute ? "nbl/builtin/pipeline/loader/STL/color_attribute" : "nbl/builtin/pipeline/loader/STL/no_color_attribute"; }
+
 		// skips to the first non-space character available
 		void goNextWord(io::IReadFile* file) const;
 		// returns the next word

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ int main()`
`118`	`118`	`{`
`119`	`119`	`size_t neededDS1UboSize = 0ull;`
`120`	`120`	`{`
`121`		`- for (const auto& shaderInputs : pipelineMetadata->getRequiredShaderInputs())`
	`121`	`+ for (const auto& shaderInputs : pipelineMetadata->m_inputSemantics)`
`122`	`122`	`if (shaderInputs.descriptorSection.type == asset::IRenderpassIndependentPipelineMetadata::ShaderInput::ET_UNIFORM_BUFFER && shaderInputs.descriptorSection.uniformBufferObject.set == 1u && shaderInputs.descriptorSection.uniformBufferObject.binding == ds1UboBinding)`
`123`	`123`	`neededDS1UboSize = std::max<size_t>(neededDS1UboSize, shaderInputs.descriptorSection.uniformBufferObject.relByteoffset + shaderInputs.descriptorSection.uniformBufferObject.bytesize);`
`124`	`124`	`}`
`@@ -189,7 +189,7 @@ int main()`
`189`	`189`	`core::matrix4SIMD mvp = core::concatenateBFollowedByA(viewProjection, modelMatrix);`
`190`	`190`
`191`	`191`	`core::vector<uint8_t> uboData(gpuubo->getSize());`
`192`		`- for (const auto& shaderInputs : pipelineMetadata->getRequiredShaderInputs())`
	`192`	`+ for (const auto& shaderInputs : pipelineMetadata->m_inputSemantics)`
`193`	`193`	`{`
`194`	`194`	`if (shaderInputs.descriptorSection.type == asset::IRenderpassIndependentPipelineMetadata::ShaderInput::ET_UNIFORM_BUFFER && shaderInputs.descriptorSection.uniformBufferObject.set == 1u && shaderInputs.descriptorSection.uniformBufferObject.binding == ds1UboBinding)`
`195`	`195`	`{`
Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ asset::SAssetBundle CPLYMeshFileLoader::loadAsset(io::IReadFile* _file, const as`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`constexpr uint32_t WHAT_IS_THE_HASH_SUPPOSED_TO_BE = 69u; // TODO: @Crisspl / @Anastazluk figure it out!`
	`301`	`+`
`301`	`302`	`auto meta = core::make_smart_refctd_ptr<CPLYMetadata>(std::move(ctx.hashes4pplns),core::smart_refctd_ptr(m_basicViewParamsSemantics));`
`302`	`303`	`{`
`303`	`304`	`uint32_t offset = 0u;`