Merge branch 'asset-conversion-v3' into tad_flatten_updates

Author: tad1

examples_tests

@@ -62,7 +62,7 @@ class ICPUBuffer : public asset::IBuffer, public IPreHashed
 			return static_cast<core::blake3_hash_t>(hasher);
         }
 
-        inline bool missingContent() const {return !data;}
+        inline bool missingContent() const override {return !data;}
 
         //! Returns pointer to data.
         const void* getPointer() const {return data;}

include/nbl/asset/ICPUBuffer.h

@@ -46,7 +46,7 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
 
 		inline size_t getDependantCount() const override
 		{
-			auto stageCount = 1; // the layout
+			auto stageCount = 2; // the layout and renderpass
 			for (const auto& stage : m_stages)
 			if (stage.shader)
 				stageCount++;
@@ -79,12 +79,16 @@ class ICPUGraphicsPipeline final : public ICPUPipeline<IGraphicsPipeline<ICPUPip
 		}
 		inline IAsset* getDependant_impl(const size_t ix) override
 		{
+			if (ix==0)
+				return m_layout.get();
+			if (ix==1)
+				return m_renderpass.get();
 			size_t stageCount = 0;
 			for (auto& stage : m_stages)
 			if (stage.shader)
-			if ((stageCount++)==ix)
+			if ((stageCount++)==ix-2)
 				return stage.shader.get();
-			return m_layout.get();
+			return nullptr;
 		}
 
 		inline int8_t stageToIndex(const ICPUShader::E_SHADER_STAGE stage) const override

include/nbl/asset/ICPUGraphicsPipeline.h

@@ -44,14 +44,15 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
 		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;}
+		// Do not report buffer as dependant, as we will simply drop it instead of discarding its contents!
+		inline size_t getDependantCount() const override {return 0;}
 
 		core::blake3_hash_t computeContentHash() const override;
 
+		// Having regions specififed to upload is optional! So to have content missing we must have regions but no buffer content
 		inline bool missingContent() const override
 		{
-			return !regions || regions->empty() || !buffer;
+			return regions && !regions->empty() && (!buffer || buffer->missingContent());
 		}
 
 		virtual bool validateCopies(const SImageCopy* pRegionsBegin, const SImageCopy* pRegionsEnd, const ICPUImage* src) const
@@ -205,7 +206,6 @@ class NBL_API2 ICPUImage final : public IImage, public IPreHashed
 		inline void discardContent_impl() override
 		{
 			buffer = nullptr;
-			regions = nullptr;
 		}
 
 		// TODO: maybe we shouldn't make a single buffer back all regions?

include/nbl/asset/ICPUImage.h

@@ -66,12 +66,8 @@ struct SPrimitiveAssemblyParams
 static_assert(sizeof(SPrimitiveAssemblyParams)==2u, "Unexpected size!");
 
 
-template<typename PipelineLayoutType, typename ShaderType, typename RenderpassType>
-class IGraphicsPipeline : public IPipeline<PipelineLayoutType>
+class IGraphicsPipelineBase : public virtual core::IReferenceCounted
 {
-    protected:
-        using renderpass_t = RenderpassType;
-
     public:
         constexpr static inline uint8_t GRAPHICS_SHADER_STAGE_COUNT = 5u;
 
@@ -83,6 +79,15 @@ class IGraphicsPipeline : public IPipeline<PipelineLayoutType>
             SBlendParams blend = {};
             uint32_t subpassIx = 0u;
         };
+};
+
+template<typename PipelineLayoutType, typename ShaderType, typename RenderpassType>
+class IGraphicsPipeline : public IPipeline<PipelineLayoutType>, public IGraphicsPipelineBase
+{
+    protected:
+        using renderpass_t = RenderpassType;
+
+    public:
         struct SCreationParams : IPipeline<PipelineLayoutType>::SCreationParams
         {
             protected:

include/nbl/asset/IGraphicsPipeline.h

@@ -30,6 +30,7 @@ class IPreHashed : public IAsset
 		// One can free up RAM by discarding content, but keep the pointers and content hash around.
 		// This is a good alternative to simply ejecting assets from the <path,asset> cache as it prevents repeated loads.
 		// And you can still hash the asset DAG and find your already converted GPU objects.
+		// NOTE: `missingContent` is only about this DAG node!
 		virtual bool missingContent() const = 0;
 		inline void discardContent()
 		{

include/nbl/asset/IPreHashed.h

@@ -10,7 +10,9 @@
 #include "nbl/asset/IRenderpass.h"
 
 
-namespace nbl::asset
+namespace nbl
+{
+namespace asset
 {
 
 struct SViewport
@@ -293,4 +295,21 @@ struct SBlendParams
 };
 
 }
+
+
+// hasher specs
+namespace core
+{
+
+template<typename Dummy>
+struct blake3_hasher::update_impl<asset::SStencilOpParams,Dummy>
+{
+	static inline void __call(blake3_hasher& hasher, const asset::SStencilOpParams& input)
+	{
+		hasher.update(&input,sizeof(input));
+	}
+};
+
+}
+}
 #endif

include/nbl/asset/RasterizationStates.h

@@ -60,6 +60,8 @@ class ISemaphore : public IBackendObject
                     return true;
                 }
 
+                inline operator SWaitInfo() const {return {m_semaphore.get(),m_waitValue};}
+
                 NBL_API2 WAIT_RESULT wait() const;
 
             protected:

include/nbl/video/ISemaphore.h

@@ -196,7 +196,7 @@ bool CImageWriterOpenEXR::writeAsset(system::IFile* _file, const SAssetWritePara
 
 	auto imageSmart = asset::IImageAssetHandlerBase::createImageDataForCommonWriting(IAsset::castDown<const ICPUImageView>(_params.rootAsset), _params.logger);
 	const asset::ICPUImage* image = imageSmart.get();
-	if (IPreHashed::anyDependantDiscardedContents(image))
+	if (image->missingContent())
 		return false;
 
 	system::IFile* file = _override->getOutputFile(_file, ctx, { image, 0u });