update shaders

Author: AnastaZIuk

src/nbl/ext/ImGui/ImGui.cpp

@@ -16,6 +16,7 @@ using namespace nbl::video;
 using namespace nbl::core;
 using namespace nbl::asset;
 using namespace nbl::ui;
+using namespace nbl::hlsl;
 
 namespace nbl::ext::imgui
 {
@@ -1165,16 +1166,19 @@ namespace nbl::ext::imgui
 
 										auto packSnorm16 = [](float ndc) -> int16_t
 										{
-											return std::round<int16_t>(std::clamp(ndc, -1.0f, 1.0f) * 32767.0f); // TODO: ok encodePixels<asset::EF_R16_SNORM, double>(void* _pix, const double* _input) but iirc we have issues with our encode/decode utils
+											return std::round<int16_t>(std::clamp(ndc, -1.0f, 1.0f) * 32767.0f);
+										};
+
+										auto packToUint32 = [](uint16_t x, uint16_t y) -> uint32_t
+										{
+											return (static_cast<uint32_t>(x) << 16) | static_cast<uint32_t>(y);
 										};
 
 										const auto vMin = trs.toNDC(core::vector2df_SIMD(scissor.offset.x, scissor.offset.y));
 										const auto vMax = trs.toNDC(core::vector2df_SIMD(scissor.offset.x + scissor.extent.width, scissor.offset.y + scissor.extent.height));
 
-										element->aabbMin.x = packSnorm16(vMin.x);
-										element->aabbMin.y = packSnorm16(vMin.y);
-										element->aabbMax.x = packSnorm16(vMax.x);
-										element->aabbMax.y = packSnorm16(vMax.y);
+										element->aabbMin = packToUint32(packSnorm16(vMin.x), packSnorm16(vMin.y));
+										element->aabbMax = packToUint32(packSnorm16(vMax.x), packSnorm16(vMax.y));
 										element->texId = pcmd->TextureId.textureID;
 										element->samplerIx = pcmd->TextureId.samplerIx;
 									}

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

@@ -1,13 +1,10 @@
- 
-namespace nbl::hlsl
-{
-	struct emulated_snorm16_t2
-	{
-		uint32_t packed;
-	};
-}
+#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
 
-namespace nbl::ext::imgui
+namespace nbl
+{
+namespace ext
+{
+namespace imgui
 {
 	struct PushConstants
 	{
@@ -20,8 +17,10 @@ namespace nbl::ext::imgui
 
 	struct PerObjectData 
 	{
-		nbl::hlsl::emulated_snorm16_t2 aabbMin, aabbMax;
+		uint32_t aabbMin, aabbMax; //! snorm16_t2 packed as [uint16_t, uint16_t]
 		uint32_t texId : 26;
 		uint32_t samplerIx : 6;
 	};
 }
+}
+}

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

@@ -1,6 +1,9 @@
-
 #ifdef __HLSL_VERSION
-namespace nbl::ext::imgui
+namespace nbl
+{
+namespace ext
+{
+namespace imgui
 {
 	struct PSInput
 	{
@@ -11,4 +14,6 @@ namespace nbl::ext::imgui
 		uint drawID : SV_InstanceID;
 	};
 }
-#endif // __HLSL_VERSION
+}
+}
+#endif // __HLSL_VERSION

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

@@ -1,8 +1,7 @@
-#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
 #include "common.hlsl"
 #include "psinput.hlsl"
 
-[[vk::push_constant]] struct PushConstants pc;
+[[vk::push_constant]] struct nbl::ext::imgui::PushConstants pc;
 
 struct VSInput
 {
@@ -17,20 +16,21 @@ struct VSInput
     to request per object data with BDA
 */
 
-PSInput VSMain(VSInput input, uint drawID : SV_InstanceID)
+nbl::ext::imgui::PSInput VSMain(VSInput input, uint drawID : SV_InstanceID)
 {
-    PSInput output;
+    nbl::ext::imgui::PSInput output;
     output.color = input.color;
     output.uv = input.uv;
     output.drawID = drawID;
 
     // BDA for requesting object data
-    const PerObjectData self = vk::RawBufferLoad<PerObjectData>(pc.elementBDA + sizeof(PerObjectData)* drawID);
+    const nbl::ext::imgui::PerObjectData self = vk::RawBufferLoad<nbl::ext::imgui::PerObjectData>(pc.elementBDA + sizeof(nbl::ext::imgui::PerObjectData)* drawID);
 
     // NDC [-1, 1] range
     output.position = float4(input.position * pc.scale + pc.translate, 0, 1);
-    const float32_t2 vMin = nbl::hlsl::unpackSnorm2x16(self.aabbMin.packed);
-    const float32_t2 vMax = nbl::hlsl::unpackSnorm2x16(self.aabbMax.packed);
+    
+    const float32_t2 vMin = nbl::hlsl::glsl::unpackSnorm2x16(self.aabbMin);
+    const float32_t2 vMax = nbl::hlsl::glsl::unpackSnorm2x16(self.aabbMax);
 
     // clip planes calculations, axis aligned
     output.clip[0] = output.position.x - vMin.x;