Fix NSC builtin unmounting

Author: AnastaZIuk

src/nbl/system/ISystem.cpp

@@ -12,9 +12,16 @@
 #include "nbl/system/CArchiveLoaderTar.h"
 #include "nbl/system/CMountDirectoryArchive.h"
 
+#include <array>
+
 using namespace nbl;
 using namespace nbl::system;
 
+namespace
+{
+constexpr std::array<const char*, 4> builtinMountPoints = { "nbl/builtin", "nbl/video", "spirv", "boost" };
+}
+
 ISystem::ISystem(core::smart_refctd_ptr<ISystem::ICaller>&& caller) : m_dispatcher(std::move(caller))
 {
     addArchiveLoader(core::make_smart_refctd_ptr<CArchiveLoaderZip>(nullptr));
@@ -336,16 +343,14 @@ void ISystem::unmountBuiltins() {
         }
     };
 
-    removeByKey("nbl");
-    removeByKey("spirv");
-    removeByKey("boost");
+    for (const auto* mountPoint : builtinMountPoints)
+        removeByKey(mountPoint);
 }
 
 bool ISystem::areBuiltinsMounted() const
 {
-    // TODO: we need to span our keys and reuse accross this cpp to not DRY
-    for (const auto& it : { "nbl/builtin", "nbl/video", "spirv", "boost" })
-		if (!isDirectory(path(it)))
+    for (const auto* mountPoint : builtinMountPoints)
+		if (!isDirectory(path(mountPoint)))
 			return false;
 
     return true;
@@ -394,4 +399,4 @@ bool ISystem::isDebuggerAttached()
 
     return false;
 }
-#endif
+#endif

tools/nsc/CMakeLists.txt

@@ -269,6 +269,9 @@ set(NBL_NSC_PREINSTALL_TARGET_EXE_FILENAME $<TARGET_FILE_NAME:${EXECUTABLE_NAME}
 set(NBL_NSC_PREINSTALL_TARGET_EXE_FILEPATH "${NBL_NSC_PREINSTALL_TARGET_EXE_DIRECTORY}/${NBL_NSC_PREINSTALL_TARGET_EXE_FILENAME}")
 set(NBL_NSC_BUILD_INFO_FILENAME build-info.json)
 set(NBL_NSC_PREINSTALL_TARGET_BUILD_INFO "${NBL_NSC_PREINSTALL_TARGET_EXE_DIRECTORY}/${NBL_NSC_BUILD_INFO_FILENAME}")
+set(NBL_NSC_UNMOUNT_TEST_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/test/hlsl/unmount/input.hlsl")
+set(NBL_NSC_UNMOUNT_TEST_INCLUDE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/test/hlsl/unmount/overlay")
+set(NBL_NSC_UNMOUNT_TEST_OUTPUT "${NBL_NSC_COMPILE_DIRECTORY}/unmount.preprocessed.hlsl")
 
 add_test(NAME NBL_NSC_COMPILE_AT_EXE_CWD_TEST
 	COMMAND "${NBL_NSC_PREINSTALL_TARGET_EXE_FILENAME}" ${NBL_NSC_COMPILE_COMMAND}
@@ -287,6 +290,17 @@ add_test(NAME NBL_NSC_DUMP_BUILD_INFO_TEST
   COMMAND_EXPAND_LISTS
 )
 
+add_test(NAME NBL_NSC_NO_NBL_BUILTINS_UNMOUNT_TEST
+	COMMAND "${NBL_NSC_PREINSTALL_TARGET_EXE_FILEPATH}"
+		-P
+		-no-nbl-builtins
+		-Fc "${NBL_NSC_UNMOUNT_TEST_OUTPUT}"
+		-I "${NBL_NSC_UNMOUNT_TEST_INCLUDE_ROOT}"
+		"${NBL_NSC_UNMOUNT_TEST_INPUT}"
+	WORKING_DIRECTORY "${NBL_NSC_PREINSTALL_TARGET_EXE_DIRECTORY}"
+	COMMAND_EXPAND_LISTS
+)
+
 if(NBL_ENABLE_DOCKER_INTEGRATION)
 
 find_program(DOCKER_EXE NAMES docker REQUIRED)

tools/nsc/test/hlsl/unmount/input.hlsl

@@ -0,0 +1,10 @@
+#include "nbl/builtin/hlsl/math/linalg/basic.hlsl"
+
+#ifndef NBL_UNMOUNT_TEST_MARKER
+#error NBL_UNMOUNT_TEST_MARKER missing
+#endif
+
+float4 main() : SV_Target
+{
+    return float4(1.0, 0.0, 0.0, 1.0);
+}

tools/nsc/test/hlsl/unmount/overlay/nbl/builtin/hlsl/math/linalg/basic.hlsl

@@ -0,0 +1,6 @@
+#ifndef _NBL_BUILTIN_HLSL_MATH_LINALG_BASIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_MATH_LINALG_BASIC_INCLUDED_
+
+#define NBL_UNMOUNT_TEST_MARKER 0x4E424C55
+
+#endif