pull master, resolve conflicts

Author: AnastaZIuk

include/nbl/builtin/hlsl/concepts.hlsl

@@ -128,9 +128,9 @@ NBL_CONSTEXPR bool NBL_CONCEPT_NAME = BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_CONCEPT_E
 namespace impl\
 {\
 template<BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_EXPR_DECL_TEMP_ARG, _, ARG_TYPE_LIST), typename enable=void>\
-struct CONCEPT_NAME : false_type {};\
+struct CONCEPT_NAME : ::nbl::hlsl::false_type {};\
 template<BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_EXPR_DECL_TEMP_ARG, _, ARG_TYPE_LIST)>\
-struct CONCEPT_NAME<BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_EXPR_ITER_TEMP_ARG, _, ARG_TYPE_LIST), make_void_t<decltype( __VA_ARGS__ )> > : true_type {};\
+struct CONCEPT_NAME<BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_EXPR_ITER_TEMP_ARG, _, ARG_TYPE_LIST), ::nbl::hlsl::make_void_t<decltype( __VA_ARGS__ )> > : ::nbl::hlsl::true_type {};\
 }\
 template<BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_EXPR_DECL_TEMP_ARG, _, ARG_TYPE_LIST)>\
 NBL_BOOL_CONCEPT CONCEPT_NAME = impl::CONCEPT_NAME<BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_EXPR_ITER_TEMP_ARG, _, ARG_TYPE_LIST)>::value\
@@ -139,4 +139,4 @@ NBL_BOOL_CONCEPT CONCEPT_NAME = impl::CONCEPT_NAME<BOOST_PP_SEQ_FOR_EACH_I(NBL_I
 }
 }
 
-#endif
+#endif

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -382,7 +382,8 @@ template<typename T, typename U NBL_FUNC_REQUIRES(concepts::Boolean<U> && (!conc
 [[vk::ext_instruction(spv::OpSelect)]]
 T select(U a, T x, T y);
 
-NBL_VALID_EXPRESSION(SelectIsCallable, (T)(U), select<T,U>(experimental::declval<U>(),experimental::declval<T>(),experimental::declval<T>()));
+// need to use `spirv::` even in the namespace because it matches the HLSL intrinsic which is not namespaced at all, and will happily match anything
+NBL_VALID_EXPRESSION(SelectIsCallable, (T)(U), spirv::select<T,U>(experimental::declval<U>(),experimental::declval<T>(),experimental::declval<T>()));
 
 }
 

include/nbl/system/to_string.h

@@ -0,0 +1,52 @@
+#ifndef _NBL_SYSTEM_TO_STRING_INCLUDED_
+#define _NBL_SYSTEM_TO_STRING_INCLUDED_
+
+#include <nbl/builtin/hlsl/cpp_compat.hlsl>
+
+namespace nbl
+{
+namespace system
+{
+namespace impl
+{
+
+template<typename T>
+struct to_string_helper
+{
+    static std::string __call(const T& value)
+    {
+        return std::to_string(value);
+    }
+};
+
+template<typename T, int16_t N>
+struct to_string_helper<hlsl::vector<T, N>>
+{
+    static std::string __call(const hlsl::vector<T, N>& value)
+    {
+        std::stringstream output;
+        output << "{ ";
+        for (int i = 0; i < N; ++i)
+        {
+            output << to_string_helper<T>::__call(value[i]);
+
+            if (i < N - 1)
+                output << ", ";
+        }
+        output << " }";
+
+        return output.str();
+    }
+};
+
+}
+
+template<typename T>
+std::string to_string(T value)
+{
+    return impl::to_string_helper<T>::__call(value);
+}
+}
+}
+
+#endif