Skip to content

Commit a0f395c

Browse files
committed
move INVALID_HASH to IPreHashed
1 parent a58f16e commit a0f395c

13 files changed

+15
-14
lines changed

include/nbl/asset/IPreHashed.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
namespace nbl::asset
1111
{
12+
13+
const core::blake3_hash_t INVALID_HASH = {};
14+
1215
//! Sometimes an asset is too complex or big to be hashed, so we need a hash to be set explicitly.
1316
//! Meant to be inherited from in conjunction with `IAsset`
1417
class IPreHashed : public IAsset

include/nbl/asset/filters/CBlitImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ class CBlitImageFilter :
448448
CBasicImageFilterCommon::executePerRegion(policy,outImg,scaleCoverage,outRegions, clip);
449449
};
450450

451-
outImg->setContentHash(core::INVALID_HASH);
451+
outImg->setContentHash(INVALID_HASH);
452452

453453
// process
454454
state->normalization.template initialize<double>();

include/nbl/asset/filters/CCopyImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class CCopyImageFilter : public CImageFilter<CCopyImageFilter>, public CMatchedS
7373
return true;
7474
};
7575

76-
state->outImage->setContentHash(core::INVALID_HASH);
76+
state->outImage->setContentHash(INVALID_HASH);
7777

7878
return commonExecute(state,perOutputRegion);
7979
}

include/nbl/asset/filters/CFillImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class CFillImageFilter : public CImageFilter<CFillImageFilter>
5454
auto regions = img->getRegions(state->subresource.mipLevel);
5555
CBasicImageFilterCommon::executePerRegion(std::forward<ExecutionPolicy>(policy),img,fill,regions,clip);
5656

57-
state->outImage->setContentHash(core::INVALID_HASH);
57+
state->outImage->setContentHash(INVALID_HASH);
5858

5959
return true;
6060
}

include/nbl/asset/filters/CMipMapGenerationImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class CMipMapGenerationImageFilter : public CImageFilter<CMipMapGenerationImageF
9696
return false;
9797
}
9898

99-
state->inOutImage->setContentHash(core::INVALID_HASH);
99+
state->inOutImage->setContentHash(INVALID_HASH);
100100

101101
return true;
102102
}

include/nbl/asset/filters/CPaddedCopyImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ
211211
}
212212
}
213213

214-
state->outImage->setContentHash(core::INVALID_HASH);
214+
state->outImage->setContentHash(INVALID_HASH);
215215

216216
return true;
217217
}

include/nbl/asset/filters/CRegionBlockFunctorFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class CRegionBlockFunctorFilter : public CImageFilter<CRegionBlockFunctorFilter<
6161

6262
if constexpr(!ConstImage)
6363
{
64-
state->image->setContentHash(core::INVALID_HASH);
64+
state->image->setContentHash(INVALID_HASH);
6565
}
6666

6767
return true;

include/nbl/asset/filters/CSummedAreaTableImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ class CSummedAreaTableImageFilter : public CMatchedSizeInOutImageFilterCommon, p
407407
++state->outBaseLayer;
408408
}
409409

410-
state->outImage->setContentHash(core::INVALID_HASH);
410+
state->outImage->setContentHash(INVALID_HASH);
411411

412412
resetState();
413413
return true;

include/nbl/asset/filters/CSwizzleAndConvertImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ class CSwizzleAndConvertImageFilter<inFormat,EF_UNKNOWN,Swizzle,Dither,Normaliza
374374
return true;
375375
};
376376

377-
state->outImage->setContentHash(core::INVALID_HASH);
377+
state->outImage->setContentHash(INVALID_HASH);
378378

379379
return CMatchedSizeInOutImageFilterCommon::commonExecute(state, perOutputRegion);
380380
}

include/nbl/asset/filters/dithering/CPrecomputedDither.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace nbl
5959

6060
const core::vector3du32_SIMD decodeBufferByteStrides = TexelBlockInfo(decodeFormat).convert3DTexelStridesTo1DByteStrides(core::vector3du32_SIMD(extent.x, extent.y, extent.z));
6161
auto decodeFlattenBuffer = core::make_smart_refctd_ptr<ICPUBuffer>(newDecodeBufferSize);
62-
decodeFlattenBuffer->setContentHash(core::INVALID_HASH);
62+
decodeFlattenBuffer->setContentHash(INVALID_HASH);
6363

6464
auto* inData = reinterpret_cast<uint8_t*>(flattenDitheringImage->getBuffer()->getPointer());
6565
auto* outData = reinterpret_cast<uint8_t*>(decodeFlattenBuffer->getPointer());

0 commit comments

Comments
 (0)