fixed some nasty bugs in path prefix comparison, and fixed the way we look for includes in HLSL

Author: devshgraphicsprogramming

include/nbl/system/CFileArchive.h

@@ -74,7 +74,7 @@ class NBL_API2 CFileArchive : public IFileArchive
 		static inline constexpr size_t ALIGNOF_INNER_ARCHIVE_FILE = std::max(alignof(CInnerArchiveFile<CPlainHeapAllocator>), alignof(CInnerArchiveFile<VirtualMemoryAllocator>));
 
 	protected:
-		CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, std::shared_ptr<core::vector<SFileList::SEntry>> _items) :
+		inline CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, std::shared_ptr<core::vector<SFileList::SEntry>> _items) :
 			IFileArchive(std::move(_defaultAbsolutePath),std::move(logger))
 		{
 			setItemList(_items);
@@ -86,7 +86,7 @@ class NBL_API2 CFileArchive : public IFileArchive
 				m_fileFlags[i].clear();
 			memset(m_filesBuffer,0,fileCount*SIZEOF_INNER_ARCHIVE_FILE);
 		}
-		~CFileArchive()
+		inline ~CFileArchive()
 		{ 
 			_NBL_ALIGNED_FREE(m_filesBuffer);
 			_NBL_ALIGNED_FREE(m_fileFlags);

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -77,31 +77,29 @@ static tcpp::TInputStreamUniquePtr getInputStreamInclude(
     std::vector<std::pair<uint32_t, std::string>>& includeStack
 )
 {
-    std::filesystem::path relDir;
+    std::filesystem::path requestingSourceDir;
     #ifdef NBL_EMBED_BUILTIN_RESOURCES
     const bool reqFromBuiltin = nbl::builtin::hasPathPrefix(requestingSource) || spirv::builtin::hasPathPrefix(requestingSource);
     const bool reqBuiltin = nbl::builtin::hasPathPrefix(requestedSource) || spirv::builtin::hasPathPrefix(requestedSource);
+    //While #includ'ing a builtin, one must specify its full path (starting with "nbl/builtin" or "/nbl/builtin").
+    //  This rule applies also while a builtin is #includ`ing another builtin.
+    //While including a filesystem file it must be either absolute path (or relative to any search dir added to asset::iIncludeHandler; <>-type),
+    //  or path relative to executable's working directory (""-type).
     if (!reqFromBuiltin && !reqBuiltin)
-    {
-        //While #includ'ing a builtin, one must specify its full path (starting with "nbl/builtin" or "/nbl/builtin").
-        //  This rule applies also while a builtin is #includ`ing another builtin.
-        //While including a filesystem file it must be either absolute path (or relative to any search dir added to asset::iIncludeHandler; <>-type),
-        //  or path relative to executable's working directory (""-type).
-        relDir = std::filesystem::path(requestingSource).parent_path();
-    }
     #else
     const bool reqBuiltin = false;
     #endif // NBL_EMBED_BUILTIN_RESOURCES
-    std::filesystem::path name = isRelative ? (relDir / requestedSource) : (requestedSource);
+        requestingSourceDir = system::path(requestingSource).parent_path();
 
+    system::path name = isRelative ? (requestingSourceDir / requestedSource) : (requestedSource);
     if (std::filesystem::exists(name) && !reqBuiltin)
         name = std::filesystem::absolute(name);
 
     std::optional<std::string> result;
     if (isRelative)
-        result = inclFinder->getIncludeRelative(relDir, requestedSource);
+        result = inclFinder->getIncludeRelative(requestingSourceDir, requestedSource);
     else //shaderc_include_type_standard
-        result = inclFinder->getIncludeStandard(relDir, requestedSource);
+        result = inclFinder->getIncludeStandard(requestingSourceDir, requestedSource);
 
     if (!result) 
     {

src/nbl/builtin/template/CArchive.h.in

@@ -7,21 +7,27 @@
 
 namespace @_NAMESPACE_@
 {
-	constexpr std::string_view pathPrefix = "@_BUNDLE_ARCHIVE_ABSOLUTE_PATH_@";
-	constexpr bool hasPathPrefix(std::string_view str) { return str.find(pathPrefix) == 0ull; }
+constexpr std::string_view pathPrefix = "@_BUNDLE_ARCHIVE_ABSOLUTE_PATH_@";
 
-	class @NBL_BR_API@ CArchive final : public nbl::system::CFileArchive
-	{
-		public:
-			CArchive(nbl::system::logger_opt_smart_ptr&& logger);
+inline bool hasPathPrefix(nbl::system::path _path)
+{
+	_path.make_preferred();
+	const auto prefix = nbl::system::path(pathPrefix).make_preferred();
+	return _path.string().find(prefix.string())==0ull;
+}
+
+class @NBL_BR_API@ CArchive final : public nbl::system::CFileArchive
+{
+	public:
+		CArchive(nbl::system::logger_opt_smart_ptr&& logger);
 
-		protected:
-			file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SFileList::found_t& found) override
-			{
-					auto resource = get_resource_runtime(found->pathRelativeToArchive.string());
-					return {const_cast<uint8_t*>(resource.first),resource.second,nullptr};
-			}			
-	};
+	protected:
+		file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SFileList::found_t& found) override
+		{
+				auto resource = get_resource_runtime(found->pathRelativeToArchive.string());
+				return {const_cast<uint8_t*>(resource.first),resource.second,nullptr};
+		}			
+};
 }
 
 #endif // _@_GUARD_SUFFIX_@_C_ARCHIVE_H_