Merge pull request #568 from Devsh-Graphics-Programming/new_hlsl_mpl

New hlsl mpl

Author: devshgraphicsprogramming

examples_tests

@@ -41,7 +41,8 @@ struct countl_zero
 {
     NBL_CONSTEXPR_STATIC_INLINE bool CHOOSE_HIGH = N&(countl_zero_masks<bits_log2>::LO_MASK<<countl_zero_masks<bits_log2>::SHIFT);
     NBL_CONSTEXPR_STATIC_INLINE uint64_t NEXT_N = (CHOOSE_HIGH ? (N>>countl_zero_masks<bits_log2>::SHIFT):N)&countl_zero_masks<bits_log2>::LO_MASK;
-    NBL_CONSTEXPR_STATIC_INLINE uint16_t value   = type_traits::conditional<bits_log2,countl_zero<NEXT_N,bits_log2-1>,type_traits::integral_constant<uint16_t,0> >::type::value + (CHOOSE_HIGH ? 0ull:countl_zero_masks<bits_log2>::SHIFT);
+    //NBL_CONSTEXPR_STATIC_INLINE uint16_t value = type_traits::conditional_value<bits_log2,uint16_t,countl_zero<NEXT_N,bits_log2-1>::value,0>::value + (CHOOSE_HIGH ? 0ull:countl_zero_masks<bits_log2>::SHIFT);
+    NBL_CONSTEXPR_STATIC_INLINE uint16_t value = type_traits::conditional<bits_log2,countl_zero<NEXT_N,bits_log2-1>,type_traits::integral_constant<uint16_t,0> >::type::value + (CHOOSE_HIGH ? 0ull:countl_zero_masks<bits_log2>::SHIFT);
 };
 
 }
@@ -64,6 +65,22 @@ struct log2
     NBL_CONSTEXPR_STATIC_INLINE uint16_t value = X ? (1ull<<6)-countl_zero<X>::value-1 : -1ull;
 };
 
+template<typename T, T X, int32_t S>
+struct rotl
+{
+    static const uint32_t N = 32u;
+    static const int32_t r = S % N;
+    static const T value = (S >= 0) ? ((X << r) | (X >> (N - r))) : (X >> (-r)) | (X << (N - (-r)));
+};
+
+template<typename T, T X, int32_t S>
+struct rotr
+{
+    static const uint32_t N = 32u;
+    static const int32_t r = S % N;
+    static const T value = (S >= 0) ? ((X >> r) | (X << (N - r))) : (X << (-r)) | (X >> (N - (-r)));
+};
+
 }
 }
 }

include/nbl/builtin/hlsl/mpl.hlsl

@@ -7,6 +7,7 @@
 #define _NBL_BUILTIN_GLSL_RANDOM_XOROSHIRO_HLSL_INCLUDED_
 
 #include <nbl/builtin/hlsl/cpp_compat/vector.hlsl>
+
 #include <nbl/builtin/hlsl/bit.hlsl>
 
 namespace nbl

include/nbl/builtin/hlsl/random/xoroshiro.hlsl

@@ -159,24 +159,30 @@ struct integral_constant {
     using value_type = T;
 };
 
-template <bool val>
+template<bool val>
 struct bool_constant : integral_constant<bool, val> {};
 
 struct true_type : bool_constant<true> {};
 struct false_type : bool_constant<true> {};
 
-template <bool C, class T, class F>
+template<bool C, class T, class F>
 struct conditional 
 { 
     using type = T;
 };
 
-template <class T, class F>
+template<class T, class F>
 struct conditional<false, T, F> 
 {
     using type = F;
 };
 
+template<bool C, typename T, T A, T B>
+struct conditional_value
+{
+    NBL_CONSTEXPR_STATIC_INLINE T value = C ? A : B;
+};
+
 template<class A, class B>
 struct is_same : bool_constant<false> {};