get Nabla compiling

devsh · devsh · commit c0dffe3e54cc · 2025-06-03T14:49:16.000+02:00
diff --git a/include/nbl/asset/IGeometry.h b/include/nbl/asset/IGeometry.h
@@ -104,7 +104,7 @@ class IGeometryBase : public virtual core::IReferenceCounted
             template<typename Visitor>
             inline void visitAABB(Visitor& visitor)
             {
-                switch (format)
+                switch (rangeFormat)
                 {
                     case EAABBFormat::F64:
                         visitor(encodedDataRange.f64);
@@ -158,7 +158,7 @@ class IGeometryBase : public virtual core::IReferenceCounted
             inline void resetRange(const EAABBFormat newFormat)
             {
                 rangeFormat = newFormat;
-                auto tmp = [](auto& aabb)->void{aabb = aabb.clear();};
+                auto tmp = [](auto& aabb)->void{aabb = aabb.create();};
                 visitAABB(tmp);
             }
             inline void resetRange() {resetRange(rangeFormat);}
@@ -235,7 +235,7 @@ class NBL_API2 IGeometry : public std::conditional_t<std::is_same_v<BufferType,I
                 const auto stride = composed.getStride();
                 if (stride==0)
                     return 0ull;
-                return src.length/stride;
+                return src.size/stride;
             }
             
             //
diff --git a/include/nbl/asset/IPolygonGeometry.h b/include/nbl/asset/IPolygonGeometry.h
@@ -139,7 +139,7 @@ class NBL_API2 IPolygonGeometry : public IIndexableGeometry<BufferType>, public
                 return false;
             // there needs to be at least one vertex to reference (it also needs to be formatted)
             const auto& positionBase = base_t::m_positionView.composed;
-            const auto vertexCount = positionBase.getElementCount();
+            const auto vertexCount = base_t::m_positionView.getElementCount();
             if (vertexCount==0 || !positionBase.isFormatted())
                 return false;
             if (m_normalView && m_normalView.getElementCount()<vertexCount)
@@ -159,7 +159,7 @@ class NBL_API2 IPolygonGeometry : public IIndexableGeometry<BufferType>, public
         inline EPrimitiveType getPrimitiveType() const override final {return PrimitiveType;}
 
         //
-        inline const IGeometryBase::SAABBStorage& getAABB() const override final {return base_t::m_positionView.encodedDataRange;}
+        inline const IGeometryBase::SAABBStorage& getAABB() const override final {return base_t::m_positionView.composed.encodedDataRange;}
 
         //
         inline uint64_t getVertexReferenceCount() const {return base_t::getIndexView() ? base_t::getIndexCount():base_t::m_positionView.getElementCount();}
@@ -189,7 +189,7 @@ class NBL_API2 IPolygonGeometry : public IIndexableGeometry<BufferType>, public
         struct SJointWeight
         {
             // one thing this doesn't check is whether every vertex has a weight and index
-            inline operator bool() const {return indices && isIntegerFormat(indices.format) && weights && weights.isFormatted() && indices.getElementCount()==weights.getElementCount();}
+            inline operator bool() const {return indices && isIntegerFormat(indices.composed.format) && weights && weights.composed.isFormatted() && indices.getElementCount()==weights.getElementCount();}
 
             SDataView indices;
             // Assumption is that only non-zero weights are present, which is why the joints are indexed (sparseness)
diff --git a/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp b/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
@@ -15,17 +15,11 @@
 #include "nbl/builtin/MTLdefaults.h"
 
 
-
 using namespace nbl;
 using namespace asset;
 
-#define VERT_SHADER_NO_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/vertex_no_uv.vert"
-#define VERT_SHADER_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/vertex_uv.vert"
-#define FRAG_SHADER_NO_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/fragment_no_uv.frag"
-#define FRAG_SHADER_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/fragment_uv.frag"
 
-CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core::smart_refctd_ptr<system::ISystem>&& sys) : 
-    IRenderpassIndependentPipelineLoader(_am), m_system(std::move(sys))
+CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core::smart_refctd_ptr<system::ISystem>&& sys) : m_system(std::move(sys))
 {
 #if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders
     //create vertex shaders and insert them into cache
@@ -70,6 +64,7 @@ CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core:
 #endif
 }
 
+#if 0
 void CGraphicsPipelineLoaderMTL::initialize()
 {
     IRenderpassIndependentPipelineLoader::initialize();
@@ -123,6 +118,7 @@ void CGraphicsPipelineLoaderMTL::initialize()
 
     insertBuiltinAssetIntoCache(m_assetMgr, bundle, "nbl/builtin/renderpass_independent_pipeline/loader/mtl/missing_material_pipeline");
 }
+#endif
 
 bool CGraphicsPipelineLoaderMTL::isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const
 {
@@ -138,6 +134,8 @@ bool CGraphicsPipelineLoaderMTL::isALoadableFileFormat(system::IFile* _file, con
 
 SAssetBundle CGraphicsPipelineLoaderMTL::loadAsset(system::IFile* _file, const IAssetLoader::SAssetLoadParams& _params, IAssetLoader::IAssetLoaderOverride* _override, uint32_t _hierarchyLevel)
 {
+    return {};
+#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders
     SContext ctx(
         asset::IAssetLoader::SAssetLoadContext{
             _params,
@@ -196,12 +194,12 @@ SAssetBundle CGraphicsPipelineLoaderMTL::loadAsset(system::IFile* _file, const I
     if (materials.empty())
         return SAssetBundle(nullptr, {});
     return SAssetBundle(std::move(meta),std::move(retval));
+#endif
 }
 
+#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders
 core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> CGraphicsPipelineLoaderMTL::makePipelineFromMtl(SContext& _ctx, const SMtl& _mtl, bool hasUV)
 {
-    return nullptr;
-#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders
     SBlendParams blendParams;
 
     std::string cacheKey("nbl/builtin/renderpass_independent_pipeline/loader/mtl/");
@@ -323,8 +321,8 @@ core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> CGraphicsPipelineLoade
         ppln = core::make_smart_refctd_ptr<ICPURenderpassIndependentPipeline>(std::move(layout), shaders, shaders+2u, vtxParams, blendParams, SPrimitiveAssemblyParams{}, SRasterizationParams{});
     }
     return ppln;
-#endif
 }
+#endif
 
 namespace
 {
@@ -403,6 +401,7 @@ namespace
     }
 }
 
+#if 0
 const char* CGraphicsPipelineLoaderMTL::readTexture(const char* _bufPtr, const char* const _bufEnd, SMtl* _currMaterial, const char* _mapType) const
 {
     static const std::unordered_map<std::string, CMTLMetadata::CRenderpassIndependentPipeline::E_MAP_TYPE> str2type =
@@ -912,3 +911,4 @@ auto CGraphicsPipelineLoaderMTL::readMaterials(system::IFile* _file, const syste
 
     return materials;
 }
+#endif
diff --git a/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.h b/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.h
@@ -12,8 +12,9 @@
 namespace nbl::asset
 {	
 
-class CGraphicsPipelineLoaderMTL final : public IGeometryLoader
+class CGraphicsPipelineLoaderMTL final : public IAssetLoader // TODO: Material Asset and Loader
 {
+#if 0
         struct SMtl
         {
             CMTLMetadata::CRenderpassIndependentPipeline::SMaterialParameters params;
@@ -26,7 +27,7 @@ class CGraphicsPipelineLoaderMTL final : public IGeometryLoader
 
             inline bool isClampToBorder(CMTLMetadata::CRenderpassIndependentPipeline::E_MAP_TYPE m) const { return (clamp >> m) & 1u; }
         };
-
+#endif
         struct SContext
         {
             SContext(const IAssetLoader::SAssetLoadContext& _innerCtx, uint32_t _topHierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override)
@@ -40,8 +41,6 @@ class CGraphicsPipelineLoaderMTL final : public IGeometryLoader
 	public:
         CGraphicsPipelineLoaderMTL(IAssetManager* _am, core::smart_refctd_ptr<system::ISystem>&& sys);
 
-        void initialize() override;
-
 		bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger=nullptr) const override;
 
 		const char** getAssociatedFileExtensions() const override
@@ -50,11 +49,12 @@ class CGraphicsPipelineLoaderMTL final : public IGeometryLoader
 			return extensions;
 		}
 
-		uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_RENDERPASS_INDEPENDENT_PIPELINE; }
+//		uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_MATERIAL; }
 
 		asset::SAssetBundle loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override, uint32_t _hierarchyLevel = 0u) override;
 
     private:
+#if 0
         core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> makePipelineFromMtl(SContext& ctx, const SMtl& _mtl, bool hasUV);
         core::vector<SMtl> readMaterials(system::IFile* _file, const system::logger_opt_ptr logger) const;
         const char* readTexture(const char* _bufPtr, const char* const _bufEnd, SMtl* _currMaterial, const char* _mapType) const;
@@ -63,7 +63,8 @@ class CGraphicsPipelineLoaderMTL final : public IGeometryLoader
         using image_views_set_t = std::array<core::smart_refctd_ptr<ICPUImageView>, CMTLMetadata::CRenderpassIndependentPipeline::EMP_REFL_POSX + 1u>;
         image_views_set_t loadImages(const std::string& relDir, SMtl& _mtl, SContext& _ctx);
         core::smart_refctd_ptr<ICPUDescriptorSet> makeDescSet(image_views_set_t&& _views, ICPUDescriptorSetLayout* _dsLayout, SContext& _ctx);
-    private:
+#endif
+
         core::smart_refctd_ptr<system::ISystem> m_system;
 
 };
diff --git a/src/nbl/asset/utils/CGeometryCreator.cpp b/src/nbl/asset/utils/CGeometryCreator.cpp
@@ -14,6 +14,7 @@
 namespace nbl::asset
 {
 
+#if 0
 core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCube(const hlsl::float32_t3 size) const
 {
 	using namespace hlsl;
@@ -1703,7 +1704,7 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createIcoSphere(fl
 
 	return icosphereGeometry;
 }
-
+#endif
 
 } // end namespace nbl::asset
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class IGeometryBase : public virtual core::IReferenceCounted`
`104`	`104`	`template<typename Visitor>`
`105`	`105`	`inline void visitAABB(Visitor& visitor)`
`106`	`106`	`{`
`107`		`- switch (format)`
	`107`	`+ switch (rangeFormat)`
`108`	`108`	`{`
`109`	`109`	`case EAABBFormat::F64:`
`110`	`110`	`visitor(encodedDataRange.f64);`
`@@ -158,7 +158,7 @@ class IGeometryBase : public virtual core::IReferenceCounted`
`158`	`158`	`inline void resetRange(const EAABBFormat newFormat)`
`159`	`159`	`{`
`160`	`160`	`rangeFormat = newFormat;`
`161`		`- auto tmp = [](auto& aabb)->void{aabb = aabb.clear();};`
	`161`	`+ auto tmp = [](auto& aabb)->void{aabb = aabb.create();};`
`162`	`162`	`visitAABB(tmp);`
`163`	`163`	`}`
`164`	`164`	`inline void resetRange() {resetRange(rangeFormat);}`
`@@ -235,7 +235,7 @@ class NBL_API2 IGeometry : public std::conditional_t<std::is_same_v<BufferType,I`
`235`	`235`	`const auto stride = composed.getStride();`
`236`	`236`	`if (stride==0)`
`237`	`237`	`return 0ull;`
`238`		`- return src.length/stride;`
	`238`	`+ return src.size/stride;`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.`
	`1`	`+// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.`
`2`	`2`	`// This file is part of the "Nabla Engine".`
`3`	`3`	`// For conditions of distribution and use, see copyright notice in nabla.h`
`4`	`4`
`@@ -15,17 +15,11 @@`
`15`	`15`	`#include "nbl/builtin/MTLdefaults.h"`
`16`	`16`
`17`	`17`
`18`		`-`
`19`	`18`	`using namespace nbl;`
`20`	`19`	`using namespace asset;`
`21`	`20`
`22`		`-#define VERT_SHADER_NO_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/vertex_no_uv.vert"`
`23`		`-#define VERT_SHADER_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/vertex_uv.vert"`
`24`		`-#define FRAG_SHADER_NO_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/fragment_no_uv.frag"`
`25`		`-#define FRAG_SHADER_UV_CACHE_KEY "nbl/builtin/shader/loader/mtl/fragment_uv.frag"`
`26`	`21`
`27`		`-CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core::smart_refctd_ptr<system::ISystem>&& sys) :`
`28`		`- IRenderpassIndependentPipelineLoader(_am), m_system(std::move(sys))`
	`22`	`+CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core::smart_refctd_ptr<system::ISystem>&& sys) : m_system(std::move(sys))`
`29`	`23`	`{`
`30`	`24`	`#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders`
`31`	`25`	`//create vertex shaders and insert them into cache`
`@@ -70,6 +64,7 @@ CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core:`
`70`	`64`	`#endif`
`71`	`65`	`}`
`72`	`66`
	`67`	`+#if 0`
`73`	`68`	`void CGraphicsPipelineLoaderMTL::initialize()`
`74`	`69`	`{`
`75`	`70`	`IRenderpassIndependentPipelineLoader::initialize();`
`@@ -123,6 +118,7 @@ void CGraphicsPipelineLoaderMTL::initialize()`
`123`	`118`
`124`	`119`	`insertBuiltinAssetIntoCache(m_assetMgr, bundle, "nbl/builtin/renderpass_independent_pipeline/loader/mtl/missing_material_pipeline");`
`125`	`120`	`}`
	`121`	`+#endif`
`126`	`122`
`127`	`123`	`bool CGraphicsPipelineLoaderMTL::isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const`
`128`	`124`	`{`
`@@ -138,6 +134,8 @@ bool CGraphicsPipelineLoaderMTL::isALoadableFileFormat(system::IFile* _file, con`
`138`	`134`
`139`	`135`	`SAssetBundle CGraphicsPipelineLoaderMTL::loadAsset(system::IFile* _file, const IAssetLoader::SAssetLoadParams& _params, IAssetLoader::IAssetLoaderOverride* _override, uint32_t _hierarchyLevel)`
`140`	`136`	`{`
	`137`	`+ return {};`
	`138`	`+#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders`
`141`	`139`	`SContext ctx(`
`142`	`140`	`asset::IAssetLoader::SAssetLoadContext{`
`143`	`141`	`_params,`
`@@ -196,12 +194,12 @@ SAssetBundle CGraphicsPipelineLoaderMTL::loadAsset(system::IFile* _file, const I`
`196`	`194`	`if (materials.empty())`
`197`	`195`	`return SAssetBundle(nullptr, {});`
`198`	`196`	`return SAssetBundle(std::move(meta),std::move(retval));`
	`197`	`+#endif`
`199`	`198`	`}`
`200`	`199`
	`200`	`+#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders`
`201`	`201`	`core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> CGraphicsPipelineLoaderMTL::makePipelineFromMtl(SContext& _ctx, const SMtl& _mtl, bool hasUV)`
`202`	`202`	`{`
`203`		`- return nullptr;`
`204`		`-#if 0 // Remove IRenderpassIndependentPipelines and use MC for Mesh Loaders`
`205`	`203`	`SBlendParams blendParams;`
`206`	`204`
`207`	`205`	`std::string cacheKey("nbl/builtin/renderpass_independent_pipeline/loader/mtl/");`
`@@ -323,8 +321,8 @@ core::smart_refctd_ptr<ICPURenderpassIndependentPipeline> CGraphicsPipelineLoade`
`323`	`321`	`ppln = core::make_smart_refctd_ptr<ICPURenderpassIndependentPipeline>(std::move(layout), shaders, shaders+2u, vtxParams, blendParams, SPrimitiveAssemblyParams{}, SRasterizationParams{});`
`324`	`322`	`}`
`325`	`323`	`return ppln;`
`326`		`-#endif`
`327`	`324`	`}`
	`325`	`+#endif`
`328`	`326`
`329`	`327`	`namespace`
`330`	`328`	`{`
`@@ -403,6 +401,7 @@ namespace`
`403`	`401`	`}`
`404`	`402`	`}`
`405`	`403`
	`404`	`+#if 0`
`406`	`405`	`const char* CGraphicsPipelineLoaderMTL::readTexture(const char* _bufPtr, const char* const _bufEnd, SMtl* _currMaterial, const char* _mapType) const`
`407`	`406`	`{`
`408`	`407`	`static const std::unordered_map<std::string, CMTLMetadata::CRenderpassIndependentPipeline::E_MAP_TYPE> str2type =`
`@@ -912,3 +911,4 @@ auto CGraphicsPipelineLoaderMTL::readMaterials(system::IFile* _file, const syste`
`912`	`911`
`913`	`912`	`return materials;`
`914`	`913`	`}`
	`914`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`namespace nbl::asset`
`15`	`15`	`{`
`16`	`16`
	`17`	`+#if 0`
`17`	`18`	`core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCube(const hlsl::float32_t3 size) const`
`18`	`19`	`{`
`19`	`20`	`using namespace hlsl;`
`@@ -1703,7 +1704,7 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createIcoSphere(fl`
`1703`	`1704`
`1704`	`1705`	`return icosphereGeometry;`
`1705`	`1706`	`}`
`1706`		`-`
	`1707`	`+#endif`
`1707`	`1708`
`1708`	`1709`	`} // end namespace nbl::asset`
`1709`	`1710`