Merge pull request #908 from Devsh-Graphics-Programming/fix_unorthodox_matmul

Przemog1 · web-flow · commit 2dce27d5553d · 2025-08-19T19:10:12.000+02:00
Fix small bug in matrix preventing product of unorthodox matrix sizes
diff --git a/include/nbl/builtin/hlsl/cpp_compat/matrix.hlsl b/include/nbl/builtin/hlsl/cpp_compat/matrix.hlsl
@@ -34,7 +34,7 @@ struct matrix final : private glm::mat<N,M,T>
     template<uint16_t K>
     inline friend matrix<T, N, K> mul(matrix const& lhs, matrix<T, M, K> const& rhs)
     {
-        return matrix<T, N, K>(glm::operator*(reinterpret_cast<Base const&>(rhs), reinterpret_cast<matrix<T, M, K>::Base const&>(lhs)));
+        return matrix<T, N, K>(glm::operator*(reinterpret_cast<matrix<T, M, K>::Base const&>(rhs), reinterpret_cast<Base const&>(lhs)));
     }
     inline friend vector<T, N> mul(matrix const& lhs, vector<T, M> const& rhs)
     {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct matrix final : private glm::mat<N,M,T>`
`34`	`34`	`template<uint16_t K>`
`35`	`35`	`inline friend matrix<T, N, K> mul(matrix const& lhs, matrix<T, M, K> const& rhs)`
`36`	`36`	`{`
`37`		`- return matrix<T, N, K>(glm::operator*(reinterpret_cast<Base const&>(rhs), reinterpret_cast<matrix<T, M, K>::Base const&>(lhs)));`
	`37`	`+ return matrix<T, N, K>(glm::operator*(reinterpret_cast<matrix<T, M, K>::Base const&>(rhs), reinterpret_cast<Base const&>(lhs)));`
`38`	`38`	`}`
`39`	`39`	`inline friend vector<T, N> mul(matrix const& lhs, vector<T, M> const& rhs)`
`40`	`40`	`{`