Make the foundational types available in nbl::hlsl namespace for HLSL too

New DXC bug: microsoft/DirectXShaderCompiler#6005

Author: devshgraphicsprogramming

include/nbl/builtin/hlsl/cpp_compat.hlsl

@@ -33,9 +33,6 @@ using add_pointer = std::add_pointer<T>;
 #define NBL_REF_ARG(T) typename nbl::hlsl::add_reference<T>::type
 #define NBL_CONST_REF_ARG(T) typename nbl::hlsl::add_reference<std::add_const_t<T>>::type
 
-// it includes vector and matrix
-#include <nbl/builtin/hlsl/cpp_compat/intrinsics.h>
-
 #else
 
 #define ARROW .arrow().
@@ -68,4 +65,7 @@ struct add_pointer
 
 #endif
 
+// it includes vector and matrix
+#include <nbl/builtin/hlsl/cpp_compat/intrinsics.h>
+
 #endif

include/nbl/builtin/hlsl/cpp_compat/matrix.hlsl

@@ -3,10 +3,11 @@
 
 #include <nbl/builtin/hlsl/cpp_compat/vector.hlsl>
 
-#ifndef __HLSL_VERSION
-namespace nbl::hlsl
+namespace nbl
 {
-
+namespace hlsl
+{
+#ifndef __HLSL_VERSION
 template<typename T, uint16_t N, uint16_t M>
 struct matrix final : private glm::mat<N,M,T>
 {
@@ -55,12 +56,13 @@ struct matrix final : private glm::mat<N,M,T>
         return glm::transpose(reinterpret_cast<Base const&>(m));
     }
 };
+#endif
 
 
 #define NBL_TYPEDEF_MATRICES_FOR_ROW(T, R) \
-using T ## R ## x4 = matrix<T, R, 4>; \
-using T ## R ## x3 = matrix<T, R, 3>; \
-using T ## R ## x2 = matrix<T, R, 2>; 
+typedef matrix<T, R, 4> T ## R ## x4; \
+typedef matrix<T, R, 3> T ## R ## x3; \
+typedef matrix<T, R, 2> T ## R ## x2; 
 
 #define NBL_TYPEDEF_MATRICES_FOR_SCALAR(T) \
     NBL_TYPEDEF_MATRICES_FOR_ROW(T, 4) \
@@ -80,8 +82,7 @@ NBL_TYPEDEF_MATRICES_FOR_SCALAR(float64_t);
 
 #undef NBL_TYPEDEF_MATRICES_FOR_ROW
 #undef NBL_TYPEDEF_MATRICES_FOR_SCALAR
-
 }
-#endif
+}
 
 #endif

include/nbl/builtin/hlsl/cpp_compat/vector.hlsl

@@ -1,56 +1,21 @@
 #ifndef _NBL_BUILTIN_HLSL_CPP_COMPAT_VECTOR_INCLUDED_
 #define _NBL_BUILTIN_HLSL_CPP_COMPAT_VECTOR_INCLUDED_
 
+// stuff for C++
 #ifndef __HLSL_VERSION 
+#include <stdint.h>
+
+#include <half.h>
 
 #define GLM_FORCE_SWIZZLE
 #include <glm/glm.hpp>
 #include <glm/detail/_swizzle.hpp>
-#include <stdint.h>
-#include <half.h>
 
 namespace nbl::hlsl
 {
-
 template<typename T, uint16_t N>
 using vector = glm::vec<N, T>;
 
-// ideally we should have sized bools, but no idea what they'd be
-using bool4 = vector<bool, 4>;
-using bool3 = vector<bool, 3>;
-using bool2 = vector<bool, 2>;
-using bool1 = vector<bool, 1>;
-
-using int32_t4 = vector<int32_t, 4>;
-using int32_t3 = vector<int32_t, 3>;
-using int32_t2 = vector<int32_t, 2>;
-using int32_t1 = vector<int32_t, 1>;
-
-using uint32_t4 = vector<uint32_t, 4>;
-using uint32_t3 = vector<uint32_t, 3>;
-using uint32_t2 = vector<uint32_t, 2>;
-using uint32_t1 = vector<uint32_t, 1>;
-
-// TODO: halfN -> needs class implementation or C++23 std:float16_t
-
-using float16_t = half;
-using float16_t4 = vector<float16_t, 4>;
-using float16_t3 = vector<float16_t, 3>;
-using float16_t2 = vector<float16_t, 2>;
-using float16_t1 = vector<float16_t, 1>;
-
-using float32_t = float;
-using float32_t4 = vector<float32_t, 4>;
-using float32_t3 = vector<float32_t, 3>;
-using float32_t2 = vector<float32_t, 2>;
-using float32_t1 = vector<float32_t, 1>;
-
-using float64_t = double;
-using float64_t4 = vector<float64_t, 4>;
-using float64_t3 = vector<float64_t, 3>;
-using float64_t2 = vector<float64_t, 2>;
-using float64_t1 = vector<float64_t, 1>;
-
 template<typename T, uint16_t N>
 glm::vec<N, bool> operator<(const glm::vec<N, T>& lhs, const glm::vec<N, T>& rhs)
 {
@@ -77,4 +42,38 @@ glm::vec<N, bool> operator>=(const glm::vec<N, T>& lhs, const glm::vec<N, T>& rh
 }
 #endif
 
+// general typedefs for both langs
+namespace nbl
+{
+namespace hlsl
+{
+typedef half float16_t;
+typedef float float32_t;
+typedef double float64_t;
+
+#define NBL_TYPEDEF_VECTORS(T) \
+typedef vector<T,4> T ## 4; \
+typedef vector<T,3> T ## 3; \
+typedef vector<T,2> T ## 2; \
+typedef vector<T,1> T ## 1
+
+// ideally we should have sized bools, but no idea what they'd be
+NBL_TYPEDEF_VECTORS(bool);
+
+NBL_TYPEDEF_VECTORS(int16_t);
+NBL_TYPEDEF_VECTORS(int32_t);
+NBL_TYPEDEF_VECTORS(int64_t);
+
+NBL_TYPEDEF_VECTORS(uint16_t);
+NBL_TYPEDEF_VECTORS(uint32_t);
+NBL_TYPEDEF_VECTORS(uint64_t);
+
+NBL_TYPEDEF_VECTORS(float16_t);
+NBL_TYPEDEF_VECTORS(float32_t);
+NBL_TYPEDEF_VECTORS(float64_t);
+
+#undef NBL_TYPEDEF_VECTORS
+}
+}
+
 #endif