Cpp compat intrinsics refactor

include/nbl/builtin/hlsl/array_accessors.hlsl

@@ -0,0 +1,30 @@
+#ifndef _NBL_BUILTIN_HLSL_ARRAY_ACCESSORS_HLSL_INCLUDED_
+#define _NBL_BUILTIN_HLSL_ARRAY_ACCESSORS_HLSL_INCLUDED_
+
+#include <nbl/builtin/hlsl/cpp_compat/basic.h>
+
+namespace nbl
+{
+namespace hlsl
+{
+template<typename ArrayType, typename ComponentType, typename I = uint32_t>
+struct array_get
+{
+    ComponentType operator()(NBL_CONST_REF_ARG(ArrayType) arr, const I ix) NBL_CONST_MEMBER_FUNC
+    {
+        return arr[ix];
+    }
+};
+
+template<typename ArrayType, typename ComponentType, typename I = uint32_t>
+struct array_set
+{
+    void operator()(NBL_REF_ARG(ArrayType) arr, I index, ComponentType val) NBL_CONST_MEMBER_FUNC
+    {
+        arr[index] = val;
+    }
+};
+}
+}
+
+#endif

include/nbl/builtin/hlsl/cpp_compat.hlsl

@@ -3,7 +3,7 @@
 
 #include <nbl/builtin/hlsl/cpp_compat/basic.h>
 // it includes vector and matrix
-#include <nbl/builtin/hlsl/cpp_compat/intrinsics.h>
+#include <nbl/builtin/hlsl/cpp_compat/intrinsics.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat/promote.hlsl>
 
 #endif

include/nbl/builtin/hlsl/cpp_compat/basic.h

@@ -55,8 +55,12 @@ namespace nbl::hlsl
 
 // We need variadic macro in order to handle multi parameter templates because the 
 // preprocessor parses the template parameters as different macro parameters.
-#define NBL_REF_ARG(...) typename nbl::hlsl::add_reference<__VA_ARGS__ >::type
-#define NBL_CONST_REF_ARG(...) typename nbl::hlsl::add_reference<std::add_const_t<__VA_ARGS__ >>::type
+#define NBL_REF_ARG(...) __VA_ARGS__&
+#define NBL_CONST_REF_ARG(...) const __VA_ARGS__&
+
+// NOTE: implementation below will mess up template parameter deduction
+//#define NBL_REF_ARG(...) typename nbl::hlsl::add_reference<__VA_ARGS__ >::type
+//#define NBL_CONST_REF_ARG(...) typename nbl::hlsl::add_reference<std::add_const_t<__VA_ARGS__ >>::type
 
 #else