fix transpose when matrix N!=M

Author: keptsecret

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

@@ -159,7 +159,6 @@ template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(find_lsb_helper, findIL
 
 template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(bitReverse_helper, bitReverse, (T), (T), T)
 template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(dot_helper, dot, (T), (T)(T), typename vector_traits<T>::scalar_type)
-template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(transpose_helper, transpose, (T), (T), T)
 template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(length_helper, length, (T), (T), typename vector_traits<T>::scalar_type)
 template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(normalize_helper, normalize, (T), (T), T)
 template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(rsqrt_helper, inverseSqrt, (T), (T), T)
@@ -204,6 +203,17 @@ template<typename T> AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER(bitCount_helper, bitCou
 #undef ARG
 #undef AUTO_SPECIALIZE_TRIVIAL_CASE_HELPER
 
+template<typename Matrix> NBL_PARTIAL_REQ_TOP(concepts::Matrix<Matrix>)
+struct transpose_helper<Matrix NBL_PARTIAL_REQ_BOT(concepts::Matrix<Matrix>) >
+{
+	using transposed_t = typename matrix_traits<Matrix>::transposed_type;
+
+	static transposed_t __call(NBL_CONST_REF_ARG(Matrix) m)
+	{
+		using traits = matrix_traits<Matrix>;
+		return spirv::transpose<Matrix>(m);
+	}
+};
 template<typename UInt64> NBL_PARTIAL_REQ_TOP(is_same_v<UInt64, uint64_t>)
 struct find_msb_helper<UInt64 NBL_PARTIAL_REQ_BOT(is_same_v<UInt64, uint64_t>) >
 {

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

@@ -10,9 +10,11 @@
 #include "spirv/unified1/spirv.hpp"
 
 #include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl>
+#include <nbl/builtin/hlsl/matrix_utils/matrix_traits.hlsl>
 #include <nbl/builtin/hlsl/type_traits.hlsl>
 #include <nbl/builtin/hlsl/concepts.hlsl>
 #include <nbl/builtin/hlsl/concepts/vector.hlsl>
+#include <nbl/builtin/hlsl/concepts/matrix.hlsl>
 
 namespace nbl 
 {
@@ -331,9 +333,9 @@ template<typename Vector NBL_FUNC_REQUIRES(is_vector_v<Vector>)
 [[vk::ext_instruction( spv::OpDot )]]
 typename vector_traits<Vector>::scalar_type dot(Vector lhs, Vector rhs);
 
-template<typename Matrix>
+template<typename Matrix NBL_FUNC_REQUIRES(is_matrix_v<Matrix>)
 [[vk::ext_instruction( spv::OpTranspose )]]
-Matrix transpose(Matrix mat);
+typename matrix_traits<Matrix>::transposed_type transpose(Matrix mat);
 
 template<typename Integral>
 [[vk::ext_instruction(spv::OpBitCount)]]