Asset API updates, parallel blake3, inline AABB extender, IO policies, runtime tunning, mesh loaders & writers

.gitignore

@@ -37,4 +37,4 @@ tools/nsc/bin/*
 */__pycache__/*
 __pycache__/*
 *.pyc
-
+tmp/*

.gitmodules

@@ -129,3 +129,6 @@
 [submodule "3rdparty/Vulkan-Tools"]
 	path = 3rdparty/Vulkan-Tools
 	url = git@github.com:Devsh-Graphics-Programming/Vulkan-Tools.git
+[submodule "3rdparty/fast_float"]
+	path = 3rdparty/fast_float
+	url = ../fast_float.git

3rdparty/CMakeLists.txt

@@ -282,12 +282,31 @@ target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIO
 # note that checking if a repository is dirty may cost build time (especially a lot if like us you have a lot of submodules) - by default we run with all checks but if you want to increase build time iterations I recommend to exclude this check
 option(GIT_EXCLUDE_IS_DIRTY "Exclude IS_DIRTY from git tracking checks, will increase build time iterations at the expense of the meta information loss" OFF)
 add_subdirectory(git-version-tracking EXCLUDE_FROM_ALL)
-NBL_ADD_GIT_TRACKING_META_LIBRARY(nabla "${NBL_ROOT_PATH}")
-NBL_ADD_GIT_TRACKING_META_LIBRARY(dxc "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc")
-nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/nabla_git_info.json")
-nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/dxc_git_info.json")
-
-NBL_GENERATE_GIT_TRACKING_META()
+NBL_CONFIGURE_GIT_TRACKING_META_RUNTIME(
+	TARGET gtml_core
+	NAMESPACE gtml
+	IGITINFO_HEADER_PATH nbl/gtml/IGitInfo.h
+	JSON_FORMATTER_HEADER_PATH nbl/gtml/SJsonFormatter.h
+)
+NBL_ADD_GIT_TRACKING_META_LIBRARY(
+	TARGET gtml
+	NAMESPACE nbl::gtml
+	HEADER_PATH nbl/git/info.h
+	REPOS
+		nabla "${NBL_ROOT_PATH}"
+		dxc "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc"
+)
+NBL_GET_GIT_TRACKING_META_RUNTIME_OUTPUTS(
+	IGITINFO_HEADER_OUTPUT_VAR _NBL_GTML_IGITINFO_HEADER
+	JSON_FORMATTER_HEADER_OUTPUT_VAR _NBL_GTML_JSON_FORMATTER_HEADER
+)
+NBL_GET_GIT_TRACKING_META_OUTPUTS(TARGET gtml HEADER_OUTPUT_VAR _NBL_GTML_HEADER JSON_OUTPUTS_VAR _NBL_GTML_JSONS)
+nbl_install_file_spec("${_NBL_GTML_IGITINFO_HEADER}" "nbl/gtml")
+nbl_install_file_spec("${_NBL_GTML_JSON_FORMATTER_HEADER}" "nbl/gtml")
+nbl_install_file_spec("${_NBL_GTML_HEADER}" "nbl/git")
+foreach(_NBL_GTML_JSON IN LISTS _NBL_GTML_JSONS)
+	nbl_install_file("${_NBL_GTML_JSON}")
+endforeach()
 
 # NGFX
 include(ngfx/ngfx.cmake)
@@ -456,6 +475,8 @@ set(NBL_3RDPARTY_TARGETS
 				lz4
 				aesGladman
 				spirv_cross
+				gtml_core
+				gtml
 				png_static
 				zlibstatic
 				shaderc_util
@@ -528,14 +549,10 @@ nbl_install_dir(glm/glm)
 nbl_install_file_spec(${CMAKE_CURRENT_BINARY_DIR}/imath/config/ImathConfig.h imath)
 nbl_install_dir(imath/src/Imath)
 
-nbl_install_file(blake/c/blake3.h)
-
 nbl_install_dir(boost/superproject/libs/preprocessor/include/boost)
 
 nbl_install_file_spec(renderdoc/renderdoc_app.h renderdoc)
 
-nbl_install_file(${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/git_info.h)
-
 # parent scope exports, must be at the end of the file
 set(_NBL_3RDPARTY_TARGETS_ 
 	${NBL_3RDPARTY_TARGETS}

include/nabla.h

@@ -64,11 +64,11 @@
 #include "SColor.h"
 
 // meta info
-#include "git_info.h"
+#include "nbl/git/info.h"
 
 namespace nbl {
-	const NBL_API2 gtml::GitInfo& getGitInfo(gtml::E_GIT_REPO_META repo);
+	const NBL_API2 ::gtml::IGitInfo& getGitInfo(gtml::E_GIT_REPO_META repo);
 }
 
 
-#endif // __NABLA_H_INCLUDED__
+#endif // __NABLA_H_INCLUDED__

include/nbl/application_templates/MonoDeviceApplication.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2023-2023 - 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
 #ifndef _NBL_APPLICATION_TEMPLATES_MONO_DEVICE_APPLICATION_HPP_INCLUDED_
@@ -280,4 +280,4 @@ class MonoDeviceApplication : public virtual MonoSystemMonoLoggerApplication
 };
 
 }
-#endif
+#endif

include/nbl/asset/IAssetManager.h

@@ -5,6 +5,7 @@
 #define _NBL_ASSET_I_ASSET_MANAGER_H_INCLUDED_
 
 #include <array>
+#include <optional>
 #include <ostream>
 
 #include "nbl/core/declarations.h"
@@ -51,6 +52,12 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
         friend std::function<void(SAssetBundle&)> makeAssetDisposeFunc(const IAssetManager* const _mgr);
 
     public:
+        struct SWriterFlagInfo
+        {
+            writer_flags_t supported = EWF_NONE;
+            writer_flags_t forced = EWF_NONE;
+        };
+
 #ifdef USE_MAPS_FOR_PATH_BASED_CACHE
         using AssetCacheType = core::CConcurrentMultiObjectCache<std::string, SAssetBundle, std::multimap>;
 #else
@@ -180,19 +187,31 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
         SAssetBundle getAssetInHierarchy_impl(const std::string& _filePath, const IAssetLoader::SAssetLoadParams& _params, uint32_t _hierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override)
         {
             IAssetLoader::SAssetLoadContext ctx(_params, nullptr);
+            system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
+            const auto tryLoadAssetFromPath = [&](const system::path& path)->SAssetBundle
+            {
+                m_system->createFile(future, path, static_cast<system::IFile::E_CREATE_FLAGS>(system::IFile::ECF_READ | system::IFile::ECF_MAPPABLE));
+                if (auto file=future.acquire())
+                    return getAssetInHierarchy_impl(file->get(), path.string(), ctx.params, _hierarchyLevel, _override);
+                m_system->createFile(future, path, system::IFile::ECF_READ);
+                if (auto file=future.acquire())
+                    return getAssetInHierarchy_impl(file->get(), path.string(), ctx.params, _hierarchyLevel, _override);
+                return SAssetBundle(0);
+            };
 
             system::path filePath = _filePath;
             _override->getLoadFilename(filePath, m_system.get(), ctx, _hierarchyLevel);
-            if (!m_system->exists(filePath,system::IFile::ECF_READ))
+            if (auto bundle=tryLoadAssetFromPath(filePath); !bundle.getContents().empty())
+                return bundle;
+
+            auto fallbackPath = _params.workingDirectory / filePath;
+            if (fallbackPath != filePath)
             {
-                filePath = _params.workingDirectory/filePath;
+                filePath = std::move(fallbackPath);
                 _override->getLoadFilename(filePath, m_system.get(), ctx, _hierarchyLevel);
+                if (auto bundle=tryLoadAssetFromPath(filePath); !bundle.getContents().empty())
+                    return bundle;
             }
-
-            system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
-            m_system->createFile(future, filePath, system::IFile::ECF_READ);
-            if (auto file=future.acquire())
-                return getAssetInHierarchy_impl(file->get(), filePath.string(), ctx.params, _hierarchyLevel, _override);
             return SAssetBundle(0);
         }
 
@@ -350,8 +369,12 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
             if (!_override)
                 _override = &defOverride;
 
+            system::path filename = _filename;
+            if (filename.is_relative() && !_params.workingDirectory.empty())
+                filename = _params.workingDirectory / filename;
+
             system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
-            m_system->createFile(future, (_params.workingDirectory.generic_string()+_filename).c_str(), system::IFile::ECF_WRITE);
+            m_system->createFile(future, std::move(filename), system::IFile::ECF_WRITE);
             if (auto file=future.acquire())
                 return writeAsset(file->get(), _params, _override);
             return false;
@@ -381,6 +404,18 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
             return writeAsset(_file, _params, nullptr);
         }
 
+        inline std::optional<SWriterFlagInfo> getAssetWriterFlagInfo(const IAsset::E_TYPE assetType, const std::string_view extension) const
+        {
+            const auto capableWritersRng = m_writers.perTypeAndFileExt.findRange({assetType, std::string(extension)});
+            if (capableWritersRng.empty())
+                return std::nullopt;
+            auto* const writer = capableWritersRng.begin()->second;
+            return SWriterFlagInfo{
+                .supported = writer->getSupportedFlags(),
+                .forced = writer->getForcedFlags()
+            };
+        }
+
         // Asset Loaders [FOLLOWING ARE NOT THREAD SAFE]
         uint32_t getAssetLoaderCount() { return static_cast<uint32_t>(m_loaders.vector.size()); }
 

include/nbl/asset/ICPUBuffer.h

@@ -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
 #ifndef _NBL_ASSET_I_CPU_BUFFER_H_INCLUDED_
@@ -76,13 +76,12 @@ 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 core::blake3_hash_t computeContentHash() const override
-        {
-            core::blake3_hasher hasher;
-            if (m_data)
-                hasher.update(m_data, m_creationParams.size);
-            return static_cast<core::blake3_hash_t>(hasher);
-        }
+        inline core::blake3_hash_t computeContentHash() const override
+        {
+            if (!m_data)
+                return static_cast<core::blake3_hash_t>(core::blake3_hasher{});
+            return core::blake3_hash_buffer(m_data, m_creationParams.size);
+        }
 
         inline bool missingContent() const override { return !m_data; }
 
@@ -149,4 +148,4 @@ class ICPUBuffer final : public asset::IBuffer, public IPreHashed
 
 } // end namespace nbl::asset
 
-#endif
+#endif

include/nbl/asset/ICPUPolygonGeometry.h

@@ -8,6 +8,7 @@
 #include "nbl/asset/IAsset.h"
 #include "nbl/asset/ICPUBuffer.h"
 #include "nbl/asset/IPolygonGeometry.h"
+#include "nbl/builtin/hlsl/shapes/AABBAccumulator.hlsl"
 
 
 namespace nbl::asset
@@ -112,7 +113,20 @@ class NBL_API2 ICPUPolygonGeometry final : public IPolygonGeometry<ICPUBuffer>
             return false;
         }
         template<typename Scalar>
-        inline bool setAABB(const hlsl::shapes::AABB<3,Scalar>& aabb) {return visitAABB([&aabb](auto&& ref)->void{ref=aabb;});}
+        inline bool setAABB(const hlsl::shapes::AABB<3,Scalar>& aabb)
+        {
+            bool assigned = false;
+            const bool visited = visitAABB([&aabb, &assigned](auto&& ref)->void
+            {
+                assigned = hlsl::shapes::util::assignAABB(ref, aabb);
+            });
+            return visited && assigned;
+        }
+        template<typename Scalar>
+        inline bool applyAABB(const hlsl::shapes::AABB<3, Scalar>& aabb)
+        {
+            return setAABB(aabb);
+        }
 
         //
         inline bool setJointCount(const uint32_t count)
@@ -194,4 +208,4 @@ class NBL_API2 ICPUPolygonGeometry final : public IPolygonGeometry<ICPUBuffer>
 };
 
 }
-#endif
+#endif

include/nbl/asset/SBufferAdoption.h

@@ -0,0 +1,49 @@
+// 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
+#ifndef _NBL_ASSET_S_BUFFER_ADOPTION_H_INCLUDED_
+#define _NBL_ASSET_S_BUFFER_ADOPTION_H_INCLUDED_
+#include <concepts>
+#include <ranges>
+#include <type_traits>
+#include <utility>
+#include "nbl/asset/ICPUBuffer.h"
+namespace nbl::asset
+{
+namespace impl
+{
+// Owns contiguous storage that can be adopted by a CPU buffer. Views like std::span are rejected.
+template<typename Storage>
+concept AdoptedBufferStorage =
+    std::ranges::contiguous_range<std::remove_reference_t<Storage>> &&
+    std::ranges::sized_range<std::remove_reference_t<Storage>> &&
+    (!std::ranges::view<std::remove_cvref_t<Storage>>) &&
+    requires(std::remove_reference_t<Storage>& storage)
+    {
+        typename std::ranges::range_value_t<std::remove_reference_t<Storage>>;
+        { std::ranges::data(storage) } -> std::same_as<std::ranges::range_value_t<std::remove_reference_t<Storage>>*>;
+    };
+}
+// Generic CPU-buffer adoption helper for owning contiguous storage such as std::vector or core::vector.
+class SBufferAdoption
+{
+    public:
+        template<impl::AdoptedBufferStorage Storage>
+        static inline core::smart_refctd_ptr<ICPUBuffer> create(Storage&& data)
+        {
+            using storage_t = std::remove_cvref_t<Storage>;
+            using value_t = std::ranges::range_value_t<storage_t>;
+
+            if (std::ranges::empty(data))
+                return nullptr;
+
+            auto backer = core::make_smart_refctd_ptr<core::adoption_memory_resource<storage_t>>(std::forward<Storage>(data));
+            auto& storage = backer->getBacker();
+            const size_t byteCount = std::ranges::size(storage) * sizeof(value_t);
+            return ICPUBuffer::create(
+                { { byteCount }, std::ranges::data(storage), core::smart_refctd_ptr<core::refctd_memory_resource>(std::move(backer)), alignof(value_t) },
+                core::adopt_memory);
+        }
+};
+}
+#endif