From 9cd86a3110499b35c16ba39306765b68908ad2ff Mon Sep 17 00:00:00 2001
From: Przemog1 <minikers21@gmail.com>
Date: Tue, 21 Jul 2026 19:19:32 +0200
Subject: [PATCH] Implemented matrix accessors

---
 include/nbl/builtin/hlsl/array_accessors.hlsl | 50 +++++++++++++++++++
 .../nbl/builtin/hlsl/emulated/matrix_t.hlsl   | 34 +++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/include/nbl/builtin/hlsl/array_accessors.hlsl b/include/nbl/builtin/hlsl/array_accessors.hlsl
index 73a4b83102..885306cf48 100644
--- a/include/nbl/builtin/hlsl/array_accessors.hlsl
+++ b/include/nbl/builtin/hlsl/array_accessors.hlsl
@@ -2,6 +2,8 @@
 #define _NBL_BUILTIN_HLSL_ARRAY_ACCESSORS_HLSL_INCLUDED_
 
 #include <nbl/builtin/hlsl/cpp_compat/basic.h>
+#include <nbl/builtin/hlsl/concepts.hlsl>
+#include <nbl/builtin/hlsl/matrix_utils/matrix_traits.hlsl>
 
 namespace nbl
 {
@@ -25,6 +27,54 @@ struct array_set
     }
 };
 
+namespace impl
+{
+
+template<typename T NBL_STRUCT_CONSTRAINABLE>
+struct MatrixComponentSetterHelper;
+template<typename T NBL_STRUCT_CONSTRAINABLE>
+struct MatrixComponentGetterHelper;
+
+// this concept will check whether MatrixType is a matrix and whether its component is a native type scalar, should work only for HLSL matrices
+#define MATRIX_COMPONENT_IS_NATIVE_TYPE nbl::hlsl::matrix_traits<MatrixType>::IsMatrix && nbl::hlsl::is_scalar_v<typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type>
+
+template<typename MatrixType>
+NBL_PARTIAL_REQ_TOP(MATRIX_COMPONENT_IS_NATIVE_TYPE)
+struct MatrixComponentSetterHelper<MatrixType NBL_PARTIAL_REQ_BOT(MATRIX_COMPONENT_IS_NATIVE_TYPE) >
+{
+    using ComponentType = typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type;
+    static void __call(NBL_REF_ARG(MatrixType) mat, uint16_t row, uint16_t column, ComponentType value)
+    {
+        mat[row][column] = value;
+    }
+};
+template<typename MatrixType>
+NBL_PARTIAL_REQ_TOP(MATRIX_COMPONENT_IS_NATIVE_TYPE)
+struct MatrixComponentGetterHelper<MatrixType NBL_PARTIAL_REQ_BOT(MATRIX_COMPONENT_IS_NATIVE_TYPE) >
+{
+    using ComponentType = typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type;
+    static ComponentType __call(NBL_REF_ARG(MatrixType) mat, uint16_t row, uint16_t column)
+    {
+        return mat[row][column];
+    }
+};
+
+#undef MATRIX_COMPONENT_IS_NATIVE_TYPE
+
+}
+
+template<typename MatrixType>
+void matrix_component_set(NBL_REF_ARG(MatrixType) mat, uint16_t row, uint16_t column, typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type value)
+{
+    impl::MatrixComponentSetterHelper<MatrixType>::__call(mat, row, column, value);
+}
+
+template<typename MatrixType>
+typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type matrix_component_get(NBL_REF_ARG(MatrixType) mat, uint16_t row, uint16_t column)
+{
+    return impl::MatrixComponentGetterHelper<MatrixType>::__call(mat, row, column);
+}
+
 }
 }
 
diff --git a/include/nbl/builtin/hlsl/emulated/matrix_t.hlsl b/include/nbl/builtin/hlsl/emulated/matrix_t.hlsl
index d605538e36..7bc0efee79 100644
--- a/include/nbl/builtin/hlsl/emulated/matrix_t.hlsl
+++ b/include/nbl/builtin/hlsl/emulated/matrix_t.hlsl
@@ -4,6 +4,7 @@
 #include <nbl/builtin/hlsl/portable/float64_t.hlsl>
 #include <nbl/builtin/hlsl/emulated/vector_t.hlsl>
 #include <nbl/builtin/hlsl/matrix_utils/matrix_traits.hlsl>
+#include <nbl/builtin/hlsl/array_accessors.hlsl>
 
 namespace nbl
 {
@@ -143,6 +144,39 @@ struct mul_helper<emulated_matrix<ComponentT, RowCount, ColumnCount>, emulated_v
 };
 }
 
+namespace impl
+{
+
+// this concept will check whether MatrixType is a matrix and whether its component is not a native type scalar, should work only for emulated matrices
+#define MATRIX_COMPONENT_IS_EMULATED nbl::hlsl::matrix_traits<MatrixType>::IsMatrix && !nbl::hlsl::is_scalar_v<typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type> && (nbl::hlsl::concepts::FloatingPointLikeScalar<typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type> || nbl::hlsl::concepts::IntegralLikeScalar<typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type>)
+
+template<typename MatrixType>
+NBL_PARTIAL_REQ_TOP(MATRIX_COMPONENT_IS_EMULATED)
+struct MatrixComponentSetterHelper<MatrixType NBL_PARTIAL_REQ_BOT(MATRIX_COMPONENT_IS_EMULATED) >
+{
+    using ComponentType = typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type;
+    static void __call(NBL_REF_ARG(MatrixType) mat, uint16_t row, uint16_t column, ComponentType value)
+    {
+       mat.rows[row].setComponent(column, value);
+    }
+};
+
+template<typename MatrixType>
+NBL_PARTIAL_REQ_TOP(MATRIX_COMPONENT_IS_EMULATED)
+struct MatrixComponentGetterHelper<MatrixType NBL_PARTIAL_REQ_BOT(MATRIX_COMPONENT_IS_EMULATED) >
+{
+    using ComponentType = typename nbl::hlsl::matrix_traits<MatrixType>::scalar_type;
+    static ComponentType __call(NBL_REF_ARG(MatrixType) mat, uint16_t row, uint16_t column)
+    {
+        return mat.rows[row].getComponent(column);
+    }
+};
+
+#undef MATRIX_COMPONENT_IS_EMULATED
+
+}
+
+
 }
 }
 #endif