Maths for HLSL BxDFs (template cmath, tgmath)

include/nbl/builtin/hlsl/concepts.hlsl

@@ -68,7 +68,7 @@ concept NBL_CONCEPT_NAME = requires BOOST_PP_EXPR_IF(LOCAL_PARAM_COUNT,(BOOST_PP
 //
 #define NBL_IMPL_CONCEPT_REQ_TYPE(...) typename __VA_ARGS__;
 #define NBL_IMPL_CONCEPT_REQ_EXPR(...) __VA_ARGS__;
-#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) {E}; C<decltype E,__VA_ARGS__ >;
+#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) {E}; C<decltype E __VA_OPT__(,) __VA_ARGS__ >;
 //
 #define NBL_IMPL_CONCEPT (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
 //
@@ -77,56 +77,8 @@ concept NBL_CONCEPT_NAME = requires BOOST_PP_EXPR_IF(LOCAL_PARAM_COUNT,(BOOST_PP
 #define NBL_CONCEPT_END(SEQ) BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_CONCEPT_END_DEF, DUMMY, SEQ) \
 }
 
-
-#include <concepts>
-
-// Alias some of the std concepts in nbl. As this is C++20 only, we don't need to use
-// the macros here.
-template <typename T, typename U>
-concept same_as = std::same_as<T, U>;
-
-template <typename D, typename B>
-concept derived_from = std::derived_from<D, B>;
-
-template <typename F, typename T>
-concept convertible_to = std::convertible_to<F, T>;
-
-template <typename T, typename F>
-concept assignable_from = std::assignable_from<T, F>;
-
-template <typename T, typename U>
-concept common_with = std::common_with<T, U>;
-
-template <typename T>
-concept integral = std::integral<T>;
-
-template <typename T>
-concept signed_integral = std::signed_integral<T>;
-
-template <typename T>
-concept unsigned_integral = std::unsigned_integral<T>;
-
-template <typename T>
-concept floating_point = std::floating_point<T>;
-
-
-// Some other useful concepts.
-
-template<typename T, typename... Ts>
-concept any_of = (same_as<T, Ts> || ...);
-
-template <typename T>
-concept scalar = floating_point<T> || integral<T>;
-
-template <typename T>
-concept vectorial = is_vector<T>::value;
-
-template <typename T>
-concept matricial = is_matrix<T>::value;
-
 #else
 
-
 // to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
 #define NBL_BOOL_CONCEPT NBL_CONSTEXPR bool
 
@@ -144,7 +96,6 @@ concept matricial = is_matrix<T>::value;
 // condition, use instead of the closing `>` of a function template
 #define NBL_FUNC_REQUIRES(...) ,::nbl::hlsl::enable_if_t<(__VA_ARGS__),bool> = true>
 
-
 //
 #define NBL_CONCEPT_BEGIN(LOCAL_PARAM_COUNT) namespace BOOST_PP_CAT(__concept__,NBL_CONCEPT_NAME) \
 {
@@ -153,7 +104,7 @@ concept matricial = is_matrix<T>::value;
 //
 #define NBL_IMPL_CONCEPT_REQ_TYPE(...) ::nbl::hlsl::make_void_t<typename __VA_ARGS__ >
 #define NBL_IMPL_CONCEPT_REQ_EXPR(...) ::nbl::hlsl::make_void_t<decltype(__VA_ARGS__)>
-#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) ::nbl::hlsl::enable_if_t<C<decltype E ,__VA_ARGS__  > >
+#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) ::nbl::hlsl::enable_if_t<C<decltype E __VA_OPT__(,) __VA_ARGS__  > >
 //
 #define NBL_IMPL_CONCEPT_SFINAE (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
 //

include/nbl/builtin/hlsl/concepts/core.hlsl

@@ -0,0 +1,80 @@
+// Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_CORE_HLSL_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_CORE_HLSL_INCLUDED_
+
+
+#include <nbl/builtin/hlsl/concepts.hlsl>
+#include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl>
+#include <nbl/builtin/hlsl/type_traits.hlsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace concepts
+{
+
+template<typename T, typename U>
+NBL_BOOL_CONCEPT same_as = is_same_v<T, U>;
+
+template<typename T>
+NBL_BOOL_CONCEPT Integral = nbl::hlsl::is_integral_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT SignedIntegral = nbl::hlsl::is_signed_v<T> && nbl::hlsl::is_integral_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT UnsignedIntegral = !nbl::hlsl::is_signed_v<T> && ::nbl::hlsl::is_integral_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT FloatingPoint = nbl::hlsl::is_floating_point_v<T>;
+
+template <typename T>
+NBL_BOOL_CONCEPT Scalar = nbl::hlsl::is_scalar_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT IntegralScalar = nbl::hlsl::is_integral_v<T> && nbl::hlsl::is_scalar_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT SignedIntegralScalar = nbl::hlsl::is_signed_v<T> && nbl::hlsl::is_integral_v<T> && nbl::hlsl::is_scalar_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT UnsignedIntegralScalar = !nbl::hlsl::is_signed_v<T> && ::nbl::hlsl::is_integral_v<T> && nbl::hlsl::is_scalar_v<T>;
+
+template<typename T>
+NBL_BOOL_CONCEPT FloatingPointScalar = nbl::hlsl::is_floating_point_v<T> && nbl::hlsl::is_scalar_v<T>;
+
+// TODO: implement when hlsl::is_base_of is done
+//#define NBL_CONCEPT_NAME DerivedFrom
+// ...
+
+// TODO: implement when hlsl::is_converible is done
+//#define NBL_CONCEPT_NAME ConvertibleTo
+// ...
+
+// TODO?
+//#define NBL_CONCEPT_NAME AssignableFrom
+
+// TODO?
+//template <typename T, typename U>
+//concept common_with = std::common_with<T, U>;
+
+namespace impl
+{
+template<typename T>
+struct IsEmulatingFloatingPointType
+{
+	static const bool value = nbl::hlsl::is_floating_point_v<T>;
+};
+}
+
+//! Floating point types are native floating point types or types that imitate native floating point types (for example emulated_float64_t)
+template<typename T>
+NBL_BOOL_CONCEPT FloatingPointLikeScalar = impl::IsEmulatingFloatingPointType<T>::value;
+
+}
+}
+}
+#endif

include/nbl/builtin/hlsl/concepts/matrix.hlsl

@@ -0,0 +1,27 @@
+// Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_MATRIX_HLSL_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_MATRIX_HLSL_INCLUDED_
+
+
+#include <nbl/builtin/hlsl/concepts.hlsl>
+#include <nbl/builtin/hlsl/matrix_utils/matrix_traits.hlsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace concepts
+{
+
+template<typename T>
+NBL_BOOL_CONCEPT Matrix = is_matrix<T>::value;
+
+template<typename T>
+NBL_BOOL_CONCEPT Matricial = matrix_traits<T>::IsMatrix;
+
+}
+}
+}
+#endif

include/nbl/builtin/hlsl/concepts/vector.hlsl

@@ -0,0 +1,48 @@
+// Copyright (C) 2024-2025 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_BUILTIN_HLSL_CONCEPTS_VECTOR_HLSL_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_VECTOR_HLSL_INCLUDED_
+
+
+#include <nbl/builtin/hlsl/concepts.hlsl>
+#include <nbl/builtin/hlsl/concepts/core.hlsl>
+#include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl>
+#include <nbl/builtin/hlsl/type_traits.hlsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace concepts
+{
+
+//! Concept for native vectors.
+template<typename T>
+NBL_BOOL_CONCEPT Vector = is_vector<T>::value;
+template<typename T>
+NBL_BOOL_CONCEPT FloatingPointVector = concepts::Vector<T> && concepts::FloatingPointScalar<typename vector_traits<T>::scalar_type>;
+template<typename T>
+NBL_BOOL_CONCEPT IntVector = concepts::Vector<T> && (is_integral_v<typename vector_traits<T>::scalar_type>);
+template<typename T>
+NBL_BOOL_CONCEPT SignedIntVector = concepts::Vector<T> && concepts::SignedIntegralScalar<typename vector_traits<T>::scalar_type>;
+
+//! Concept for native vectors and vector like structs.
+template<typename T>
+NBL_BOOL_CONCEPT Vectorial = vector_traits<T>::IsVector;
+
+#include <nbl/builtin/hlsl/concepts/__end.hlsl>
+
+template<typename T>
+NBL_BOOL_CONCEPT FloatingPointVectorial = concepts::Vectorial<T> && concepts::FloatingPointScalar<typename vector_traits<T>::scalar_type>;
+template<typename T>
+NBL_BOOL_CONCEPT FloatingPointLikeVectorial = concepts::Vectorial<T> && concepts::FloatingPointLikeScalar<typename vector_traits<T>::scalar_type>;
+template<typename T>
+NBL_BOOL_CONCEPT IntVectorial = concepts::Vectorial<T> && (is_integral_v<typename vector_traits<T>::scalar_type>);
+template<typename T>
+NBL_BOOL_CONCEPT SignedIntVectorial = concepts::Vectorial<T> && concepts::SignedIntegralScalar<typename vector_traits<T>::scalar_type>;
+
+}
+}
+}
+#endif