post-merge fixes & updates

Author: AnastaZIuk

src/nbl/ext/ImGui/CMakeLists.txt

@@ -24,12 +24,13 @@ nbl_create_ext_library_project(
 target_link_libraries(${LIB_NAME} PUBLIC imtestengine)
 
 # this should be standard for all extensions
+set(_ARCHIVE_ENTRY_KEY_ "ImGui/builtin/hlsl") # then each one has unique archive key
 get_filename_component(_ARCHIVE_ABSOLUTE_ENTRY_PATH_ "${NBL_EXT_INTERNAL_INCLUDE_DIR}/nbl/ext" ABSOLUTE)
 get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
 get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
-set(_ARCHIVE_ENTRY_KEY_ "ImGui/builtin/hlsl") # then each one has unique archive key
 
 target_compile_definitions(${LIB_NAME} PRIVATE _ARCHIVE_ABSOLUTE_ENTRY_PATH_="${_ARCHIVE_ABSOLUTE_ENTRY_PATH_}")
+target_compile_definitions(${LIB_NAME} PRIVATE _ARCHIVE_ENTRY_KEY_="${_ARCHIVE_ENTRY_KEY_}")
 
 if(NBL_EMBED_BUILTIN_RESOURCES)
 	# (*) -> I wish we could just take NSC, offline-precompile to SPIRV, embed into builtin resource library (as we did!) but then be smart & adjust at runtime OpDecorate of our resources according to wishes - unfortunately no linker yet we have and we are not going to make one ourselves so we compile imgui shaders at runtime

src/nbl/ext/ImGui/ImGui.cpp

@@ -9,11 +9,13 @@
 #include "nbl/system/CStdoutLogger.h"
 #include "nbl/ext/ImGui/ImGui.h"
 #include "nbl/ext/ImGui/builtin/hlsl/common.hlsl"
-#include "nbl/ext/ImGui/builtin/builtinResources.h"
-#include "nbl/ext/ImGui/builtin/CArchive.h"
 #include "imgui/imgui.h"
 #include "imgui/misc/cpp/imgui_stdlib.h"
 
+#ifdef NBL_EMBED_BUILTIN_RESOURCES
+#include "nbl/ext/ImGui/builtin/CArchive.h"
+#endif
+
 using namespace nbl::video;
 using namespace nbl::core;
 using namespace nbl::asset;
@@ -113,7 +115,7 @@ smart_refctd_ptr<IGPUPipelineLayout> UI::createDefaultPipelineLayout(ILogicalDev
 }
 
 // note we use archive entry explicitly for temporary compiler include search path & asset cwd to use keys directly
-constexpr std::string_view NBL_ARCHIVE_ENTRY = nbl::ext::imgui::builtin::pathPrefix;
+constexpr std::string_view NBL_ARCHIVE_ENTRY = _ARCHIVE_ENTRY_KEY_;
 
 const smart_refctd_ptr<IFileArchive> UI::mount(smart_refctd_ptr<ILogger> logger, ISystem* system, const std::string_view archiveAlias)
 {
@@ -519,9 +521,7 @@ smart_refctd_ptr<IGPUImageView> UI::createFontAtlasTexture(const SCreationParame
 			CAssetConverter::SConvertParams params = {};
 			params.transfer = &transfer;
 			params.utilities = creationParams.utilities.get();
-			queue->startCapture();
 			auto result = reservation.convert(params);
-			queue->endCapture();
 			// block immediately
 			if (result.copy()!=IQueue::RESULT::SUCCESS)
 			{

src/nbl/system/ISystem.cpp

@@ -344,8 +344,8 @@ void ISystem::unmountBuiltins() {
 bool ISystem::areBuiltinsMounted() const
 {
     // TODO: we need to span our keys and reuse accross this cpp to not DRY
-    for (const auto& it : { "nbl", "spirv", "boost" })
-		if (m_cachedArchiveFiles.findRange(it).empty())
+    for (const auto& it : { "nbl/builtin", "nbl/video", "spirv", "boost" })
+		if (!isDirectory(path(it)))
 			return false;
 
     return true;