save work - UI shaders update

Author: AnastaZIuk

include/nbl/system/ISystem.h

@@ -146,6 +146,7 @@ class NBL_API2 ISystem : public core::IReferenceCounted
         }
 
         void unmountBuiltins();
+		bool areBuiltinsMounted() const;
 
         //
         struct SystemInfo

src/nbl/ext/ImGui/CMakeLists.txt

@@ -32,6 +32,7 @@ get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/sr
 get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
 
 LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "common.hlsl")
+LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "psinput.hlsl")
 LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "vertex.hlsl") # (*) -> this we could precompile [no resources for which set/binding Ixs could be adjusted] but I'm not going to mix stuff
 LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "fragment.hlsl") # (*) -> but this we could not since we let users to provide external descriptor set layout + ImGUI textures & sampler state set/binding Ixs (for pipeline layout) at runtime
 

src/nbl/ext/ImGui/ImGui.cpp

@@ -133,6 +133,8 @@ namespace nbl::ext::imgui
 			constexpr std::string_view NBL_ARCHIVE_ALIAS = "nbl/ext/imgui/shaders";
 
 			auto system = smart_refctd_ptr<system::ISystem>(creationParams.assetManager->getSystem());																	//! proxy the system, we will touch it gently
+			assert(system->areBuiltinsMounted());																														//! we assume user has all Nabla builtins mounted, but we won't check it at release
+
 			auto archive = make_smart_refctd_ptr<nbl::ext::imgui::builtin::CArchive>(smart_refctd_ptr<system::ILogger>(creationParams.utilities->getLogger()));		//! we should never assume user will mount our internal archive since its the extension and not user's job to do it, hence we mount only to compile our extension sources then unmount the archive
 			auto compiler = make_smart_refctd_ptr<CHLSLCompiler>(smart_refctd_ptr(system));																			//! note we are out of default logical device's compiler set scope so also a few special steps are required to compile our extension shaders to SPIRV
 			auto includeFinder = make_smart_refctd_ptr<IShaderCompiler::CIncludeFinder>(smart_refctd_ptr(system));

src/nbl/ext/ImGui/shaders/common.hlsl

@@ -1,55 +1,27 @@
-#ifdef __HLSL_VERSION
-	struct VSInput
-	{
-		[[vk::location(0)]] float2 position : POSITION;
-		[[vk::location(1)]] float2 uv : TEXCOORD0;
-		[[vk::location(2)]] float4 color : COLOR0;
-	};
-
-	struct PSInput
+ 
+namespace nbl::hlsl
+{
+	struct emulated_snorm16_t2
 	{
-		float4 position : SV_Position;
-		float2 uv : TEXCOORD0;
-		float4 color    : COLOR0;
-		uint drawID : SV_InstanceID;
-		float clip[4] : SV_ClipDistance;
+		uint32_t packed;
 	};
+}
 
+namespace nbl::ext::imgui
+{
 	struct PushConstants
 	{
 		uint64_t elementBDA;
 		uint64_t elementCount;
-		float2 scale;
-		float2 translate;
-		float4 viewport;
-	};
-	
-#else
-	struct PushConstants
-	{
-		uint64_t elementBDA;
-		uint64_t elementCount;
-		float scale[2];
-		float translate[2];
-		float viewport[4];
+		nbl::hlsl::float32_t2 scale;
+		nbl::hlsl::float32_t2 translate;
+		nbl::hlsl::float32_t4 viewport;
 	};
-#endif // __HLSL_VERSION
 
-struct emulated_snorm16_t2
-{
-	#ifdef __HLSL_VERSION
-	float32_t2 unpack() // returns in NDC [-1, 1] range
+	struct PerObjectData 
 	{
-		return clamp(float32_t2(x, y) / 32767.0f, -1.f, +1.f);
-	}
-	#endif
-
-	int16_t x, y;
-};
-
-struct PerObjectData 
-{
-	emulated_snorm16_t2 aabbMin, aabbMax;
-	uint16_t texId : 14;
-	uint16_t samplerIx : 2;
-};
+		nbl::hlsl::emulated_snorm16_t2 aabbMin, aabbMax;
+		uint32_t texId : 26;
+		uint32_t samplerIx : 6;
+	};
+}

src/nbl/ext/ImGui/shaders/fragment.hlsl

@@ -23,6 +23,9 @@
 #endif
 
 #include "common.hlsl"
+#include "psinput.hlsl"
+
+using namespace nbl::ext::imgui;
 
 [[vk::push_constant]] struct PushConstants pc;
 

src/nbl/ext/ImGui/shaders/psinput.hlsl

@@ -0,0 +1,14 @@
+
+#ifdef __HLSL_VERSION
+namespace nbl::ext::imgui
+{
+	struct PSInput
+	{
+		float32_t4 position : SV_Position;
+		float32_t2 uv : TEXCOORD0;
+		float32_t4 color : COLOR0;
+		float32_t4 clip : SV_ClipDistance;
+		uint drawID : SV_InstanceID;
+	};
+}
+#endif // __HLSL_VERSION

src/nbl/ext/ImGui/shaders/vertex.hlsl

@@ -1,7 +1,16 @@
+#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
 #include "common.hlsl"
+#include "psinput.hlsl"
 
 [[vk::push_constant]] struct PushConstants pc;
 
+struct VSInput
+{
+    [[vk::location(0)]] float2 position : POSITION;
+    [[vk::location(1)]] float2 uv : TEXCOORD0;
+    [[vk::location(2)]] float4 color : COLOR0;
+};
+
 /*
     we use Indirect Indexed draw call to render whole GUI, note we do a cross 
     platform trick and use base instance index as replacement for gl_DrawID 
@@ -20,8 +29,8 @@ PSInput VSMain(VSInput input, uint drawID : SV_InstanceID)
 
     // NDC [-1, 1] range
     output.position = float4(input.position * pc.scale + pc.translate, 0, 1);
-    const float2 vMin = self.aabbMin.unpack();
-    const float2 vMax = self.aabbMax.unpack();
+    const float32_t2 vMin = nbl::hlsl::unpackSnorm2x16(self.aabbMin.packed);
+    const float32_t2 vMax = nbl::hlsl::unpackSnorm2x16(self.aabbMax.packed);
 
     // clip planes calculations, axis aligned
     output.clip[0] = output.position.x - vMin.x;

src/nbl/system/ISystem.cpp

@@ -312,10 +312,11 @@ bool ISystem::ICaller::flushMapping(IFile* file, size_t offset, size_t size)
     return retval;
 }
 
-void  ISystem::unmountBuiltins() {
+void ISystem::unmountBuiltins() {
 
     auto removeByKey = [&, this](const char* s) {
         auto range = m_cachedArchiveFiles.findRange(s);
+
         std::vector<core::smart_refctd_ptr<IFileArchive>> items_to_remove = {}; //is it always just 1 item?
         for (auto it = range.begin(); it != range.end(); ++it)
         {
@@ -326,8 +327,18 @@ void  ISystem::unmountBuiltins() {
             m_cachedArchiveFiles.removeObject(items_to_remove[i], s);
         }
     };
-    removeByKey("nbl/builtin");
+
+    removeByKey("nbl");
     removeByKey("spirv");
     removeByKey("boost");
-    
+}
+
+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())
+			return false;
+
+    return true;
 }