pull Matt and resolve conflicts

Author: AnastaZIuk

examples_tests

@@ -257,6 +257,9 @@ inline core::bitflag<ACCESS_FLAGS> allAccessesFromStages(core::bitflag<PIPELINE_
     };
     constexpr PerStageAccesses bitToAccess = {};
 
+    // TODO: add logically later or previous stages to make sure all other accesses remain valid
+    // or ideally expand the stages before calling `allAccessesFromStages` (TODO: add a `allLaterStages` and `allPreviouStages` basically)
+
     core::bitflag<ACCESS_FLAGS> retval = ACCESS_FLAGS::NONE;
     while (bool(stages.value))
     {

include/nbl/asset/ECommonEnums.h

@@ -82,8 +82,8 @@ class IAsset : virtual public core::IReferenceCounted
 			ET_SKELETON = 1ull<<7,							    //!< asset::ICPUSkeleton
 			ET_ANIMATION_LIBRARY = 1ull<<8,						//!< asset::ICPUAnimationLibrary
 			ET_PIPELINE_LAYOUT = 1ull<<9,						//!< asset::ICPUPipelineLayout
-			ET_SHADER = 1ull<<10,								//!< asset::ICPUShader
-			ET_GEOMETRY = 1ull<<12,		//!< anything inheriting from asset::IGeometry<ICPUBuffer>
+			ET_SHADER = 1ull<<10,								//!< asset::IShader
+			ET_GEOMETRY = 1ull<<12,								//!< anything inheriting from asset::IGeometry<ICPUBuffer>
 			ET_RENDERPASS = 1ull<<13,							//!< asset::ICPURenderpass
 			ET_FRAMEBUFFER = 1ull<<14,							//!< asset::ICPUFramebuffer
 			ET_GRAPHICS_PIPELINE = 1ull<<15,					//!< asset::ICPUGraphicsPipeline
@@ -94,6 +94,7 @@ class IAsset : virtual public core::IReferenceCounted
 			ET_COMPUTE_PIPELINE = 1ull<<20,                     //!< asset::ICPUComputePipeline
 			ET_PIPELINE_CACHE = 1ull<<21,						//!< asset::ICPUPipelineCache
 			ET_SCENE = 1ull<<22,								//!< reserved, to implement later
+			ET_RAYTRACING_PIPELINE = 1ull << 23, //!< asset::ICPURayTracingPipeline
 			ET_IMPLEMENTATION_SPECIFIC_METADATA = 1ull<<31u,    //!< lights, etc.
 			//! Reserved special value used for things like terminating lists of this enum
 
@@ -155,30 +156,37 @@ class IAsset : virtual public core::IReferenceCounted
 		//!
 		inline bool isMutable() const {return m_mutable;}
 
-		//!
-		virtual size_t getDependantCount() const = 0;
-		inline IAsset* getDependant(const size_t ix)
-		{
-			if (ix<getDependantCount())
-				return getDependant_impl(ix);
-			return nullptr;
-		}
-		inline const IAsset* getDependant(const size_t ix) const
-		{
-			IAsset* const retval = const_cast<IAsset*>(this)->getDependant(ix);
-			return retval;
-		}
+    inline void visitDependents(std::function<bool(const IAsset*)> visit) const
+    {
+        visitDependents_impl([&visit](const IAsset* dep)->bool
+        {
+            if (dep)
+                return visit(dep);
+            return true;
+        });
+    }
+
+    inline void visitDependents(std::function<bool(IAsset*)> visit)
+    {
+        assert(isMutable());
+        visitDependents([&](const IAsset* dependent) -> bool
+        {
+            return visit(const_cast<IAsset*>(dependent));
+        });
+    }
+
+		virtual bool valid() const = 0;
 
     protected:
 		inline IAsset() = default;
 		//! Pure virtual destructor to ensure no instantiation
 		NBL_API2 virtual ~IAsset() = 0;
 
-		virtual IAsset* getDependant_impl(const size_t ix) = 0;
-
 	private:
 		friend IAssetManager;
 		bool m_mutable = true;
+
+		virtual void visitDependents_impl(std::function<bool(const IAsset*)> visit) const = 0;
 };
 
 template<typename T>

include/nbl/asset/IAsset.h

@@ -136,7 +136,6 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
 
 		inline system::ISystem* getSystem() const { return m_system.get(); }
 
-        const CGeometryCreator* getGeometryCreator() const;
         CPolygonGeometryManipulator* getPolygonGeometryManipulator();
         CCompilerSet* getCompilerSet() const { return m_compilerSet.get(); }
 

include/nbl/asset/IAssetManager.h

@@ -100,6 +100,9 @@ struct SBufferRange
 	inline operator SBufferRange<const BufferType>&() {return *reinterpret_cast<SBufferRange<const BufferType>*>(this);}
 	inline operator const SBufferRange<const BufferType>&() const {return *reinterpret_cast<const SBufferRange<const BufferType>*>(this);}
 
+	template<typename BT> requires std::is_same_v<std::remove_const_t<BT>,BufferType>
+	inline operator SBufferBinding<BT>() const { return {.offset=offset,.buffer=buffer}; }
+
 	explicit inline operator bool() const {return isValid();}
 
 	inline bool isValid() const

include/nbl/asset/IBuffer.h

@@ -135,8 +135,6 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
 			return cp;
 		}
 
-		// Do not report anything as a dependant, we'll simply drop the data instead of discarding its contents
-		inline size_t getDependantCount() const override {return 0;}
 
 		inline core::blake3_hash_t computeContentHash() const override
 		{
@@ -233,11 +231,36 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
 			return !m_geometryPrimitiveCount || !m_triangleGeoms && !m_AABBGeoms;
 		}
 
+		inline bool valid() const override
+		{
+			if (!validBuildFlags(m_buildFlags)) return false;
+
+			size_t geometryCount = 0;
+			if (m_buildFlags.hasFlags(BUILD_FLAGS::GEOMETRY_TYPE_IS_AABB_BIT))
+			{
+				if (!m_AABBGeoms || m_triangleGeoms) return false;
+				geometryCount = m_AABBGeoms->size();
+			}
+			else
+			{
+				if (!m_triangleGeoms || m_AABBGeoms) return false;
+				geometryCount = m_triangleGeoms->size();
+			}
+
+      // https://registry.khronos.org/vulkan/specs/latest/man/html/vkGetAccelerationStructureBuildSizesKHR.html#VUID-vkGetAccelerationStructureBuildSizesKHR-pBuildInfo-03619
+			if (geometryCount == 0) {
+				if (m_geometryPrimitiveCount && m_geometryPrimitiveCount->size() > 0) return false;
+			}
+		  else
+			{
+				if (!m_geometryPrimitiveCount || m_geometryPrimitiveCount->size() != geometryCount) return false;
+			}
+			return true;
+		}
+
 	protected:
 		virtual ~ICPUBottomLevelAccelerationStructure() = default;
 
-		inline IAsset* getDependant_impl(const size_t ix) override {return nullptr;}
-
 		inline void discardContent_impl() override
 		{
 			m_triangleGeoms = nullptr;
@@ -251,6 +274,8 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
 		core::smart_refctd_dynamic_array<AABBs<ICPUBuffer>> m_AABBGeoms = nullptr;
 		core::smart_refctd_dynamic_array<uint32_t> m_geometryPrimitiveCount = nullptr;
 		core::bitflag<BUILD_FLAGS> m_buildFlags = BUILD_FLAGS::PREFER_FAST_TRACE_BIT;
+
+    inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override {}
 };
 
 class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelAccelerationStructure
@@ -263,9 +288,6 @@ class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelA
 		//
 		ICPUTopLevelAccelerationStructure() = default;
 
-		//
-		inline size_t getDependantCount() const override {return m_instances->size();}
-
 		//
 		inline auto& getBuildRangeInfo()
 		{
@@ -357,18 +379,32 @@ class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelA
 			return cp;
 		}
 
-	protected:
-		virtual ~ICPUTopLevelAccelerationStructure() = default;
-
-		inline IAsset* getDependant_impl(const size_t ix) override
+		inline bool valid() const override
 		{
-			return m_instances->operator[](ix).getBase().blas.get();
+			if (!validBuildFlags(m_buildFlags)) return false;
+			if (!m_instances) return false;
+			for (const auto& instance : *m_instances)
+				if (!instance.getBase().blas->valid()) return false;
+			if (m_buildRangeInfo.instanceCount != m_instances->size()) return false;
+			// https://registry.khronos.org/vulkan/specs/latest/man/html/VkAccelerationStructureBuildRangeInfoKHR.html#VUID-VkAccelerationStructureBuildRangeInfoKHR-primitiveOffset-03660
+			if (m_buildRangeInfo.instanceByteOffset % 16 != 0) return false;
+			return true;
 		}
 
+	protected:
+		virtual ~ICPUTopLevelAccelerationStructure() = default;
+
 	private:
 		core::smart_refctd_dynamic_array<PolymorphicInstance> m_instances = nullptr;
 		hlsl::acceleration_structures::top_level::BuildRangeInfo m_buildRangeInfo;
 		core::bitflag<BUILD_FLAGS> m_buildFlags = BUILD_FLAGS::PREFER_FAST_BUILD_BIT;
+
+    inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
+    {
+      if (!m_instances) return;
+      for (const auto& instance : *m_instances)
+        if (!visit(instance.getBase().blas.get())) return;
+    }
 };
 
 }

include/nbl/asset/ICPUAccelerationStructure.h

@@ -95,23 +95,16 @@ class ICPUAnimationLibrary final : public IAnimationLibrary<ICPUBuffer>, public
 
 		constexpr static inline auto AssetType = ET_ANIMATION_LIBRARY;
 		inline E_TYPE getAssetType() const override { return AssetType; }
+		inline bool valid() const override { return true; }
 
-		inline size_t getDependantCount() const override {return 3;}
+  private:
 
-	protected:
-		inline IAsset* getDependant_impl(const size_t ix) override
-		{
-			switch (ix)
-			{
-				case 0:
-					return m_keyframeStorageBinding.buffer.get();
-				case 1:
-					return m_timestampStorageBinding.buffer.get();
-				default:
-					break;
-			}
-			return m_animationStorageRange.buffer.get();
-		}
+		inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
+    {
+        if (!visit(m_keyframeStorageBinding.buffer.get())) return;
+        if (!visit(m_timestampStorageBinding.buffer.get())) return;
+        if (!visit(m_animationStorageRange.buffer.get())) return;
+    }
 };
 
 }

include/nbl/asset/ICPUAnimationLibrary.h

@@ -25,6 +25,7 @@ namespace nbl::asset
 class ICPUBuffer final : public asset::IBuffer, public IPreHashed
 {
     public:
+        // TODO: template to make `data` a `const void*` vs `void*`
         struct SCreationParams : asset::IBuffer::SCreationParams
         {
             void* data = nullptr;
@@ -75,8 +76,6 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
         constexpr static inline auto AssetType = ET_BUFFER;
         inline IAsset::E_TYPE getAssetType() const override final { return AssetType; }
 
-        inline size_t getDependantCount() const override { return 0; }
-
         inline core::blake3_hash_t computeContentHash() const override
         {
             core::blake3_hasher hasher;
@@ -112,12 +111,15 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
             return true;
         }
 
-protected:
-    inline IAsset* getDependant_impl(const size_t ix) override
-    {
-        return nullptr;
-    }
+        inline bool valid() const override
+        {
+            if (!m_data) return false;
+            if (!m_mem_resource) return false;
+            // check if alignment is power of two
+            return (m_alignment > 0 && !(m_alignment & (m_alignment - 1)));
+        }
 
+protected:
     inline void discardContent_impl() override
     {
         if (m_data)
@@ -136,6 +138,8 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
         discardContent_impl();
     }
 
+    inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override {}
+
     void* m_data;
     core::smart_refctd_ptr<core::refctd_memory_resource> m_mem_resource;
     size_t m_alignment;

include/nbl/asset/ICPUBuffer.h

@@ -28,8 +28,6 @@ class ICPUBufferView : public IBufferView<ICPUBuffer>, public IAsset
 		constexpr static inline auto AssetType = ET_BUFFER_VIEW;
 		inline IAsset::E_TYPE getAssetType() const override { return AssetType; }
 
-		inline size_t getDependantCount() const override {return 1;}
-
 		ICPUBuffer* getUnderlyingBuffer() 
 		{
 			assert(isMutable());
@@ -48,12 +46,24 @@ class ICPUBufferView : public IBufferView<ICPUBuffer>, public IAsset
 			m_size = _size;
 		}
 
+    inline bool valid() const override
+    {
+        if (!m_buffer->valid()) return false;
+        if (m_offset >= m_buffer->getSize()) return false;
+        if (m_size <= 0) return false;
+        if (m_offset >= m_buffer->getSize()) return false;
+        if (m_size > m_buffer->getSize() - m_offset) return false;
+				return true;
+    }
+
 	protected:
 		virtual ~ICPUBufferView() = default;
 
-		inline IAsset* getDependant_impl(const size_t ix) override
+  private:
+
+		inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
 		{
-			return m_buffer.get();
+        if (!visit(m_buffer.get())) return;
 		}
 };