fix + optimize aabb vertex calc, includes

Author: keptsecret

include/nbl/ext/DebugDraw/builtin/hlsl/aabb_instances.vertex.hlsl

@@ -1,8 +1,5 @@
 #pragma shader_stage(vertex)
 
-#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
-#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
-#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
 #include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"
 
 using namespace nbl::hlsl;
@@ -13,19 +10,8 @@ using namespace nbl::ext::debug_draw;
 [shader("vertex")]
 PSInput main()
 {
-    const float32_t3 unitAABBVertices[8] = {
-        float32_t3(0.0, 0.0, 0.0),
-        float32_t3(1.0, 0.0, 0.0),
-        float32_t3(0.0, 0.0, 1.0),
-        float32_t3(1.0, 0.0, 1.0),
-        float32_t3(0.0, 1.0, 0.0),
-        float32_t3(1.0, 1.0, 0.0),
-        float32_t3(0.0, 1.0, 1.0),
-        float32_t3(1.0, 1.0, 1.0)
-    };
-
     PSInput output;
-    float32_t3 vertex = unitAABBVertices[glsl::gl_VertexIndex()];
+    const float32_t3 vertex = getUnitAABBVertex();
     InstanceData instance = vk::BufferPointer<InstanceData>(pc.pInstanceBuffer + sizeof(InstanceData) * glsl::gl_InstanceIndex()).Get();
 
     output.position = math::linalg::promoted_mul(instance.transform, vertex);

include/nbl/ext/DebugDraw/builtin/hlsl/common.hlsl

@@ -2,6 +2,11 @@
 #define _NBL_DEBUG_DRAW_EXT_COMMON_HLSL
 
 #include "nbl/builtin/hlsl/cpp_compat.hlsl"
+#ifdef __HLSL_VERSION
+#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
+#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
+#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
+#endif
 
 namespace nbl
 {
@@ -30,8 +35,13 @@ struct SPushConstants
 struct PSInput
 {
     float32_t4 position : SV_Position;
-    float32_t4 color : TEXCOORD0;
+    nointerpolation float32_t4 color : TEXCOORD0;
 };
+
+float32_t3 getUnitAABBVertex()
+{
+    return (hlsl::promote<uint32_t3>(hlsl::glsl::gl_VertexIndex()) >> uint32_t3(0,2,1)) & 0x1u;
+}
 #endif
 
 }

include/nbl/ext/DebugDraw/builtin/hlsl/single.vertex.hlsl

@@ -1,8 +1,5 @@
 #pragma shader_stage(vertex)
 
-#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
-#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
-#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
 #include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"
 
 using namespace nbl::hlsl;
@@ -13,19 +10,8 @@ using namespace nbl::ext::debug_draw;
 [shader("vertex")]
 PSInput main()
 {
-    const float32_t3 unitAABBVertices[8] = {
-        float32_t3(0.0, 0.0, 0.0),
-        float32_t3(1.0, 0.0, 0.0),
-        float32_t3(0.0, 0.0, 1.0),
-        float32_t3(1.0, 0.0, 1.0),
-        float32_t3(0.0, 1.0, 0.0),
-        float32_t3(1.0, 1.0, 0.0),
-        float32_t3(0.0, 1.0, 1.0),
-        float32_t3(1.0, 1.0, 1.0)
-    };
-
     PSInput output;
-    float32_t3 vertex = unitAABBVertices[glsl::gl_VertexIndex()];
+    float32_t3 vertex = getUnitAABBVertex();
 
     output.position = math::linalg::promoted_mul(pc.instance.transform, vertex);
     output.color = pc.instance.color;