Merge pull request #740 from Devsh-Graphics-Programming/tad_external_assets_hashes

Content hashes for loader-external assets

Author: devshgraphicsprogramming

include/nbl/asset/IAssetManager.h

@@ -127,6 +127,7 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
             m_compilerSet(std::move(compilerSet)),
             m_defaultLoaderOverride(this)
         {
+            assert(IPreHashed::INVALID_HASH == static_cast<core::blake3_hash_t>(core::blake3_hasher{}));
             initializeMeshTools();
 
             for (size_t i = 0u; i < m_assetCache.size(); ++i)

include/nbl/asset/ICPUBuffer.h

@@ -45,6 +45,7 @@ class ICPUBuffer : public asset::IBuffer, public IPreHashed
         {
             auto cp = core::make_smart_refctd_ptr<ICPUBuffer>(m_creationParams.size);
             memcpy(cp->getPointer(), data, m_creationParams.size);
+            cp->setContentHash(getContentHash());
             return cp;
         }
 

include/nbl/asset/ICPUImage.h

@@ -38,6 +38,7 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
 			else
 				cp->buffer = buffer;
 
+			cp->setContentHash(getContentHash());
             return cp;
         }
 

include/nbl/asset/IPreHashed.h

@@ -14,6 +14,7 @@ namespace nbl::asset
 class IPreHashed : public IAsset
 {
 	public:
+		constexpr static inline core::blake3_hash_t INVALID_HASH = { 0xaf,0x13,0x49,0xb9,0xf5,0xf9,0xa1,0xa6,0xa0,0x40,0x4d,0xea,0x36,0xdc,0xc9,0x49,0x9b,0xcb,0x25,0xc9,0xad,0xc1,0x12,0xb7,0xcc,0x9a,0x93,0xca,0xe4,0x1f,0x32,0x62 };
 		//
 		inline const core::blake3_hash_t& getContentHash() const {return m_contentHash;}
 		//

include/nbl/asset/filters/CBlitImageFilter.h

@@ -448,6 +448,8 @@ class CBlitImageFilter :
 				CBasicImageFilterCommon::executePerRegion(policy,outImg,scaleCoverage,outRegions, clip);
 			};
 
+			outImg->setContentHash(IPreHashed::INVALID_HASH);
+
 			// process
 			state->normalization.template initialize<double>();
 			const core::vectorSIMDf fInExtent(inExtentLayerCount);

include/nbl/asset/filters/CCopyImageFilter.h

@@ -73,6 +73,8 @@ class CCopyImageFilter : public CImageFilter<CCopyImageFilter>, public CMatchedS
 				return true;
 			};
 
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
+
 			return commonExecute(state,perOutputRegion);
 		}
 		static inline bool execute(state_type* state)

include/nbl/asset/filters/CFillImageFilter.h

@@ -54,6 +54,8 @@ class CFillImageFilter : public CImageFilter<CFillImageFilter>
 			auto regions = img->getRegions(state->subresource.mipLevel);
 			CBasicImageFilterCommon::executePerRegion(std::forward<ExecutionPolicy>(policy),img,fill,regions,clip);
 
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
+
 			return true;
 		}
 		static inline bool execute(state_type* state)

include/nbl/asset/filters/CFlattenRegionsImageFilter.h

@@ -165,6 +165,9 @@ class CFlattenRegionsImageFilter : public CImageFilter<CFlattenRegionsImageFilte
 				if (!CCopyImageFilter::execute(policy,&copy))
 					return false;
 			}
+
+			outImg->setContentHash(inImg->getContentHash());
+
 			return true;
 		}
 		static inline bool execute(state_type* state)

include/nbl/asset/filters/CMipMapGenerationImageFilter.h

@@ -95,6 +95,9 @@ class CMipMapGenerationImageFilter : public CImageFilter<CMipMapGenerationImageF
 				if (!pseudo_base_t::template execute<ExecutionPolicy>(std::forward<ExecutionPolicy>(policy),&blit))
 					return false;
 			}
+
+			state->inOutImage->setContentHash(IPreHashed::INVALID_HASH);
+
 			return true;
 		}
 		static inline bool execute(state_type* state)

include/nbl/asset/filters/CPaddedCopyImageFilter.h

@@ -211,6 +211,8 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ
 				}
 			}
 
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
+
 			return true;
 		}
 		static inline bool execute(state_type* state)