Make Nabla compile with NBL_EMBED_BUILTIN_RESOURCES turned OFF, update examples_tests submodule

Author: AnastaZIuk

examples_tests

@@ -3,7 +3,9 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/asset/utils/CGLSLCompiler.h"
 #include "nbl/asset/utils/shadercUtils.h"
+#ifdef _NBL_EMBED_BUILTIN_RESOURCES_
 #include "nbl/builtin/CArchive.h"
+#endif // _NBL_EMBED_BUILTIN_RESOURCES_
 
 #include <sstream>
 #include <regex>
@@ -57,6 +59,7 @@ namespace nbl::asset::impl
             std::string res_str;
 
             std::filesystem::path relDir;
+            #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
             const bool reqFromBuiltin = builtin::hasPathPrefix(_requesting_source);
             const bool reqBuiltin = builtin::hasPathPrefix(_requested_source);
             if (!reqFromBuiltin && !reqBuiltin)
@@ -67,6 +70,9 @@ namespace nbl::asset::impl
                 //  or path relative to executable's working directory (""-type).
                 relDir = std::filesystem::path(_requesting_source).parent_path();
             }
+            #else
+            const bool reqBuiltin = false;
+            #endif // _NBL_EMBED_BUILTIN_RESOURCES_
             std::filesystem::path name = (_type == shaderc_include_type_relative) ? (relDir / _requested_source) : (_requested_source);
 
             if (std::filesystem::exists(name) && !reqBuiltin)

src/nbl/asset/utils/CGLSLCompiler.cpp

@@ -3,7 +3,9 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/asset/utils/CHLSLCompiler.h"
 #include "nbl/asset/utils/shadercUtils.h"
+#ifdef _NBL_EMBED_BUILTIN_RESOURCES_
 #include "nbl/builtin/CArchive.h"
+#endif // _NBL_EMBED_BUILTIN_RESOURCES_
 
 
 #ifdef _NBL_PLATFORM_WINDOWS_
@@ -73,6 +75,7 @@ static tcpp::IInputStream* getInputStreamInclude(
     std::string res_str;
 
     std::filesystem::path relDir;
+    #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
     const bool reqFromBuiltin = builtin::hasPathPrefix(requestingSource);
     const bool reqBuiltin = builtin::hasPathPrefix(requestedSource);
     if (!reqFromBuiltin && !reqBuiltin)
@@ -83,6 +86,9 @@ static tcpp::IInputStream* getInputStreamInclude(
         //  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);
 
     if (std::filesystem::exists(name) && !reqBuiltin)

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -1,7 +1,9 @@
 #include "nbl/system/ISystem.h"
 #include "nbl/system/ISystemFile.h"
 #include "nbl/system/CFileView.h"
+#ifdef _NBL_EMBED_BUILTIN_RESOURCES_
 #include "nbl/builtin/CArchive.h"
+#endif // _NBL_EMBED_BUILTIN_RESOURCES_
 
 #include "nbl/system/CArchiveLoaderZip.h"
 #include "nbl/system/CArchiveLoaderTar.h"
@@ -18,7 +20,7 @@ ISystem::ISystem(core::smart_refctd_ptr<ISystem::ICaller>&& caller) : m_dispatch
     #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
     mount(core::make_smart_refctd_ptr<nbl::builtin::CArchive>(nullptr));
     #else
-    mount(core::make_smart_refctd_ptr<nbl::system::CMountDirectoryArchive>(NBL_BUILTIN_RESOURCES_DIRECTORY_PATH, nullptr), "nbl/builtin");
+    mount(core::make_smart_refctd_ptr<nbl::system::CMountDirectoryArchive>(NBL_BUILTIN_RESOURCES_DIRECTORY_PATH, nullptr, this), "nbl/builtin");
     #endif
 }