Fully implemented intrinsics.hlsl

Author: Przemog1

include/nbl/builtin/hlsl/cpp_compat/intrinsics.hlsl

@@ -23,7 +23,7 @@ template<typename Integer>
 int bitCount(NBL_CONST_REF_ARG(Integer) val)
 {
 #ifdef __HLSL_VERSION
-
+	return countbits(val);
 #else
 	return glm::bitCount(val);
 #endif
@@ -33,7 +33,7 @@ template<typename T>
 vector<T, 3> cross(NBL_CONST_REF_ARG(vector<T, 3>) lhs, NBL_CONST_REF_ARG(vector<T, 3>) rhs)
 {
 #ifdef __HLSL_VERSION
-
+	return spirv::cross(lhs, rhs);
 #else
 	return glm::cross(lhs, rhs);
 #endif
@@ -43,7 +43,7 @@ template<typename T>
 T clamp(NBL_CONST_REF_ARG(T) val, NBL_CONST_REF_ARG(T) min, NBL_CONST_REF_ARG(T) max)
 {
 #ifdef __HLSL_VERSION
-
+	return clamp(val, min, max);
 #else
 	return glm::clamp(val, min, max);
 #endif
@@ -185,7 +185,7 @@ template<typename T, uint16_t N, uint16_t M>
 inline matrix<T, N, M> inverse(NBL_CONST_REF_ARG(matrix<T, N, M>) m)
 {
 #ifdef __HLSL_VERSION
-
+	return spirv::matrixInverse(m);
 #else
 	return reinterpret_cast<matrix<T, N, M>&>(glm::inverse(reinterpret_cast<typename matrix<T, N, M>::Base const&>(m)));
 #endif
@@ -195,7 +195,7 @@ template<typename T, typename U>
 inline T lerp(NBL_CONST_REF_ARG(T) x, NBL_CONST_REF_ARG(T) y, NBL_CONST_REF_ARG(U) a)
 {
 #ifdef __HLSL_VERSION
-
+	return spirv::fMix(x, y, a);
 #else
 	if constexpr (std::is_same_v<U, bool>)
 		return a ? y : x;
@@ -220,7 +220,7 @@ template<typename T, uint16_t N, uint16_t M>
 inline matrix<T, M, N> transpose(NBL_CONST_REF_ARG(matrix<T, N, M>) m)
 {
 #ifdef __HLSL_VERSION
-
+	return spirv::transpose(m);
 #else
 	return reinterpret_cast<matrix<T, M, N>&>(glm::transpose(reinterpret_cast<typename matrix<T, N, M>::Base const&>(m)));
 #endif

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -258,6 +258,10 @@ template<typename FloatingPoint>
 [[vk::ext_instruction( spv::OpIsInf )]]
 enable_if_t<is_floating_point_v<FloatingPoint>, bool> isInf(FloatingPoint val);
 
+template<typename Matrix>
+[[vk::ext_instruction( spv::OpTranspose )]]
+Matrix transpose(NBL_CONST_REF_ARG(Matrix) mat);
+
 }
 
 #endif

include/nbl/builtin/hlsl/spirv_intrinsics/glsl.std.450.hlsl

@@ -38,6 +38,18 @@ template<typename FloatingPoint>
 [[vk::ext_instruction(GLSLstd450::GLSLstd450Floor, "GLSL.std.450")]]
 enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> floor(FloatingPoint val);
 
+template<typename FloatingPoint>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450Cross, "GLSL.std.450")]]
+enable_if_t<is_floating_point_v<FloatingPoint>, vector<FloatingPoint, 3> > cross(in vector<FloatingPoint, 3> lhs, in vector<FloatingPoint, 3> rhs);
+
+template<typename FloatingPoint>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450FMix, "GLSL.std.450")]]
+enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> fMix(FloatingPoint val);
+
+template<typename SquareMatrix>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450Determinant, "GLSL.std.450")]]
+SquareMatrix determinant(in SquareMatrix mat);
+
 }
 }
 }