Merge branch 'master' into nahim_complex_fft_workgroup

Also further imporve the memory_accessor.hlsl

Author: devsh

examples_tests

@@ -2,11 +2,10 @@
 #define _NBL_BUILTIN_HLSL_BIT_INCLUDED_
 
 
-#include <nbl/builtin/hlsl/cpp_compat.hlsl>
+#include <nbl/builtin/hlsl/macros.h>
 
 
 #ifndef __HLSL_VERSION
-
 #include <bit>
 
 namespace nbl::hlsl
@@ -25,7 +24,6 @@ NBL_ALIAS_TEMPLATE_FUNCTION(std::countl_zero, countl_zero);
 
 }
 #else
-
 #include <nbl/builtin/hlsl/spirv_intrinsics/core.hlsl>
 
 namespace nbl
@@ -34,9 +32,9 @@ namespace hlsl
 {
 
 template<class T, class U>
-enable_if_t<sizeof(T) <= sizeof(U), T> bit_cast(U val)
+enable_if_t<sizeof(T)==sizeof(U),T> bit_cast(U val)
 {
-    return spirv::bitcast<T, U>(val);
+    return spirv::bitcast<T,U>(val);
 }
 
 template<typename T, typename S>

include/nbl/builtin/hlsl/bit.hlsl

@@ -1,75 +1,9 @@
 #ifndef _NBL_BUILTIN_HLSL_CPP_COMPAT_INCLUDED_
 #define _NBL_BUILTIN_HLSL_CPP_COMPAT_INCLUDED_
 
-#include <nbl/builtin/hlsl/macros.h>
-
-#ifndef __HLSL_VERSION
-#include <type_traits>
-#include <bit>
-
-#define ARROW ->
-#define NBL_CONSTEXPR constexpr
-#define NBL_CONSTEXPR_STATIC constexpr static
-#define NBL_CONSTEXPR_STATIC_INLINE constexpr static inline
-#define NBL_CONST_MEMBER_FUNC const
-
-#define NBL_ALIAS_TEMPLATE_FUNCTION(origFunctionName, functionAlias) \
-template<typename... Args> \
-inline auto functionAlias(Args&&... args) -> decltype(origFunctionName(std::forward<Args>(args)...)) \
-{ \
-    return origFunctionName(std::forward<Args>(args)...); \
-}
-
-namespace nbl::hlsl
-{
-
-template<typename T>
-using add_reference = std::add_lvalue_reference<T>;
-
-template<typename T>
-using add_pointer = std::add_pointer<T>;
-
-}
-
-// We need variadic macro in order to handle multi parameter templates because the 
-// preprocessor parses the template parameters as different macro parameters.
-#define NBL_REF_ARG(...) typename nbl::hlsl::add_reference<__VA_ARGS__ >::type
-#define NBL_CONST_REF_ARG(...) typename nbl::hlsl::add_reference<std::add_const_t<__VA_ARGS__ >>::type
-
-#else
-
-#define ARROW .arrow().
-#define NBL_CONSTEXPR const static
-#define NBL_CONSTEXPR_STATIC_INLINE const static
-#define NBL_CONST_MEMBER_FUNC 
-
-namespace nbl
-{
-namespace hlsl
-{
-
-#if 0 // TODO: for later
-template<typename T>
-struct add_reference
-{
-  using type = ref<T>;
-};
-template<typename T>
-struct add_pointer
-{
-  using type = ptr<T>;
-};
-#endif
-
-}
-}
-
-#define NBL_REF_ARG(...) inout __VA_ARGS__
-#define NBL_CONST_REF_ARG(...) const in __VA_ARGS__
-
-#endif
-
+#include <nbl/builtin/hlsl/cpp_compat/basic.h>
 // it includes vector and matrix
 #include <nbl/builtin/hlsl/cpp_compat/intrinsics.h>
+#include <nbl/builtin/hlsl/cpp_compat/promote.hlsl>
 
 #endif

include/nbl/builtin/hlsl/cpp_compat.hlsl

@@ -0,0 +1,77 @@
+#ifndef _NBL_BUILTIN_HLSL_CPP_COMPAT_BASIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_CPP_COMPAT_BASIC_INCLUDED_
+
+#include <nbl/builtin/hlsl/macros.h>
+
+#ifndef __HLSL_VERSION
+#include <type_traits>
+
+#define ARROW ->
+#define NBL_CONSTEXPR constexpr // TODO: rename to NBL_CONSTEXPR_VAR
+#define NBL_CONSTEXPR_FUNC constexpr
+#define NBL_CONSTEXPR_STATIC constexpr static
+#define NBL_CONSTEXPR_STATIC_INLINE constexpr static inline
+#define NBL_CONST_MEMBER_FUNC const
+
+namespace nbl::hlsl
+{
+    template<typename T, typename U>
+    T _static_cast(U v)
+    {
+        return static_cast<T>(v);
+    }
+
+    template<typename T>
+    using add_reference = std::add_lvalue_reference<T>;
+
+    template<typename T>
+    using add_pointer = std::add_pointer<T>;
+
+}
+
+// We need variadic macro in order to handle multi parameter templates because the 
+// preprocessor parses the template parameters as different macro parameters.
+#define NBL_REF_ARG(...) typename nbl::hlsl::add_reference<__VA_ARGS__ >::type
+#define NBL_CONST_REF_ARG(...) typename nbl::hlsl::add_reference<std::add_const_t<__VA_ARGS__ >>::type
+
+#else
+
+#define ARROW .arrow().
+#define NBL_CONSTEXPR const static // TODO: rename to NBL_CONSTEXPR_VAR
+#define NBL_CONSTEXPR_FUNC
+#define NBL_CONSTEXPR_STATIC const static
+#define NBL_CONSTEXPR_STATIC_INLINE const static
+#define NBL_CONST_MEMBER_FUNC 
+
+namespace nbl
+{
+    namespace hlsl
+    {
+        template<typename T, typename U>
+        T _static_cast(U v)
+        {
+            return (T)v;
+        }
+
+#if 0 // TODO: for later
+        template<typename T>
+        struct add_reference
+        {
+            using type = ref<T>;
+        };
+        template<typename T>
+        struct add_pointer
+        {
+            using type = ptr<T>;
+        };
+#endif
+
+    }
+}
+
+#define NBL_REF_ARG(...) inout __VA_ARGS__
+#define NBL_CONST_REF_ARG(...) const in __VA_ARGS__
+
+#endif
+
+#endif

include/nbl/builtin/hlsl/cpp_compat/basic.h

@@ -14,7 +14,16 @@
         [branch] if (!con) \
           vk::RawBufferStore<uint32_t>(0xdeadbeefBADC0FFbull,0x45u,4u); \
     } while(!con); \
-} 
+}
+#else
+
+#define NBL_ALIAS_TEMPLATE_FUNCTION(origFunctionName, functionAlias) \
+template<typename... Args> \
+inline auto functionAlias(Args&&... args) -> decltype(origFunctionName(std::forward<Args>(args)...)) \
+{ \
+    return origFunctionName(std::forward<Args>(args)...); \
+}
+
 #endif
 
 #ifdef __HLSL_VERSION // cause DXC is insane

include/nbl/builtin/hlsl/macros.h

@@ -108,6 +108,7 @@ struct has_method_##x<T BOOST_PP_REPEAT(n, NBL_TYPE_FWD, n), typename make_void<
     due to how we check function signatures at the moment
 */
 
+// TODO: these should probably generate without a namespace and be expected to be put inside a namespace
 #define GENERATE_METHOD_TESTER(x) \
 namespace nbl { \
 namespace hlsl { \
@@ -118,8 +119,10 @@ BOOST_PP_REPEAT(4, GENERATE_METHOD_TESTER_SPEC, x) \
 }}
 
 
-GENERATE_METHOD_TESTER(a)
-GENERATE_METHOD_TESTER(b)
+GENERATE_METHOD_TESTER(a) // TODO: remove
+GENERATE_METHOD_TESTER(b) // TODO: remove
+GENERATE_METHOD_TESTER(get)
+GENERATE_METHOD_TESTER(set)
 
 
 #endif