bring back asset reloads

Author: devsh

include/nbl/asset/IDescriptor.h

@@ -80,6 +80,8 @@ class IDescriptor : public virtual core::IReferenceCounted
 		virtual ~IDescriptor() = default;
 };
 
+template<typename T>
+concept Descriptor = std::is_base_of_v<IDescriptor,T>;
 }
 
 #endif

include/nbl/asset/interchange/IAssetLoader.h

@@ -297,6 +297,8 @@ class NBL_API2 IAssetLoader : public virtual core::IReferenceCounted
 		// accessors for loaders
 		SAssetBundle interm_getAssetInHierarchy(IAssetManager* _mgr, system::IFile* _file, const std::string& _supposedFilename, const IAssetLoader::SAssetLoadParams& _params, uint32_t _hierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override);
 		SAssetBundle interm_getAssetInHierarchy(IAssetManager* _mgr, const std::string& _filename, const IAssetLoader::SAssetLoadParams& _params, uint32_t _hierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override);
+		// only the overload we use for now
+		SAssetBundle interm_getAssetInHierarchyWithAllContent(IAssetManager* _mgr, const std::string& _filename, const IAssetLoader::SAssetLoadParams& _params, uint32_t _hierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override);
 
 		void interm_setAssetMutability(const IAssetManager* _mgr, IAsset* _asset, const bool _val);
 

src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp

@@ -556,7 +556,14 @@ CGraphicsPipelineLoaderMTL::image_views_set_t CGraphicsPipelineLoaderMTL::loadIm
         if (_mtl.maps[i].size() )
         {
             const uint32_t hierarchyLevel = _ctx.topHierarchyLevel + ICPURenderpassIndependentPipeline::IMAGE_HIERARCHYLEVELS_BELOW; // this is weird actually, we're not sure if we're loading image or image view
-            SAssetBundle bundle = interm_getAssetInHierarchy(m_assetMgr, _mtl.maps[i], lp, hierarchyLevel, _ctx.loaderOverride);
+            SAssetBundle bundle;
+            if (i != CMTLMetadata::CRenderpassIndependentPipeline::EMP_BUMP)
+                bundle = interm_getAssetInHierarchy(m_assetMgr, _mtl.maps[i], lp, hierarchyLevel, _ctx.loaderOverride);
+            else // TODO: you should attempt to get derivative map FIRST, then restore and regenerate! (right now you're always restoring!)
+            {
+                // we need bumpmap restored to create derivative map from it
+                bundle = interm_getAssetInHierarchyWithAllContent(m_assetMgr, _mtl.maps[i], lp, hierarchyLevel, _ctx.loaderOverride);
+            }
             auto asset = _ctx.loaderOverride->chooseDefaultAsset(bundle,_ctx.inner);
             if (asset)
             switch (bundle.getAssetType())

src/nbl/asset/interchange/IAssetLoader.cpp

@@ -45,6 +45,31 @@ SAssetBundle IAssetLoader::interm_getAssetInHierarchy(IAssetManager* _mgr, const
     return _mgr->getAssetInHierarchy(_filename, _params, _hierarchyLevel, _override);
 }
 
+SAssetBundle IAssetLoader::interm_getAssetInHierarchyWithAllContent(IAssetManager* _mgr, const std::string& _filename, const IAssetLoader::SAssetLoadParams& _params, uint32_t _hierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override)
+{
+	auto firstLoad = interm_getAssetInHierarchy(_mgr,_filename,_params,_hierarchyLevel,_override);
+	auto bundleHasAllContent = [](const SAssetBundle& retval)->bool
+	{
+		for (const auto& asset : retval.getContents())
+		if (IPreHashed::anyDependantDiscardedContents(asset.get()))
+			return false;
+		return true;
+	};
+	if (bundleHasAllContent(firstLoad))
+		return firstLoad;
+
+	IAssetLoader::SAssetLoadParams paramCopy = _params;
+	paramCopy.cacheFlags = ECF_DUPLICATE_REFERENCES;
+	auto secondLoad = interm_getAssetInHierarchy(_mgr,_filename,paramCopy,_hierarchyLevel,_override);
+	if (bundleHasAllContent(secondLoad))
+	{
+		_mgr->removeAssetFromCache(firstLoad);
+		return secondLoad;
+	}
+	else
+		return {};
+}
+
 void IAssetLoader::interm_setAssetMutability(const IAssetManager* _mgr, IAsset* _asset, const bool _val)
 {
     _mgr->setAssetMutability(_asset, _val);