Merge branch 'master' into nsc_macro_def_fix

Author: AnastaZIuk

examples_tests

@@ -194,4 +194,72 @@ concept Asset = std::is_base_of_v<IAsset,T>;
 
 }
 
+namespace nbl::system::impl
+{
+template<>
+struct to_string_helper<asset::IAsset::E_TYPE>
+{
+	private:
+		using enum_t = asset::IAsset::E_TYPE;
+
+	public:
+		static inline std::string __call(const enum_t value)
+		{
+			switch (value)
+			{
+				case enum_t::ET_BUFFER:
+					return "ICPUBuffer";
+				case enum_t::ET_BUFFER_VIEW:
+					return "ICPUBufferView";
+				case enum_t::ET_SAMPLER:
+					return "ICPUSampler";
+				case enum_t::ET_IMAGE:
+					return "ICPUImage";
+				case enum_t::ET_IMAGE_VIEW:
+					return "ICPUImageView";
+				case enum_t::ET_DESCRIPTOR_SET:
+					return "ICPUDescriptorSet";
+				case enum_t::ET_DESCRIPTOR_SET_LAYOUT:
+					return "ICPUDescriptorSetLayout";
+				case enum_t::ET_SKELETON:
+					return "ICPUSkeleton";
+				case enum_t::ET_ANIMATION_LIBRARY:
+					return "ICPUAnimationLibrary";
+				case enum_t::ET_PIPELINE_LAYOUT:
+					return "ICPUPipelineLayout";
+				case enum_t::ET_SHADER:
+					return "IShader";
+				case enum_t::ET_GEOMETRY:
+					return "IGeometry<ICPUBuffer>";
+				case enum_t::ET_RENDERPASS:
+					return "ICPURenderpass";
+				case enum_t::ET_FRAMEBUFFER:
+					return "ICPUFramebuffer";
+				case enum_t::ET_GRAPHICS_PIPELINE:
+					return "ICPUGraphicsPipeline";
+				case enum_t::ET_BOTOM_LEVEL_ACCELERATION_STRUCTURE:
+					return "ICPUBottomLevelAccelerationStructure";
+				case enum_t::ET_TOP_LEVEL_ACCELERATION_STRUCTURE:
+					return "ICPUTopLevelAccelerationStructure";
+				case enum_t::ET_GEOMETRY_COLLECTION:
+					return "ICPUGeometryCollection";
+				case enum_t::ET_MORPH_TARGETS:
+					return "ICPUMorphTargets";
+				case enum_t::ET_COMPUTE_PIPELINE:
+					return "ICPUComputePipeline";
+				case enum_t::ET_PIPELINE_CACHE:
+					return "ICPUPipelineCache";
+				case enum_t::ET_SCENE:
+					return "ICPUScene";
+				case enum_t::ET_RAYTRACING_PIPELINE:
+					return "ICPURayTracingPipeline";
+				case enum_t::ET_IMPLEMENTATION_SPECIFIC_METADATA:
+					return "";
+				default:
+					break;
+			}
+			return "";
+		}
+};
+}
 #endif

include/nbl/asset/IAsset.h

@@ -120,6 +120,15 @@ struct SBufferRange
 	inline bool operator!=(const SBufferRange<const BufferType>& rhs) const { return !operator==(rhs); }
 };
 
+template<typename BufferType>
+struct SStridedRange
+{
+	inline operator bool() const {return range.isValid();}
+
+	SBufferRange<BufferType> range = {};
+	uint32_t stride = 0;
+};
+
 }
 
 namespace std

include/nbl/asset/IBuffer.h

@@ -119,30 +119,32 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
             return (m_alignment > 0 && !(m_alignment & (m_alignment - 1)));
         }
 
-protected:
-    inline void discardContent_impl() override
-    {
-        if (m_data)
-            m_mem_resource->deallocate(m_data, m_creationParams.size, m_alignment);
-        m_data = nullptr;
-        m_mem_resource = nullptr;
-        m_creationParams.size = 0ull;
-    }
-
-private:
-    ICPUBuffer(SCreationParams&& params) :
-        asset::IBuffer({ params.size, EUF_TRANSFER_DST_BIT }), m_data(params.data),
-        m_mem_resource(params.memoryResource), m_alignment(params.alignment) {}
-
-    ~ICPUBuffer() override {
-        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;
+    protected:
+        inline void discardContent_impl() override
+        {
+            if (m_data)
+                m_mem_resource->deallocate(m_data, m_creationParams.size, m_alignment);
+            m_data = nullptr;
+            m_mem_resource = nullptr;
+            m_creationParams.size = 0ull;
+        }
+
+    private:
+        // TODO: we should remove the addition of TRANSFER_DST_BIT because its the asset converter patcher that handles that
+        // But we need LLVM-pipe CI first so I don't have to test 70 examples by hand
+        inline ICPUBuffer(SCreationParams&& params) : asset::IBuffer({params.size,params.usage|EUF_TRANSFER_DST_BIT}),
+            m_data(params.data), m_mem_resource(params.memoryResource), m_alignment(params.alignment) {}
+
+        inline ~ICPUBuffer() override
+        {
+            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;
 };
 
 } // end namespace nbl::asset

include/nbl/asset/ICPUBuffer.h

@@ -24,11 +24,15 @@ class NBL_API2 ICPUGeometryCollection : public IAsset, public IGeometryCollectio
         inline E_TYPE getAssetType() const override {return AssetType;}
 
         //
-        inline bool valid() const //override
+        inline bool valid() const override
         {
             for (const auto& ref : m_geometries)
-            if (!ref.geometry->valid())
-                return false;
+            {
+                if (!ref.operator bool() || !ref.geometry->valid())
+                    return false;
+                if (ref.jointRedirectView.src && ref.jointRedirectView.composed.getRange<hlsl::shapes::AABB<1,uint32_t>>().maxVx[0]>=getJointCount())
+                    return false;
+            }
             return true;
         }
 
@@ -61,6 +65,8 @@ class NBL_API2 ICPUGeometryCollection : public IAsset, public IGeometryCollectio
             return false;
         }
 
+        //
+        inline const core::vector<SGeometryReference>& getGeometries() const {return base_t::getGeometries();}
         //
         inline core::vector<SGeometryReference>* getGeometries()
         {

include/nbl/asset/ICPUGeometryCollection.h

@@ -13,9 +13,9 @@ namespace nbl::asset
 {
 
 //! CPU Version of RayTracing Pipeline
-class ICPURayTracingPipeline final : public ICPUPipeline<IRayTracingPipeline<ICPUPipelineLayout>>
+class ICPURayTracingPipeline final : public ICPUPipeline<IRayTracingPipeline<ICPUPipelineLayout,ICPUBuffer>>
 {
-        using pipeline_base_t = IRayTracingPipeline<ICPUPipelineLayout>;
+        using pipeline_base_t = IRayTracingPipeline<ICPUPipelineLayout,ICPUBuffer>;
         using base_t = ICPUPipeline<pipeline_base_t>;
 
     public: