Refactored hlsl::cross function

Author: Przemog1

include/nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl

@@ -63,6 +63,29 @@ DEFINE_BUILTIN_VECTOR_SPECIALIZATION(float64_t, BUILTIN_VECTOR_SPECIALIZATION_RE
 #undef BUILTIN_VECTOR_SPECIALIZATION_RET_VAL
 #undef DEFINE_BUILTIN_VECTOR_SPECIALIZATION
 
+template<typename T NBL_STRUCT_CONSTRAINABLE>
+struct cross_helper;
+
+//! this specialization will work only with hlsl::vector<T, 3> type
+template<typename FloatingPointVector>
+NBL_PARTIAL_REQ_TOP(hlsl::is_floating_point_v<FloatingPointVector> && hlsl::is_vector_v<FloatingPointVector> && (vector_traits<FloatingPointVector>::Dimension == 3))
+struct cross_helper<FloatingPointVector NBL_PARTIAL_REQ_BOT(hlsl::is_floating_point_v<FloatingPointVector>&& hlsl::is_vector_v<FloatingPointVector>&& (vector_traits<FloatingPointVector>::Dimension == 3)) >
+{
+	static FloatingPointVector __call(NBL_CONST_REF_ARG(FloatingPointVector) lhs, NBL_CONST_REF_ARG(FloatingPointVector) rhs)
+	{
+#ifdef __HLSL_VERSION
+		return spirv::cross(lhs, rhs);
+#else
+		FloatingPointVector output;
+		output.x = lhs[1] * rhs[2] - rhs[1] * lhs[2];
+		output.y = lhs[2] * rhs[0] - rhs[2] * lhs[0];
+		output.z = lhs[0] * rhs[1] - rhs[0] * lhs[1];
+
+		return output;
+#endif
+	}
+};
+
 template<typename Integer>
 struct find_msb_helper;
 
@@ -455,6 +478,23 @@ struct bitCount_helper<EnumT>
 };
 #endif
 
+template<typename Vector NBL_STRUCT_CONSTRAINABLE>
+struct length_helper;
+
+template<typename Vector>
+NBL_PARTIAL_REQ_TOP(hlsl::is_floating_point_v<Vector>&& hlsl::is_vector_v<Vector>)
+struct length_helper<Vector NBL_PARTIAL_REQ_BOT(hlsl::is_floating_point_v<Vector>&& hlsl::is_vector_v<Vector>) >
+{
+	static inline typename vector_traits<Vector>::scalar_type __call(NBL_CONST_REF_ARG(Vector) vec)
+	{
+#ifdef __HLSL_VERSION
+		return spirv::length(vec);
+#else
+		return std::sqrt(dot_helper<Vector>::__call(vec, vec));
+#endif
+	}
+};
+
 template<typename Vector NBL_STRUCT_CONSTRAINABLE>
 struct normalize_helper;
 
@@ -465,9 +505,9 @@ struct normalize_helper<Vector NBL_PARTIAL_REQ_BOT(hlsl::is_floating_point_v<Vec
 	static inline Vector __call(NBL_CONST_REF_ARG(Vector) vec)
 	{
 #ifdef __HLSL_VERSION
-		return normalize(vec);
+		return spirv::normalize(vec);
 #else
-		return vec / std::sqrt(dot_helper<Vector>::__call(vec, vec));
+		return vec / length_helper<Vector>::__call(vec);
 #endif
 	}
 };

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

@@ -25,14 +25,10 @@ inline cpp_compat_intrinsics_impl::bitcount_output_t<Integer> bitCount(NBL_CONST
 	return cpp_compat_intrinsics_impl::bitCount_helper<Integer>::__call(val);
 }
 
-template<typename T>
-vector<T, 3> cross(NBL_CONST_REF_ARG(vector<T, 3>) lhs, NBL_CONST_REF_ARG(vector<T, 3>) rhs)
+template<typename FloatingPointVector>
+FloatingPointVector cross(NBL_CONST_REF_ARG(FloatingPointVector) lhs, NBL_CONST_REF_ARG(FloatingPointVector) rhs)
 {
-#ifdef __HLSL_VERSION
-	return spirv::cross(lhs, rhs);
-#else
-	return glm::cross(lhs, rhs);
-#endif
+	return cpp_compat_intrinsics_impl::cross_helper<FloatingPointVector>::__call(lhs, rhs);
 }
 
 template<typename T>
@@ -45,6 +41,12 @@ T clamp(NBL_CONST_REF_ARG(T) val, NBL_CONST_REF_ARG(T) min, NBL_CONST_REF_ARG(T)
 #endif
 }
 
+template<typename Vector>
+typename vector_traits<Vector>::scalar_type length(NBL_CONST_REF_ARG(Vector) vec)
+{
+	return cpp_compat_intrinsics_impl::length_helper<Vector>::__call(vec);
+}
+
 template<typename Vector>
 Vector normalize(NBL_CONST_REF_ARG(Vector) vec)
 {

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

@@ -91,6 +91,14 @@ float32_t4 unpackSnorm4x8(uint32_t p);
 [[vk::ext_instruction(GLSLstd450UnpackUnorm4x8, "GLSL.std.450")]]
 float32_t4 unpackUnorm4x8(uint32_t p);
 
+template<typename FloatingPointVector>
+[[vk::ext_instruction(GLSLstd450Length, "GLSL.std.450")]]
+enable_if_t<is_floating_point_v<FloatingPointVector>&& is_vector_v<FloatingPointVector>, FloatingPointVector> length(FloatingPointVector vec);
+
+template<typename FloatingPointVector>
+[[vk::ext_instruction(GLSLstd450Normalize, "GLSL.std.450")]]
+enable_if_t<is_floating_point_v<FloatingPointVector> && is_vector_v<FloatingPointVector>, FloatingPointVector> normalize(FloatingPointVector vec);
+
 }
 }
 }