NBL_UNROLL macro

Author: keptsecret

include/nbl/builtin/hlsl/macros.h

@@ -34,6 +34,12 @@ inline auto functionAlias(Args&&... args) -> decltype(origFunctionName(std::forw
 
 #endif
 
+#ifdef __HLSL_VERSION
+#define NBL_UNROLL [[unroll]]
+#else
+#define NBL_UNROLL
+#endif
+
 #ifdef __HLSL_VERSION // cause DXC is insane
 #define NBL_FP64_LITERAL(LIT) LIT##l
 #else // and nobody except GCC supports C++23 `f64` suffix on float literals

include/nbl/builtin/hlsl/math/linalg/fast_affine.hlsl

@@ -18,12 +18,6 @@ namespace math
 {
 namespace linalg
 {
-// TODO: move to macros
-#ifdef __HLSL_VERSION
-#define NBL_UNROLL [[unroll]]
-#else
-#define NBL_UNROLL
-#endif
 
 // Multiply matrices as-if extended to be filled with identity elements
 template<typename T, int N, int M, int P, int Q> 
@@ -82,7 +76,6 @@ vector<T,N> promoted_mul(NBL_CONST_REF_ARG(matrix<T,N,M>) lhs, const vector<T,P>
     }
     return retval;
 }
-#undef NBL_UNROLL
 
 // useful for fast computation of a Normal Matrix
 template<typename T, int N>

include/nbl/builtin/hlsl/shapes/aabb.hlsl

@@ -90,7 +90,6 @@ struct union_helper<AABB<D,Scalar>>
         return retval;
     }
 };
-#define NBL_UNROLL [[unroll]]
 // without a translation component
 template<int16_t D, typename Scalar>
 struct transform_helper<AABB<D,Scalar>,matrix<Scalar,D,D> >
@@ -131,7 +130,6 @@ struct transform_helper<AABB<D,Scalar>,matrix<Scalar,D,D+1> >
         return retval;
     }
 };
-#undef NBL_UNROLL
 }
 }