Rework pipeline shader spec info

include/nbl/asset/IAsset.h

@@ -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,27 +156,21 @@ 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;
-		}
+		virtual core::unordered_set<const IAsset*> computeDependants() const = 0;
+
+		virtual core::unordered_set<IAsset*> computeDependants() = 0;
+
+    virtual bool valid() const
+    {
+        //TODO(kevinyu): Temporary set this to true to make changes compile. Will revisit this later for each asset
+        return true;
+    }
 
     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;

include/nbl/asset/ICPUAccelerationStructure.h

@@ -136,7 +136,15 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
 		}
 
 		// 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::unordered_set<const IAsset*> computeDependants() const override
+		{
+			return {};
+		}
+
+		inline core::unordered_set<IAsset*> computeDependants() override
+		{
+			return {};
+		}
 
 		inline core::blake3_hash_t computeContentHash() const override
 		{
@@ -236,8 +244,6 @@ class ICPUBottomLevelAccelerationStructure final : public IPreHashed, public IBo
 	protected:
 		virtual ~ICPUBottomLevelAccelerationStructure() = default;
 
-		inline IAsset* getDependant_impl(const size_t ix) override {return nullptr;}
-
 		inline void discardContent_impl() override
 		{
 			m_triangleGeoms = nullptr;
@@ -263,8 +269,13 @@ class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelA
 		//
 		ICPUTopLevelAccelerationStructure() = default;
 
-		//
-		inline size_t getDependantCount() const override {return m_instances->size();}
+    inline core::unordered_set<const IAsset*> computeDependants() const override
+		{
+			core::unordered_set<const IAsset*> dependants;
+			for (const auto& instance : *m_instances)
+				dependants.insert(instance.getBase().blas.get());
+			return dependants;
+		}
 
 		//
 		inline auto& getBuildRangeInfo()
@@ -360,11 +371,6 @@ class ICPUTopLevelAccelerationStructure final : public IAsset, public ITopLevelA
 	protected:
 		virtual ~ICPUTopLevelAccelerationStructure() = default;
 
-		inline IAsset* getDependant_impl(const size_t ix) override
-		{
-			return m_instances->operator[](ix).getBase().blas.get();
-		}
-
 	private:
 		core::smart_refctd_dynamic_array<PolymorphicInstance> m_instances = nullptr;
 		hlsl::acceleration_structures::top_level::BuildRangeInfo m_buildRangeInfo;

include/nbl/asset/ICPUAnimationLibrary.h

@@ -96,22 +96,19 @@ class ICPUAnimationLibrary final : public IAnimationLibrary<ICPUBuffer>, public
 		constexpr static inline auto AssetType = ET_ANIMATION_LIBRARY;
 		inline E_TYPE getAssetType() const override { return AssetType; }
 
-		inline size_t getDependantCount() const override {return 3;}
-
-	protected:
-		inline IAsset* getDependant_impl(const size_t ix) override
+    inline core::unordered_set<const IAsset*> computeDependants() const override
 		{
-			switch (ix)
-			{
-				case 0:
-					return m_keyframeStorageBinding.buffer.get();
-				case 1:
-					return m_timestampStorageBinding.buffer.get();
-				default:
-					break;
-			}
-			return m_animationStorageRange.buffer.get();
+			return { m_keyframeStorageBinding.buffer.get(), m_timestampStorageBinding.buffer.get(), m_animationStorageRange.buffer.get() };
 		}
+
+  private:
+
+    template <typename Self>
+      requires(std::same_as<std::remove_cv_t<Self>, ICPUAnimationLibrary>)
+    static auto computeDependantsImpl(Self* self) {
+        using asset_ptr_t = std::conditional_t<std::is_const_v<Self>, const IAsset*, IAsset*>;
+        return core::unordered_set<asset_ptr_t>{ self->m_keyframeStorageBinding.buffer.get(), self->m_timestampStorageBinding.buffer.get(), self->m_animationStorageRange.buffer.get() };
+    }
 };
 
 }

include/nbl/asset/ICPUBuffer.h

@@ -75,7 +75,15 @@ 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::unordered_set<const IAsset*> computeDependants() const override
+        {
+            return {};
+        }
+
+        inline core::unordered_set<IAsset*> computeDependants() override
+        {
+            return {};
+        }
 
         inline core::blake3_hash_t computeContentHash() const override
         {
@@ -113,11 +121,6 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
         }
 
 protected:
-    inline IAsset* getDependant_impl(const size_t ix) override
-    {
-        return nullptr;
-    }
-
     inline void discardContent_impl() override
     {
         if (m_data)

include/nbl/asset/ICPUBufferView.h

@@ -28,7 +28,15 @@ 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;}
+    inline core::unordered_set<const IAsset*> computeDependants() const override
+		{
+			return computeDependantsImpl(this);
+		}
+
+    inline core::unordered_set<IAsset*> computeDependants() override
+		{
+			return computeDependantsImpl(this);
+		}
 
 		ICPUBuffer* getUnderlyingBuffer() 
 		{
@@ -51,10 +59,13 @@ class ICPUBufferView : public IBufferView<ICPUBuffer>, public IAsset
 	protected:
 		virtual ~ICPUBufferView() = default;
 
-		inline IAsset* getDependant_impl(const size_t ix) override
-		{
-			return m_buffer.get();
-		}
+  private:
+    template <typename Self>
+      requires(std::same_as<std::remove_cv_t<Self>, ICPUBufferView>)
+    static auto computeDependantsImpl(Self* self) {
+        using asset_ptr_t = std::conditional_t<std::is_const_v<Self>, const IAsset*, IAsset*>;
+        return core::unordered_set<asset_ptr_t>{ self->m_buffer.get() };
+    }
 };
 
 }

include/nbl/asset/ICPUComputePipeline.h

@@ -6,62 +6,77 @@
 
 
 #include "nbl/asset/ICPUPipeline.h"
+#include "nbl/asset/IComputePipeline.h"
 
 
 namespace nbl::asset
 {
 
 //! CPU Version of Compute Pipeline
-class ICPUComputePipeline : public ICPUPipeline<IPipeline<ICPUPipelineLayout>,1>
+class ICPUComputePipeline final : public ICPUPipeline<IComputePipeline<ICPUPipelineLayout>>
 {
-        using base_t = ICPUPipeline<IPipeline<ICPUPipelineLayout>,1>;
+        using base_t = ICPUPipeline<IComputePipeline<ICPUPipelineLayout>>;
 
     public:
-        struct SCreationParams final : IPipeline<ICPUPipelineLayout>::SCreationParams
-        {
-            SShaderSpecInfo shader;
-        };
-        static core::smart_refctd_ptr<ICPUComputePipeline> create(const SCreationParams& params)
+
+        static core::smart_refctd_ptr<ICPUComputePipeline> create(const ICPUPipelineLayout* layout)
         {
-            if (!params.layout)
-                return nullptr;
-            auto retval = new ICPUComputePipeline(core::smart_refctd_ptr<const ICPUPipelineLayout>(params.layout));
-            if (!retval->setSpecInfo(params.shader))
-            {
-                retval->drop();
-                return nullptr;
-            }
+            auto retval = new ICPUComputePipeline(layout);
             return core::smart_refctd_ptr<ICPUComputePipeline>(retval,core::dont_grab);
         }
 
         constexpr static inline auto AssetType = ET_COMPUTE_PIPELINE;
         inline E_TYPE getAssetType() const override { return AssetType; }
 
-		//!
-		inline size_t getDependantCount() const override {return 2;}
+        //!
+        inline core::unordered_set<const IAsset*> computeDependants() const override
+        {
+            return computeDependantsImpl(this);
+        }
+
+        inline core::unordered_set<IAsset*> computeDependants() override
+        {
+            return computeDependantsImpl(this);
+        }
 
-        // provide default arg
-        inline IPipelineBase::SShaderSpecInfo getSpecInfo() const {return base_t::getSpecInfo(hlsl::ShaderStage::ESS_COMPUTE);}
+        inline std::span<const SShaderSpecInfo> getSpecInfo(hlsl::ShaderStage stage) const override
+        {
+            if (stage==hlsl::ShaderStage::ESS_COMPUTE)
+                return {&m_specInfo,1};
+            return {};
+        }
+
+        inline bool valid() const override
+        {
+            if (!m_layout) return false;
+            if (!m_layout->valid()) return false;
+            return m_specInfo.valid();
+        }
 
     protected:
         using base_t::base_t;
         virtual ~ICPUComputePipeline() = default;
 
-        base_t* clone_impl(core::smart_refctd_ptr<const ICPUPipelineLayout>&& layout) const override 
-        {
-            return new ICPUComputePipeline(std::move(layout));
-        }
-
-		inline IAsset* getDependant_impl(const size_t ix) override
+
+    private:
+        SShaderSpecInfo m_specInfo;
+
+        inline core::smart_refctd_ptr<base_t> clone_impl(core::smart_refctd_ptr<const ICPUPipelineLayout>&& layout, uint32_t depth) const override final
         {
-            if (ix!=0)
-                return m_stages[0].shader.get();
-            return const_cast<ICPUPipelineLayout*>(m_layout.get());
+            auto newPipeline = new ICPUComputePipeline(layout.get());
+            newPipeline->m_specInfo = m_specInfo.clone(depth);
+            return core::smart_refctd_ptr<base_t>(newPipeline, core::dont_grab);
         }
 
-        inline int8_t stageToIndex(const hlsl::ShaderStage stage) const override
-        {
-            return stage!=hlsl::ShaderStage::ESS_COMPUTE ? (-1):0;
+        explicit ICPUComputePipeline(const ICPUPipelineLayout* layout):
+          base_t(layout, {})
+          {}
+
+        template <typename Self>
+          requires(std::same_as<std::remove_cv_t<Self>, ICPUComputePipeline>)
+        static auto computeDependantsImpl(Self* self) {
+            using asset_ptr_t = std::conditional_t<std::is_const_v<Self>, const IAsset*, IAsset*>;
+            return core::unordered_set<asset_ptr_t>{ self->m_layout.get(), self->m_specInfo.shader.get() };
         }
 };
 

include/nbl/asset/ICPUDescriptorSet.h

@@ -47,8 +47,6 @@ class NBL_API2 ICPUDescriptorSet final : public IDescriptorSet<ICPUDescriptorSet
 		constexpr static inline auto AssetType = ET_DESCRIPTOR_SET;
 		inline E_TYPE getAssetType() const override {return AssetType;}
 
-		inline size_t getDependantCount() const override {return m_layout->getTotalBindingCount()+1;}
-
 		//
 		inline ICPUDescriptorSetLayout* getLayout() 
 		{
@@ -79,10 +77,12 @@ class NBL_API2 ICPUDescriptorSet final : public IDescriptorSet<ICPUDescriptorSet
 
 		core::smart_refctd_ptr<IAsset> clone(uint32_t _depth = ~0u) const override;
 
+		core::unordered_set<const IAsset*> computeDependants() const override;
+		core::unordered_set<IAsset*> computeDependants() override;
+
 	protected:
 		virtual ~ICPUDescriptorSet() = default;
 
-		IAsset* getDependant_impl(size_t ix) override;
 
 	private:
 

include/nbl/asset/ICPUDescriptorSetLayout.h

@@ -57,15 +57,34 @@ class ICPUDescriptorSetLayout : public IDescriptorSetLayout<ICPUSampler>, public
         constexpr static inline auto AssetType = ET_DESCRIPTOR_SET_LAYOUT;
         inline E_TYPE getAssetType() const override { return AssetType; }
 
-		inline size_t getDependantCount() const override {return m_immutableSamplers ? m_immutableSamplers->size():0;}
+        core::unordered_set<const IAsset*> computeDependants() const override
+        {
+            return computeDependantsImpl(this);
+        }
+
+        core::unordered_set<IAsset*> computeDependants() override
+        {
+            return computeDependantsImpl(this);
+        }
 
 	protected:
 		virtual ~ICPUDescriptorSetLayout() = default;
 
-        inline IAsset* getDependant_impl(const size_t ix) override
-        {
-            return m_immutableSamplers->operator[](ix).get();
-        }
+
+  private:
+      template <typename Self>
+        requires(std::same_as<std::remove_cv_t<Self>, ICPUDescriptorSetLayout>)
+      static auto computeDependantsImpl(Self* self) {
+          using asset_ptr_t = std::conditional_t<std::is_const_v<Self>, const IAsset*, IAsset*>;
+          core::unordered_set<asset_ptr_t> dependants;
+          if (!self->m_immutableSamplers) return dependants;
+          for (const auto& sampler: *self->m_immutableSamplers)
+          {
+              dependants.insert(sampler.get());
+          }
+          return dependants;
+      }
+
 };
 
 }