make concepts work

P.S. also make the HLSL `decltype` macro forward perfectly

Author: devsh

include/nbl/builtin/hlsl/blit/parameters.hlsl

@@ -44,6 +44,38 @@ struct parameters_t
 	}
 };
 
+struct parameters2_t
+{
+	float32_t3 fScale;
+	float32_t3 negativeSupportMinusHalf;
+	float32_t referenceAlpha;
+	uint32_t kernelWeightsOffsetY;
+	uint32_t kernelWeightsOffsetZ;
+	uint32_t inPixelCount;
+	uint32_t outPixelCount;
+
+	uint16_t3 inputDims;
+	uint16_t3 outputDims;
+	uint16_t3 windowDims;
+	uint16_t3 phaseCount;
+	uint16_t3 preloadRegion;
+	uint16_t3 iterationRegionXPrefixProducts;
+	uint16_t3 iterationRegionYPrefixProducts;
+	uint16_t3 iterationRegionZPrefixProducts;
+
+	//! Offset into the shared memory array which tells us from where the second buffer of shared memory begins
+	//! Given by max(memory_for_preload_region, memory_for_result_of_y_pass)
+	uint16_t secondScratchOffset;
+	uint16_t outputTexelsPerWGZ;
+
+	uint32_t3 getOutputTexelsPerWG()
+	{
+		//! `outputTexelsPerWG.xy` just happens to be in the first components of `iterationRegionsXPrefixProducts` and `iterationRegionYPrefixProducts` --this is
+		//! the result of how we choose to iterate, i.e. if, in the future, we decide to iterate differently, this needs to change.
+		return uint32_t3(iterationRegionXPrefixProducts.x, iterationRegionYPrefixProducts.x, outputTexelsPerWGZ);
+	}
+};
+
 
 }
 }

include/nbl/builtin/hlsl/concepts.hlsl

@@ -7,7 +7,7 @@
 
 #include <nbl/builtin/hlsl/cpp_compat/vector.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
-#include <nbl/builtin/hlsl/type_traits.hlsl>
+#include <nbl/builtin/hlsl/utility.hlsl>
 
 
 namespace nbl
@@ -148,20 +148,19 @@ concept matricial = is_matrix<T>::value;
 #define NBL_CONCEPT_BEGIN(LOCAL_PARAM_COUNT) namespace BOOST_PP_CAT(__concept__,NBL_CONCEPT_NAME) \
 {
 //
-#define NBL_CONCEPT_PARAM_T(ID,...) ::nbl::hlsl::impl::declval<__VA_ARGS__ >()
+#define NBL_CONCEPT_PARAM_T(ID,...) ::nbl::hlsl::experimental::declval<__VA_ARGS__ >()
 //
 #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,...) C<decltype E ,__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_SFINAE (typename=void,typename=void,bool=true)
-#define NBL_IMPL_CONCEPT_SFINAE_SPEC (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
+#define NBL_IMPL_CONCEPT_SFINAE (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
 //
-#define NBL_IMPL_CONCEPT_END_DEF(r,unused,i,e) template<NBL_CONCEPT_FULL_TPLT(), BOOST_PP_TUPLE_ELEM(BOOST_PP_SEQ_HEAD(e),NBL_IMPL_CONCEPT_SFINAE)> \
+#define NBL_IMPL_CONCEPT_END_DEF(r,unused,i,e) template<NBL_CONCEPT_FULL_TPLT(), typename=void> \
 struct BOOST_PP_CAT(__requirement,i) : ::nbl::hlsl::false_type {}; \
 template<NBL_CONCEPT_FULL_TPLT()> \
 struct BOOST_PP_CAT(__requirement,i)<NBL_CONCEPT_TPLT_PARAMS(), \
-NBL_EVAL(BOOST_PP_TUPLE_ELEM(BOOST_PP_SEQ_HEAD(e),NBL_IMPL_CONCEPT_SFINAE_SPEC) BOOST_PP_SEQ_TAIL(e)) \
+NBL_EVAL(BOOST_PP_TUPLE_ELEM(BOOST_PP_SEQ_HEAD(e),NBL_IMPL_CONCEPT_SFINAE) BOOST_PP_SEQ_TAIL(e)) \
  > : ::nbl::hlsl::true_type {};
 //
 #define NBL_IMPL_CONCEPT_END_GET(r,unused,i,e) BOOST_PP_EXPR_IF(i,&&) BOOST_PP_CAT(__concept__,NBL_CONCEPT_NAME)::BOOST_PP_CAT(__requirement,i)<NBL_CONCEPT_TPLT_PARAMS()>::value

include/nbl/builtin/hlsl/member_test_macros.hlsl

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_MEMBER_TEST_MACROS_INCLUDED_
 #define _NBL_BUILTIN_HLSL_MEMBER_TEST_MACROS_INCLUDED_
 
-#include <nbl/builtin/hlsl/type_traits.hlsl>
+#include <nbl/builtin/hlsl/utility.hlsl>
 #include <boost/preprocessor.hpp>
 
 #ifdef __HLSL_VERSION
@@ -24,9 +24,6 @@ enum e_member_presence
     is_const   = 1<<2,
 };
 
-template<class T>
-T declval(){}
-
 template<bool=false>
 struct if_2_else_1 : integral_constant<uint32_t,1> {};
 template<>
@@ -53,7 +50,7 @@ struct is_static_member_##a<T,typename enable_if<!is_same<decltype(T::a),void>::
 template<class T, class=void> \
 struct is_member_##a: false_type { using type = void; }; \
 template<class T> \
-struct is_member_##a<T,typename enable_if<!is_same<decltype(declval<T>().a),void>::value,void>::type> : true_type { using type = decltype(declval<T>().a); }; \
+struct is_member_##a<T,typename enable_if<!is_same<decltype(experimental::declval<T>().a),void>::value,void>::type> : true_type { using type = decltype(experimental::declval<T>().a); }; \
 } \
 template<class T> \
 struct has_member_##a {  NBL_CONSTEXPR_STATIC_INLINE e_member_presence value = (e_member_presence)(impl::is_member_##a<T>::value + 2*impl::is_static_member_##a<T>::value + 4*is_const<typename impl::is_member_##a<T>::type>::value); }; \
@@ -72,7 +69,7 @@ NBL_GENERATE_MEMBER_TESTER(w)
 #define NBL_TYPE_DECLARE(z, n, x) BOOST_PP_COMMA_IF(x) typename Arg##n
 #define NBL_TYPE_DECLARE_DEFAULT(z, n, x) BOOST_PP_COMMA_IF(x) typename Arg##n=void
 #define NBL_TYPE_FWD(z, n, x) BOOST_PP_COMMA_IF(x) Arg##n
-#define NBL_DECLVAL_DECLARE(z, n, x) impl::declval<Arg##n>() BOOST_PP_COMMA_IF(BOOST_PP_NOT_EQUAL(BOOST_PP_INC(n), x))
+#define NBL_DECLVAL_DECLARE(z, n, x) experimental::declval<Arg##n>() BOOST_PP_COMMA_IF(BOOST_PP_NOT_EQUAL(BOOST_PP_INC(n), x))
 
 #define GENERATE_STATIC_METHOD_TESTER_SPEC(z, n, x) \
 template<class T BOOST_PP_REPEAT(n, NBL_TYPE_DECLARE, n)> \
@@ -89,9 +86,9 @@ BOOST_PP_REPEAT(n, GENERATE_STATIC_METHOD_TESTER_SPEC, x)
 
 #define GENERATE_METHOD_TESTER_SPEC(z, n, x) \
 template<class T BOOST_PP_REPEAT(n, NBL_TYPE_DECLARE, n)> \
-struct has_method_##x<T BOOST_PP_REPEAT(n, NBL_TYPE_FWD, n), typename make_void<decltype(impl::declval<T>().x(BOOST_PP_REPEAT(n, NBL_DECLVAL_DECLARE, n)))>::type> : impl::if_2_else_1<impl::has_static_method_##x<T BOOST_PP_REPEAT(n, NBL_TYPE_FWD, n)>::value> \
+struct has_method_##x<T BOOST_PP_REPEAT(n, NBL_TYPE_FWD, n), typename make_void<decltype(experimental::declval<T>().x(BOOST_PP_REPEAT(n, NBL_DECLVAL_DECLARE, n)))>::type> : impl::if_2_else_1<impl::has_static_method_##x<T BOOST_PP_REPEAT(n, NBL_TYPE_FWD, n)>::value> \
 { \
-    using return_type = decltype(impl::declval<T>().x(BOOST_PP_REPEAT(n, NBL_DECLVAL_DECLARE, n))); \
+    using return_type = decltype(experimental::declval<T>().x(BOOST_PP_REPEAT(n, NBL_DECLVAL_DECLARE, n))); \
     NBL_CONSTEXPR_STATIC_INLINE uint arg_count = n; \
 }; 
 

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -176,7 +176,7 @@ struct make_void { using type = void; };
 
 #ifdef __HLSL_VERSION // HLSL
 
-#define decltype(expr) __decltype(expr)
+#define decltype(...) __decltype(__VA_ARGS__)
 
 template<class T>
 struct type_identity 

include/nbl/builtin/hlsl/utility.hlsl

@@ -0,0 +1,38 @@
+// Copyright (C) 2024 - 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_UTILITY_INCLUDED_
+#define _NBL_BUILTIN_HLSL_UTILITY_INCLUDED_
+
+
+#include <nbl/builtin/hlsl/type_traits.hlsl>
+
+
+// for now we only implement declval
+namespace nbl
+{
+namespace hlsl
+{
+#ifndef __HLSL_VERSION
+
+template<class T>
+std::add_rvalue_reference_t<T> declval() noexcept
+{
+	static_assert(false,"Actually calling declval is ill-formed.");
+}
+
+#else
+
+namespace experimental
+{
+
+template<class T>
+T declval() {}
+
+}
+
+#endif
+}
+}
+
+#endif

src/nbl/builtin/CMakeLists.txt

@@ -256,6 +256,7 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/functional.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/limits.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/type_traits.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/utility.hlsl")
 #metaprogramming
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/mpl.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/member_test_macros.hlsl")