use INVALID_HASH constant & ignore buffer hash in ICPUImage

tad1 · tad1 · commit a58f16ebc01d · 2024-09-13T17:11:00.000+02:00
diff --git a/include/nbl/asset/filters/CBlitImageFilter.h b/include/nbl/asset/filters/CBlitImageFilter.h
@@ -448,10 +448,7 @@ class CBlitImageFilter :
 				CBasicImageFilterCommon::executePerRegion(policy,outImg,scaleCoverage,outRegions, clip);
 			};
 			
-			{ // invalidate hash
-				outImg->setContentHash({});
-				outImg->getBuffer()->setContentHash({});
-			}
+			outImg->setContentHash(core::INVALID_HASH);
 
 			// process
 			state->normalization.template initialize<double>();
diff --git a/include/nbl/asset/filters/CCopyImageFilter.h b/include/nbl/asset/filters/CCopyImageFilter.h
@@ -73,10 +73,7 @@ class CCopyImageFilter : public CImageFilter<CCopyImageFilter>, public CMatchedS
 				return true;
 			};
 
-			{ // invalidate image and buffer hash
-				state->outImage->setContentHash({});
-				state->outImage->getBuffer()->setContentHash({});
-			}
+			state->outImage->setContentHash(core::INVALID_HASH);
 
 			return commonExecute(state,perOutputRegion);
 		}
diff --git a/include/nbl/asset/filters/CFillImageFilter.h b/include/nbl/asset/filters/CFillImageFilter.h
@@ -54,10 +54,7 @@ class CFillImageFilter : public CImageFilter<CFillImageFilter>
 			auto regions = img->getRegions(state->subresource.mipLevel);
 			CBasicImageFilterCommon::executePerRegion(std::forward<ExecutionPolicy>(policy),img,fill,regions,clip);
 
-			{ // invalidate image and buffer hash
-				state->outImage->setContentHash({});
-				state->outImage->getBuffer()->setContentHash({});
-			}
+			state->outImage->setContentHash(core::INVALID_HASH);
 
 			return true;
 		}
diff --git a/include/nbl/asset/filters/CFlattenRegionsImageFilter.h b/include/nbl/asset/filters/CFlattenRegionsImageFilter.h
@@ -166,8 +166,8 @@ class CFlattenRegionsImageFilter : public CImageFilter<CFlattenRegionsImageFilte
 					return false;
 			}
 
-			outImg->getBuffer()->setContentHash({});
 			outImg->setContentHash(inImg->getContentHash());
+
 			return true;
 		}
 		static inline bool execute(state_type* state)
diff --git a/include/nbl/asset/filters/CMipMapGenerationImageFilter.h b/include/nbl/asset/filters/CMipMapGenerationImageFilter.h
@@ -96,10 +96,7 @@ class CMipMapGenerationImageFilter : public CImageFilter<CMipMapGenerationImageF
 					return false;
 			}
 
-			{ // invalidate image and buffer hash
-				state->inOutImage->setContentHash({});
-				state->inOutImage->getBuffer()->setContentHash({});
-			}
+			state->inOutImage->setContentHash(core::INVALID_HASH);
 
 			return true;
 		}
diff --git a/include/nbl/asset/filters/CPaddedCopyImageFilter.h b/include/nbl/asset/filters/CPaddedCopyImageFilter.h
@@ -211,10 +211,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ
 				}
 			}
 
-			{ // invalidate image and buffer hash
-				state->outImage->setContentHash({});
-				state->outImage->getBuffer()->setContentHash({});
-			}
+			state->outImage->setContentHash(core::INVALID_HASH);
 
 			return true;
 		}
diff --git a/include/nbl/asset/filters/CRegionBlockFunctorFilter.h b/include/nbl/asset/filters/CRegionBlockFunctorFilter.h
@@ -60,9 +60,8 @@ class CRegionBlockFunctorFilter : public CImageFilter<CRegionBlockFunctorFilter<
 			CBasicImageFilterCommon::executePerBlock<ExecutionPolicy,Functor>(std::forward<ExecutionPolicy>(policy),state->image,*state->regionIterator,state->functor);
 
 			if constexpr(!ConstImage)
-			{ // invalidate image and buffer hash
-				state->image->setContentHash({});
-				state->image->getBuffer()->setContentHash({});
+			{
+				state->image->setContentHash(core::INVALID_HASH);
 			}
 
 			return true;
diff --git a/include/nbl/asset/filters/CSummedAreaTableImageFilter.h b/include/nbl/asset/filters/CSummedAreaTableImageFilter.h
@@ -407,10 +407,7 @@ class CSummedAreaTableImageFilter : public CMatchedSizeInOutImageFilterCommon, p
 				++state->outBaseLayer;
 			}
 
-			{ // invalidate image and buffer hash
-				state->outImage->setContentHash({});
-				state->outImage->getBuffer()->setContentHash({});
-			}
+			state->outImage->setContentHash(core::INVALID_HASH);
 
 			resetState();
 			return true;
diff --git a/include/nbl/asset/filters/CSwizzleAndConvertImageFilter.h b/include/nbl/asset/filters/CSwizzleAndConvertImageFilter.h
@@ -374,10 +374,7 @@ class CSwizzleAndConvertImageFilter<inFormat,EF_UNKNOWN,Swizzle,Dither,Normaliza
 				return true;
 			};
 
-			{ // invalidate image and buffer hash
-				state->outImage->setContentHash({});
-				state->outImage->getBuffer()->setContentHash({});
-			}
+			state->outImage->setContentHash(core::INVALID_HASH);
 
 			return CMatchedSizeInOutImageFilterCommon::commonExecute(state, perOutputRegion);
 		}
diff --git a/include/nbl/asset/filters/dithering/CPrecomputedDither.h b/include/nbl/asset/filters/dithering/CPrecomputedDither.h
@@ -59,7 +59,7 @@ namespace nbl
 								
 							const core::vector3du32_SIMD decodeBufferByteStrides = TexelBlockInfo(decodeFormat).convert3DTexelStridesTo1DByteStrides(core::vector3du32_SIMD(extent.x, extent.y, extent.z));
 							auto decodeFlattenBuffer = core::make_smart_refctd_ptr<ICPUBuffer>(newDecodeBufferSize);
-							decodeFlattenBuffer->setContentHash({});
+							decodeFlattenBuffer->setContentHash(core::INVALID_HASH);
 					
 							auto* inData = reinterpret_cast<uint8_t*>(flattenDitheringImage->getBuffer()->getPointer());
 							auto* outData = reinterpret_cast<uint8_t*>(decodeFlattenBuffer->getPointer());
diff --git a/include/nbl/asset/interchange/IImageAssetHandlerBase.h b/include/nbl/asset/interchange/IImageAssetHandlerBase.h
@@ -112,10 +112,8 @@ class IImageAssetHandlerBase : public virtual core::IReferenceCounted
 
 				auto texelBuffer = core::make_smart_refctd_ptr<ICPUBuffer>(bufferSize);
 				
-				texelBuffer->setContentHash({});
-				newImage->setContentHash({});
-
 				newImage->setBufferAndRegions(std::move(texelBuffer), newRegions);
+				newImage->setContentHash(core::INVALID_HASH);
 			}
 
 			using COPY_FILTER = asset::CCopyImageFilter;
@@ -193,8 +191,7 @@ class IImageAssetHandlerBase : public virtual core::IReferenceCounted
 			auto stride = trueExtent.X * getTexelOrBlockBytesize(format);
 
 			performImageFlip(entry, end, trueExtent.Y, stride);
-			image->setContentHash({}); //invalidate content hash
-			image->getBuffer()->setContentHash({});
+			image->setContentHash(core::INVALID_HASH);
 		}
 
 		static inline void performImageFlip(uint8_t* entry, uint8_t* end, uint32_t height, uint32_t rowPitch)
diff --git a/include/nbl/core/hash/blake.h b/include/nbl/core/hash/blake.h
@@ -21,6 +21,8 @@ struct blake3_hash_t final
 	uint8_t data[BLAKE3_OUT_LEN];
 };
 
+const blake3_hash_t INVALID_HASH = {};
+
 class blake3_hasher final
 {
 		template<typename T, typename Dummy=void>
diff --git a/src/nbl/asset/IAssetManager.cpp b/src/nbl/asset/IAssetManager.cpp
@@ -364,12 +364,7 @@ void IAssetManager::insertBuiltinAssets()
         region.imageOffset = {0u, 0u, 0u};
         region.imageExtent = {2u, 2u, 1u};
         dummy2dImage->setBufferAndRegions(std::move(buf), regions);
-
-        {
-            auto* buffer = dummy2dImage->getBuffer();
-            buffer->setContentHash(buffer->computeContentHash());
-            dummy2dImage->setContentHash(dummy2dImage->computeContentHash());
-        }
+        dummy2dImage->setContentHash(dummy2dImage->computeContentHash());
     }
     
     //image views
diff --git a/src/nbl/asset/interchange/CGLILoader.cpp b/src/nbl/asset/interchange/CGLILoader.cpp
@@ -210,12 +210,8 @@ namespace nbl
 
 			image->setBufferAndRegions(std::move(texelBuffer), regions);
 
-			{
-				auto hash = contentHasher.finalizeSeq();
-				auto* buffer = image->getBuffer();
-				image->setContentHash(hash);
-				buffer->setContentHash(buffer->computeContentHash());
-			}
+			auto hash = contentHasher.finalizeSeq();
+			image->setContentHash(hash);
 
 			ICPUImageView::SCreationParams imageViewInfo = {};
 			imageViewInfo.image = std::move(image);
diff --git a/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp b/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp
@@ -652,12 +652,7 @@ CGraphicsPipelineLoaderMTL::image_views_set_t CGraphicsPipelineLoaderMTL::loadIm
         auto cubemap = ICPUImage::create(std::move(cubemapParams));
         auto regions = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<ICPUImage::SBufferCopy>>(regions_);
         cubemap->setBufferAndRegions(std::move(imgDataBuf), regions);
-
-        {
-            auto* buffer = cubemap->getBuffer();
-            buffer->setContentHash(buffer->computeContentHash());
-            cubemap->setContentHash(cubemap->computeContentHash());
-        }
+        cubemap->setContentHash(cubemap->computeContentHash());
 
         //new image goes to EMP_REFL_POSX index and other ones get nulled-out
         images[CMTLMetadata::CRenderpassIndependentPipeline::EMP_REFL_POSX] = std::move(cubemap);
diff --git a/src/nbl/asset/interchange/CImageLoaderJPG.cpp b/src/nbl/asset/interchange/CImageLoaderJPG.cpp
@@ -339,12 +339,8 @@ 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();
-		auto* buffer = image->getBuffer();
-		buffer->setContentHash(buffer->computeContentHash());
-		image->setContentHash(hash);
-	}
+	auto hash = contentHasher.finalizeSeq();
+	image->setContentHash(hash);
 
     return SAssetBundle(nullptr,{image});
 
diff --git a/src/nbl/asset/interchange/CImageLoaderOpenEXR.cpp b/src/nbl/asset/interchange/CImageLoaderOpenEXR.cpp
@@ -386,10 +386,7 @@ 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 });
diff --git a/src/nbl/asset/interchange/CImageLoaderPNG.cpp b/src/nbl/asset/interchange/CImageLoaderPNG.cpp
@@ -340,12 +340,8 @@ asset::SAssetBundle CImageLoaderPng::loadAsset(system::IFile* _file, const asset
 
 	image->setBufferAndRegions(std::move(texelBuffer), regions);
 	
-	{
-		auto hash = image->computeContentHash();
-		auto* const buffer = image->getBuffer();
-		buffer->setContentHash(buffer->computeContentHash());
-		image->setContentHash(hash);
-	}
+	auto hash = image->computeContentHash();
+	image->setContentHash(hash);
 
     return SAssetBundle(nullptr,{image});
 }
diff --git a/src/nbl/asset/interchange/CImageLoaderTGA.cpp b/src/nbl/asset/interchange/CImageLoaderTGA.cpp
@@ -321,12 +321,8 @@ asset::SAssetBundle CImageLoaderTGA::loadAsset(system::IFile* _file, const asset
 	if (!image)
 		return {};
 
-	{
-		auto hash = image->computeContentHash();
-		auto* const buffer = image->getBuffer();
-		buffer->setContentHash(buffer->getContentHash());
-		image->setContentHash(hash);
-	}
+	auto hash = image->computeContentHash();
+	image->setContentHash(hash);
 
     return SAssetBundle(nullptr,{std::move(image)});
 }
diff --git a/src/nbl/asset/utils/CDerivativeMapCreator.cpp b/src/nbl/asset/utils/CDerivativeMapCreator.cpp
@@ -121,12 +121,8 @@ core::smart_refctd_ptr<ICPUImage> CDerivativeMapCreator::createDerivativeMapFrom
 		if constexpr (!isotropicNormalization)
 			out_normalizationFactor[1] = state.normalization.maxAbsPerChannel[1];
 	}
-
-	{
-		auto* buffer = outImg->getBuffer();
-		buffer->setContentHash(buffer->computeContentHash());
-		outImg->setContentHash(outImg->computeContentHash());
-	}
+	
+	outImg->setContentHash(outImg->computeContentHash());
 
 	_NBL_ALIGNED_FREE(state.scratchMemory);
 
@@ -231,11 +227,7 @@ core::smart_refctd_ptr<ICPUImage> CDerivativeMapCreator::createDerivativeMapFrom
 		return nullptr;
 	}
 
-	{
-		auto* buffer = newDerivativeNormalMapImage->getBuffer();
-		buffer->setContentHash(buffer->computeContentHash());
-		newDerivativeNormalMapImage->setContentHash(newDerivativeNormalMapImage->computeContentHash());
-	}
+	newDerivativeNormalMapImage->setContentHash(newDerivativeNormalMapImage->computeContentHash());
 
 	return newDerivativeNormalMapImage;
 }
diff --git a/src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp b/src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp
@@ -358,11 +358,7 @@ static core::smart_refctd_ptr<asset::ICPUImage> createSingleChannelImage(const a
 		_NBL_DEBUG_BREAK_IF(true);
 	}
 
-	{
-		auto* buffer = outImage->getBuffer();
-		buffer->setContentHash({});
-		outImage->setContentHash({});
-	}
+	outImage->setContentHash(core::INVALID_HASH);
 
 	return outImg;
 }

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ class CFlattenRegionsImageFilter : public CImageFilter<CFlattenRegionsImageFilte`
`166`	`166`	`return false;`
`167`	`167`	`}`
`168`	`168`
`169`		`- outImg->getBuffer()->setContentHash({});`
`170`	`169`	`outImg->setContentHash(inImg->getContentHash());`
	`170`	`+`
`171`	`171`	`return true;`
`172`	`172`	`}`
`173`	`173`	`static inline bool execute(state_type* state)`
Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,7 @@ class CMipMapGenerationImageFilter : public CImageFilter<CMipMapGenerationImageF`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`	`98`
`99`		`- { // invalidate image and buffer hash`
`100`		`- state->inOutImage->setContentHash({});`
`101`		`- state->inOutImage->getBuffer()->setContentHash({});`
`102`		`- }`
	`99`	`+ state->inOutImage->setContentHash(core::INVALID_HASH);`
`103`	`100`
`104`	`101`	`return true;`
`105`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,10 +211,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`214`		`- { // invalidate image and buffer hash`
`215`		`- state->outImage->setContentHash({});`
`216`		`- state->outImage->getBuffer()->setContentHash({});`
`217`		`- }`
	`214`	`+ state->outImage->setContentHash(core::INVALID_HASH);`
`218`	`215`
`219`	`216`	`return true;`
`220`	`217`	`}`