What's the point of IAssetLoader::initialize if its not decoupled from construction?

Author: devshgraphicsprogramming

examples_tests/18.MitsubaLoader/main.cpp

@@ -210,8 +210,12 @@ int main()
 		asset::IAssetManager* am = device->getAssetManager();
 		asset::CQuantNormalCache* qnc = am->getMeshManipulator()->getQuantNormalCache();
 
-		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am));
-		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs));
+		auto serializedLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am);
+		auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs);
+		serializedLoader->initialize();
+		mitsubaLoader->initialize();
+		am->addAssetLoader(std::move(serializedLoader));
+		am->addAssetLoader(std::move(mitsubaLoader));
 
 		std::string filePath = "../../media/mitsuba/staircase2.zip";
 	//#define MITSUBA_LOADER_TESTS

examples_tests/22.RaytracedAO/main.cpp

@@ -41,9 +41,13 @@ int main()
 	{
 		io::IFileSystem* fs = device->getFileSystem();
 		asset::IAssetManager* am = device->getAssetManager();
-
-		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am));
-		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am, fs));
+		
+		auto serializedLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am);
+		auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs);
+		serializedLoader->initialize();
+		mitsubaLoader->initialize();
+		am->addAssetLoader(std::move(serializedLoader));
+		am->addAssetLoader(std::move(mitsubaLoader));
 
 		//std::string filePath = "../../media/mitsuba/daily_pt.xml";
 		std::string filePath = "../../media/mitsuba/staircase2.zip";

examples_tests/39.DenoiserTonemapper/CommandLineHandler.cpp

@@ -24,8 +24,10 @@ CommandLineHandler::CommandLineHandler(core::vector<std::string> argv, IAssetMan
 		os::Printer::log(requiredArgumentsMessage.data(), ELL_INFORMATION);
 		return;
 	}
-
-	assetManager->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(assetManager));
+	
+	auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs);
+	mitsubaLoader->initialize();
+	am->addAssetLoader(std::move(mitsubaLoader));
 	core::vector<std::array<std::string, PROPER_CMD_ARGUMENTS_AMOUNT>> argvMappedList;
 
 	auto pushArgvList = [&](auto argvStream, auto variableCount)

include/nbl/asset/IAssetManager.h

@@ -574,8 +574,6 @@ class IAssetManager : public core::IReferenceCounted, public core::QuitSignallin
         //! @returns 0xdeadbeefu on failure or 0-based index on success.
         uint32_t addAssetLoader(core::smart_refctd_ptr<IAssetLoader>&& _loader)
         {
-            _loader->initialize();
-
             // there's no way it ever fails, so no 0xdeadbeef return
             const char** exts = _loader->getAssociatedFileExtensions();
             size_t extIx = 0u;

include/nbl/asset/interchange/IAssetLoader.h

@@ -279,7 +279,7 @@ class IAssetLoader : public virtual core::IReferenceCounted
 	virtual uint64_t getSupportedAssetTypesBitfield() const { return 0; }
 
 	//! Loads an asset from an opened file, returns nullptr in case of failure.
-	virtual SAssetBundle loadAsset(io::IReadFile* _file, const SAssetLoadParams& _params, IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) = 0;
+	virtual SAssetBundle loadAsset(io::IReadFile* _file, const SAssetLoadParams& _params, IAssetLoaderOverride* _override, uint32_t _hierarchyLevel = 0u) = 0;
 
 	virtual void initialize() {}
 

src/nbl/asset/IAssetManager.cpp

@@ -134,6 +134,9 @@ void IAssetManager::addLoadersAndWriters()
 #ifdef _NBL_COMPILE_WITH_PLY_LOADER_
 	addAssetLoader(core::make_smart_refctd_ptr<asset::CPLYMeshFileLoader>(this));
 #endif
+#ifdef _NBL_COMPILE_WITH_MTL_LOADER_
+    addAssetLoader(core::make_smart_refctd_ptr<asset::CGraphicsPipelineLoaderMTL>(this));
+#endif
 #ifdef _NBL_COMPILE_WITH_OBJ_LOADER_
 	addAssetLoader(core::make_smart_refctd_ptr<asset::COBJMeshFileLoader>(this));
 #endif
@@ -176,15 +179,15 @@ void IAssetManager::addLoadersAndWriters()
 #ifdef _NBL_COMPILE_WITH_PNG_WRITER_
 	addAssetWriter(core::make_smart_refctd_ptr<asset::CImageWriterPNG>());
 #endif
-#ifdef _NBL_COMPILE_WITH_MTL_LOADER_
-    addAssetLoader(core::make_smart_refctd_ptr<asset::CGraphicsPipelineLoaderMTL>(this));
-#endif
 #ifdef _NBL_COMPILE_WITH_OPENEXR_WRITER_
 	addAssetWriter(core::make_smart_refctd_ptr<asset::CImageWriterOpenEXR>());
 #endif
 #ifdef _NBL_COMPILE_WITH_GLI_WRITER_
 	addAssetWriter(core::make_smart_refctd_ptr<asset::CGLIWriter>());
 #endif
+
+    for (auto& loader : m_loaders.vector)
+        loader->initialize();
 }
 
 

src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp

@@ -50,9 +50,9 @@ CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am) : m_a
 
 void CGraphicsPipelineLoaderMTL::initialize()
 {
+    auto dfltOver = IAssetLoaderOverride(m_assetMgr);
     // need to initialize this first
     {
-        auto dfltOver = IAssetLoaderOverride(m_assetMgr);
         const IAssetLoader::SAssetLoadContext fakeCtx(IAssetLoader::SAssetLoadParams{},nullptr);
 
         // find ds1 layout
@@ -67,7 +67,7 @@ void CGraphicsPipelineLoaderMTL::initialize()
             //if intellisense shows error here, it's most likely intellisense's fault and it'll build fine anyway
             static_assert(sizeof(SMtl::params) <= ICPUMeshBuffer::MAX_PUSH_CONSTANT_BYTESIZE, "It must fit in push constants!");
 
-            auto pplnLayout = core::make_smart_refctd_ptr<ICPUPipelineLayout>(&pcRng, &pcRng+1, nullptr, std::move(ds1layout), nullptr, nullptr);
+            auto pplnLayout = core::make_smart_refctd_ptr<ICPUPipelineLayout>(&pcRng, &pcRng+1, nullptr, core::smart_refctd_ptr(ds1layout), nullptr, nullptr);
             insertBuiltinAssetIntoCache(m_assetMgr, SAssetBundle(nullptr,{ core::smart_refctd_ptr_static_cast<IAsset>(std::move(pplnLayout)) }), "nbl/builtin/pipeline_layout/loader/mtl/no_uv");
         }
 
@@ -113,7 +113,7 @@ void CGraphicsPipelineLoaderMTL::initialize()
     SAssetLoadParams assetLoadParams;
 
     auto default_mtl_file = m_assetMgr->getFileSystem()->createMemoryReadFile(DUMMY_MTL_CONTENT, strlen(DUMMY_MTL_CONTENT), "default IrrlichtBAW material");
-    auto bundle = loadAsset(default_mtl_file, assetLoadParams);
+    auto bundle = loadAsset(default_mtl_file, assetLoadParams, &dfltOver);
     default_mtl_file->drop();
 
     insertBuiltinAssetIntoCache(m_assetMgr, std::move(bundle), "nbl/builtin/renderpass_independent_pipeline/loader/mtl/missing_material_pipeline");
@@ -147,7 +147,13 @@ SAssetBundle CGraphicsPipelineLoaderMTL::loadAsset(io::IReadFile* _file, const I
         _override
     );
     const std::string fullName = _file->getFileName().c_str();
-	const std::string relPath = std::filesystem::path(fullName).parent_path().string()+"/";
+	const std::string relPath = [&fullName]() -> std::string
+	{
+		auto dir = std::filesystem::path(fullName).parent_path().string();
+		if (dir.empty())
+			return "";
+		return dir+"/";
+	}();
 
     auto materials = readMaterials(_file);
 

src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.h

@@ -51,7 +51,7 @@ class CGraphicsPipelineLoaderMTL final : public asset::IAssetLoader
 
 		uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_RENDERPASS_INDEPENDENT_PIPELINE; }
 
-		asset::SAssetBundle loadAsset(io::IReadFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override;
+		asset::SAssetBundle loadAsset(io::IReadFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override, uint32_t _hierarchyLevel = 0u) override;
 
     private:
         core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> makePipelineFromMtl(SContext& ctx, const SMtl& _mtl, bool hasUV);

src/nbl/asset/interchange/COBJMeshFileLoader.cpp

@@ -76,7 +76,13 @@ asset::SAssetBundle COBJMeshFileLoader::loadAsset(io::IReadFile* _file, const as
 	uint32_t smoothingGroup=0;
 
 	const std::string fullName = _file->getFileName().c_str();
-	const std::string relPath = std::filesystem::path(fullName).parent_path().string()+"/";
+	const std::string relPath = [&fullName]() -> std::string
+	{
+		auto dir = std::filesystem::path(fullName).parent_path().string();
+		if (dir.empty())
+			return "";
+		return dir+"/";
+	}();
 
     //value_type: directory from which .mtl (pipeline) was loaded and the pipeline
 	using pipeline_meta_pair_t = std::pair<core::smart_refctd_ptr<ICPURenderpassIndependentPipeline>,const CMTLMetadata::CRenderpassIndependentPipeline*>;