Pull from 'asset-conversion-v3'

Author: tad1

include/nbl/asset/ICPUImage.h

@@ -14,7 +14,7 @@
 namespace nbl::asset
 {
 
-class NBL_API2 ICPUImage final : public IImage, public IPreHashed
+class ICPUImage final : public IImage, public IPreHashed
 {
 	public:
 		inline static core::smart_refctd_ptr<ICPUImage> create(const SCreationParams& _params)
@@ -38,16 +38,44 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
             return cp;
         }
 
-		// The buffer used to back the ranges used in the regions are is not a real dependent
-		constexpr static inline bool HasDependents = false;
-
 		constexpr static inline auto AssetType = ET_IMAGE;
 		inline IAsset::E_TYPE getAssetType() const override { return AssetType; }
 
 		// Having regions specififed to upload is optional!
 		inline size_t getDependantCount() const override {return !missingContent()&&buffer ? 1:0;}
 
-		core::blake3_hash_t computeContentHash() const override;
+		//!
+		inline core::blake3_hash_t computeContentHash() const override
+		{
+			// TODO: Arek turn this into an image filter maybe?
+			core::blake3_hasher hasher;
+			for (auto m=0; m<m_creationParams.mipLevels; m++)
+			{
+				const auto blockInfo = getTexelBlockInfo();
+				const auto mipExtentInBlocks = blockInfo.convertTexelsToBlocks(getMipSize(m));
+				core::blake3_hasher levelHasher;
+				if (missingContent())
+				{
+					const auto zeroLength = blockInfo.getBlockByteSize()*mipExtentInBlocks[0];
+					auto zeroArray = std::make_unique<uint8_t[]>(zeroLength);
+					for (auto l=0; l<m_creationParams.arrayLayers; l++)
+					{
+						// layers could be run in parallel
+						core::blake3_hasher layerHasher;
+						for (auto z=0; z<mipExtentInBlocks[2]; z++)
+						for (auto y=0; y<mipExtentInBlocks[1]; y++)
+							layerHasher.update(zeroArray.get(),zeroLength);
+						levelHasher << static_cast<core::blake3_hash_t>(layerHasher);
+					}
+				}
+				else
+				{
+					_NBL_TODO(); // TODO: Arek
+				}
+				levelHasher << static_cast<core::blake3_hash_t>(levelHasher);
+			}
+			return static_cast<core::blake3_hash_t>(hasher);
+		}
 
 		inline bool missingContent() const override
 		{
@@ -67,14 +95,14 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
 		}
 		inline const auto* getBuffer() const { return buffer.get(); }
 
-		inline std::span<const IImage::SBufferCopy> getRegions() const
+		inline core::SRange<const IImage::SBufferCopy> getRegions() const
 		{
 			if (regions)
 				return {regions->begin(),regions->end()};
-			return {};
+			return {nullptr,nullptr};
 		}
 
-		inline std::span<const IImage::SBufferCopy> getRegions(uint32_t mipLevel) const
+		inline core::SRange<const IImage::SBufferCopy> getRegions(uint32_t mipLevel) const
 		{
 			const IImage::SBufferCopy dummy = { 0ull,0u,0u,{static_cast<E_ASPECT_FLAGS>(0u),mipLevel,0u,0u},{},{} };
 			auto begin = std::lower_bound(regions->begin(),regions->end(),dummy,mip_order_t());

include/nbl/asset/IDescriptorSetLayout.h

@@ -467,6 +467,7 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
 				if ((b.type == IDescriptor::E_TYPE::ET_SAMPLER or b.type == IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and b.immutableSamplers)
 				{
 					const auto localOffset = m_immutableSamplerRedirect.getStorageOffset(typename CBindingRedirect::binding_number_t(b.binding)).data;
+					assert(bool(localOffset));
 
 					auto* dst = m_immutableSamplers->begin() + localOffset;
 					std::copy_n(b.immutableSamplers, b.count, dst);