move INVALID_HASH to IPreHashed, use constexpr

tad1 · tad1 · commit 0a17420df44b · 2024-09-24T18:44:01.000+02:00
diff --git a/include/nbl/asset/IPreHashed.h b/include/nbl/asset/IPreHashed.h
@@ -10,13 +10,14 @@
 namespace nbl::asset
 {
 
-const core::blake3_hash_t INVALID_HASH = {};
 
 //! Sometimes an asset is too complex or big to be hashed, so we need a hash to be set explicitly.
 //! Meant to be inherited from in conjunction with `IAsset`
 class IPreHashed : public IAsset
 {
 	public:
+		constexpr static inline core::blake3_hash_t INVALID_HASH = {};
+
 		//
 		inline const core::blake3_hash_t& getContentHash() const {return m_contentHash;}
 		//
diff --git a/include/nbl/asset/filters/CBlitImageFilter.h b/include/nbl/asset/filters/CBlitImageFilter.h
@@ -448,7 +448,7 @@ class CBlitImageFilter :
 				CBasicImageFilterCommon::executePerRegion(policy,outImg,scaleCoverage,outRegions, clip);
 			};
 			
-			outImg->setContentHash(INVALID_HASH);
+			outImg->setContentHash(IPreHashed::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,7 +73,7 @@ class CCopyImageFilter : public CImageFilter<CCopyImageFilter>, public CMatchedS
 				return true;
 			};
 
-			state->outImage->setContentHash(INVALID_HASH);
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
 
 			return commonExecute(state,perOutputRegion);
 		}
diff --git a/include/nbl/asset/filters/CFillImageFilter.h b/include/nbl/asset/filters/CFillImageFilter.h
@@ -54,7 +54,7 @@ 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(INVALID_HASH);
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
 
 			return true;
 		}
diff --git a/include/nbl/asset/filters/CMipMapGenerationImageFilter.h b/include/nbl/asset/filters/CMipMapGenerationImageFilter.h
@@ -96,7 +96,7 @@ class CMipMapGenerationImageFilter : public CImageFilter<CMipMapGenerationImageF
 					return false;
 			}
 
-			state->inOutImage->setContentHash(INVALID_HASH);
+			state->inOutImage->setContentHash(IPreHashed::INVALID_HASH);
 
 			return true;
 		}
diff --git a/include/nbl/asset/filters/CPaddedCopyImageFilter.h b/include/nbl/asset/filters/CPaddedCopyImageFilter.h
@@ -211,7 +211,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ
 				}
 			}
 
-			state->outImage->setContentHash(INVALID_HASH);
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
 
 			return true;
 		}
diff --git a/include/nbl/asset/filters/CRegionBlockFunctorFilter.h b/include/nbl/asset/filters/CRegionBlockFunctorFilter.h
@@ -61,7 +61,7 @@ class CRegionBlockFunctorFilter : public CImageFilter<CRegionBlockFunctorFilter<
 
 			if constexpr(!ConstImage)
 			{
-				state->image->setContentHash(INVALID_HASH);
+				state->image->setContentHash(IPreHashed::INVALID_HASH);
 			}
 
 			return true;
diff --git a/include/nbl/asset/filters/CSummedAreaTableImageFilter.h b/include/nbl/asset/filters/CSummedAreaTableImageFilter.h
@@ -407,7 +407,7 @@ class CSummedAreaTableImageFilter : public CMatchedSizeInOutImageFilterCommon, p
 				++state->outBaseLayer;
 			}
 
-			state->outImage->setContentHash(INVALID_HASH);
+			state->outImage->setContentHash(IPreHashed::INVALID_HASH);
 
 			resetState();
 			return true;
diff --git a/include/nbl/asset/filters/CSwizzleAndConvertImageFilter.h b/include/nbl/asset/filters/CSwizzleAndConvertImageFilter.h
@@ -374,7 +374,7 @@ class CSwizzleAndConvertImageFilter<inFormat,EF_UNKNOWN,Swizzle,Dither,Normaliza
 				return true;
 			};
 
-			state->outImage->setContentHash(INVALID_HASH);
+			state->outImage->setContentHash(IPreHashed::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(INVALID_HASH);
+							decodeFlattenBuffer->setContentHash(IPreHashed::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
@@ -113,7 +113,7 @@ class IImageAssetHandlerBase : public virtual core::IReferenceCounted
 				auto texelBuffer = core::make_smart_refctd_ptr<ICPUBuffer>(bufferSize);
 				
 				newImage->setBufferAndRegions(std::move(texelBuffer), newRegions);
-				newImage->setContentHash(INVALID_HASH);
+				newImage->setContentHash(IPreHashed::INVALID_HASH);
 			}
 
 			using COPY_FILTER = asset::CCopyImageFilter;
@@ -191,7 +191,7 @@ class IImageAssetHandlerBase : public virtual core::IReferenceCounted
 			auto stride = trueExtent.X * getTexelOrBlockBytesize(format);
 
 			performImageFlip(entry, end, trueExtent.Y, stride);
-			image->setContentHash(INVALID_HASH);
+			image->setContentHash(IPreHashed::INVALID_HASH);
 		}
 
 		static inline void performImageFlip(uint8_t* entry, uint8_t* end, uint32_t height, uint32_t rowPitch)
diff --git a/src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp b/src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp
@@ -358,7 +358,7 @@ static core::smart_refctd_ptr<asset::ICPUImage> createSingleChannelImage(const a
 		_NBL_DEBUG_BREAK_IF(true);
 	}
 
-	outImage->setContentHash(INVALID_HASH);
+	outImage->setContentHash(IPreHashed::INVALID_HASH);
 
 	return outImg;
 }

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,14 @@`
`10`	`10`	`namespace nbl::asset`
`11`	`11`	`{`
`12`	`12`
`13`		`-const core::blake3_hash_t INVALID_HASH = {};`
`14`	`13`
`15`	`14`	`//! Sometimes an asset is too complex or big to be hashed, so we need a hash to be set explicitly.`
`16`	`15`	//! Meant to be inherited from in conjunction with `IAsset`
`17`	`16`	`class IPreHashed : public IAsset`
`18`	`17`	`{`
`19`	`18`	`public:`
	`19`	`+ constexpr static inline core::blake3_hash_t INVALID_HASH = {};`
	`20`	`+`
`20`	`21`	`//`
`21`	`22`	`inline const core::blake3_hash_t& getContentHash() const {return m_contentHash;}`
`22`	`23`	`//`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class CCopyImageFilter : public CImageFilter<CCopyImageFilter>, public CMatchedS`
`73`	`73`	`return true;`
`74`	`74`	`};`
`75`	`75`
`76`		`- state->outImage->setContentHash(INVALID_HASH);`
	`76`	`+ state->outImage->setContentHash(IPreHashed::INVALID_HASH);`
`77`	`77`
`78`	`78`	`return commonExecute(state,perOutputRegion);`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class CFillImageFilter : public CImageFilter<CFillImageFilter>`
`54`	`54`	`auto regions = img->getRegions(state->subresource.mipLevel);`
`55`	`55`	`CBasicImageFilterCommon::executePerRegion(std::forward<ExecutionPolicy>(policy),img,fill,regions,clip);`
`56`	`56`
`57`		`- state->outImage->setContentHash(INVALID_HASH);`
	`57`	`+ state->outImage->setContentHash(IPreHashed::INVALID_HASH);`
`58`	`58`
`59`	`59`	`return true;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class CMipMapGenerationImageFilter : public CImageFilter<CMipMapGenerationImageF`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`	`98`
`99`		`- state->inOutImage->setContentHash(INVALID_HASH);`
	`99`	`+ state->inOutImage->setContentHash(IPreHashed::INVALID_HASH);`
`100`	`100`
`101`	`101`	`return true;`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`214`		`- state->outImage->setContentHash(INVALID_HASH);`
	`214`	`+ state->outImage->setContentHash(IPreHashed::INVALID_HASH);`
`215`	`215`
`216`	`216`	`return true;`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class CRegionBlockFunctorFilter : public CImageFilter<CRegionBlockFunctorFilter<`
`61`	`61`
`62`	`62`	`if constexpr(!ConstImage)`
`63`	`63`	`{`
`64`		`- state->image->setContentHash(INVALID_HASH);`
	`64`	`+ state->image->setContentHash(IPreHashed::INVALID_HASH);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ class CSummedAreaTableImageFilter : public CMatchedSizeInOutImageFilterCommon, p`
`407`	`407`	`++state->outBaseLayer;`
`408`	`408`	`}`
`409`	`409`
`410`		`- state->outImage->setContentHash(INVALID_HASH);`
	`410`	`+ state->outImage->setContentHash(IPreHashed::INVALID_HASH);`
`411`	`411`
`412`	`412`	`resetState();`
`413`	`413`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ class CSwizzleAndConvertImageFilter<inFormat,EF_UNKNOWN,Swizzle,Dither,Normaliza`
`374`	`374`	`return true;`
`375`	`375`	`};`
`376`	`376`
`377`		`- state->outImage->setContentHash(INVALID_HASH);`
	`377`	`+ state->outImage->setContentHash(IPreHashed::INVALID_HASH);`
`378`	`378`
`379`	`379`	`return CMatchedSizeInOutImageFilterCommon::commonExecute(state, perOutputRegion);`
`380`	`380`	`}`