hash buffer in image loaders

Author: tad1

src/nbl/asset/interchange/CGLILoader.cpp

@@ -210,8 +210,12 @@ namespace nbl
 
 			image->setBufferAndRegions(std::move(texelBuffer), regions);
 
-			auto hash = contentHasher.finalizeSeq();
-			image->setContentHash(hash);
+			{
+				auto hash = contentHasher.finalizeSeq();
+				auto* buffer = image->getBuffer();
+				image->setContentHash(hash);
+				buffer->setContentHash(buffer->computeContentHash());
+			}
 
 			ICPUImageView::SCreationParams imageViewInfo = {};
 			imageViewInfo.image = std::move(image);

src/nbl/asset/interchange/CImageLoaderJPG.cpp

@@ -339,8 +339,12 @@ asset::SAssetBundle CImageLoaderJPG::loadAsset(system::IFile* _file, const asset
 	core::smart_refctd_ptr<ICPUImage> image = ICPUImage::create(std::move(imgInfo));
 	image->setBufferAndRegions(std::move(buffer), regions);
 
-	auto hash = contentHasher.finalizeSeq();
-	image->setContentHash(hash);
+	{
+		auto hash = contentHasher.finalizeSeq();
+		auto* buffer = image->getBuffer();
+		buffer->setContentHash(buffer->computeContentHash());
+		image->setContentHash(hash);
+	}
 
     return SAssetBundle(nullptr,{image});
 

src/nbl/asset/interchange/CImageLoaderOpenEXR.cpp

@@ -386,7 +386,10 @@ SAssetBundle CImageLoaderOpenEXR::loadAsset(system::IFile* _file, const asset::I
 
 			CImageHasher contentHasher(params);
 			contentHasher.hashSeq(0, 0, image->getBuffer()->getPointer(), image->getImageDataSizeInBytes());
+
 			auto contentHash = contentHasher.finalizeSeq();
+			auto* const buffer = image->getBuffer();
+			buffer->setContentHash(buffer->computeContentHash());
 			image->setContentHash(contentHash);
 
 			meta->placeMeta(metaOffset++,image.get(),std::string(suffixOfChannels),IImageMetadata::ColorSemantic{ ECP_SRGB,EOTF_IDENTITY });

src/nbl/asset/interchange/CImageLoaderPNG.cpp

@@ -340,8 +340,12 @@ asset::SAssetBundle CImageLoaderPng::loadAsset(system::IFile* _file, const asset
 
 	image->setBufferAndRegions(std::move(texelBuffer), regions);
 
-	auto hash = image->computeContentHash();
-	image->setContentHash(hash);
+	{
+		auto hash = image->computeContentHash();
+		auto* const buffer = image->getBuffer();
+		buffer->setContentHash(buffer->computeContentHash());
+		image->setContentHash(hash);
+	}
 
     return SAssetBundle(nullptr,{image});
 }

src/nbl/asset/interchange/CImageLoaderTGA.cpp

@@ -321,8 +321,12 @@ asset::SAssetBundle CImageLoaderTGA::loadAsset(system::IFile* _file, const asset
 	if (!image)
 		return {};
 
-	auto hash = image->computeContentHash();
-	image->setContentHash(hash);
+	{
+		auto hash = image->computeContentHash();
+		auto* const buffer = image->getBuffer();
+		buffer->setContentHash(buffer->getContentHash());
+		image->setContentHash(hash);
+	}
 
     return SAssetBundle(nullptr,{std::move(image)});
 }