Merge pull request #857 from Devsh-Graphics-Programming/concepts_fix

Fix the circular dependency between concepts and type_traits

Author: devshgraphicsprogramming

include/nbl/builtin/hlsl/concepts.hlsl

@@ -5,6 +5,7 @@
 #define _NBL_BUILTIN_HLSL_CONCEPTS_INCLUDED_
 
 
+#include <nbl/builtin/hlsl/concepts/impl/base.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat/vector.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
 #include <nbl/builtin/hlsl/utility.hlsl>
@@ -37,15 +38,9 @@ namespace concepts
 //! Now diverge
 #ifdef __cpp_concepts
 
-
-// to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
-#define NBL_BOOL_CONCEPT concept
-
 // for struct definitions, use instead of closing `>` on the primary template parameter list
 #define NBL_PRIMARY_REQUIRES(...) > requires (__VA_ARGS__)
 
-// to put right before the closing `>` of the primary template definition, otherwise `NBL_PARTIAL_REQUIRES` wont work on specializations
-#define NBL_STRUCT_CONSTRAINABLE
 // NOTE: C++20 requires and C++11 enable_if have to be in different places! ITS OF UTTMOST IMPORTANCE YOUR REQUIRE CLAUSES ARE IDENTICAL FOR BOTH MACROS
 // put just after the closing `>` on the partial template specialization `template` declaration e.g. `template<typename U, typename V, typename T> NBL_PARTIAL_REQ_TOP(SomeCond<U>)
 #define NBL_PARTIAL_REQ_TOP(...) requires (__VA_ARGS__)
@@ -79,14 +74,9 @@ concept NBL_CONCEPT_NAME = requires BOOST_PP_EXPR_IF(LOCAL_PARAM_COUNT,(BOOST_PP
 
 #else
 
-// to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
-#define NBL_BOOL_CONCEPT NBL_CONSTEXPR bool
-
 // for struct definitions, use instead of closing `>` on the primary template parameter list
 #define NBL_PRIMARY_REQUIRES(...) ,typename __requires=::nbl::hlsl::enable_if_t<(__VA_ARGS__),void> > 
 
-// to put right before the closing `>` of the primary template definition, otherwise `NBL_PARTIAL_REQUIRES` wont work on specializations
-#define NBL_STRUCT_CONSTRAINABLE ,typename __requires=void
 // NOTE: C++20 requires and C++11 enable_if have to be in different places! ITS OF UTTMOST IMPORTANCE YOUR REQUIRE CLAUSES ARE IDENTICAL FOR BOTH MACROS
 // put just after the closing `>` on the partial template specialization `template` declaration e.g. `template<typename U, typename V, typename T> NBL_PARTIAL_REQ_TOP(SomeCond<U>)
 #define NBL_PARTIAL_REQ_TOP(...)

include/nbl/builtin/hlsl/concepts/impl/base.hlsl

@@ -0,0 +1,36 @@
+// Copyright (C) 2023-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_CONCEPTS_IMPL_BASE_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CONCEPTS_IMPL_BASE_INCLUDED_
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace concepts
+{
+
+//! Now diverge
+#ifdef __cpp_concepts
+
+// to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
+#define NBL_BOOL_CONCEPT concept
+
+// to put right before the closing `>` of the primary template definition, otherwise `NBL_PARTIAL_REQUIRES` wont work on specializations
+#define NBL_STRUCT_CONSTRAINABLE
+
+#else
+
+// to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
+#define NBL_BOOL_CONCEPT NBL_CONSTEXPR bool
+
+// to put right before the closing `>` of the primary template definition, otherwise `NBL_PARTIAL_REQUIRES` wont work on specializations
+#define NBL_STRUCT_CONSTRAINABLE ,typename __requires=void
+
+#endif
+}
+}
+}
+
+#endif

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -13,7 +13,8 @@ concept is_scoped_enum = std::is_enum_v<E> && !std::is_convertible_v<E, std::und
 #endif
 
 #include <nbl/builtin/hlsl/cpp_compat/basic.h>
-#include <nbl/builtin/hlsl/concepts.hlsl>
+// Include only concept stuff that does not rely on type_traits
+#include <nbl/builtin/hlsl/concepts/impl/base.hlsl>
 
 // Since HLSL currently doesnt allow type aliases we declare them as seperate structs thus they are (WORKAROUND)s
 /*

src/nbl/builtin/CMakeLists.txt

@@ -257,6 +257,7 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/glsl_compat/subgroup_shuffle.
 #stdlib
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/algorithm.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/bit.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/concepts/impl/base.hlsl")
 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")