Adds bitfieldReverse to glsl_compat.hlsl via its spirv op. Some QOL changes to type_traits.hlsl

Author: Fletterio

include/nbl/builtin/hlsl/glsl_compat/core.hlsl

@@ -208,14 +208,13 @@ T bitfieldExtract( T val, uint32_t offsetBits, uint32_t numBits )
     return impl::bitfieldExtract<T, is_signed<T>::value, is_integral<T>::value>::__call(val,offsetBits,numBits);
 }
 
-
 namespace impl 
 {
 
 template<typename T>
 struct bitfieldInsert
 {
-    static enable_if_t<is_integral_v<T>, T> __call( T base, T insert, uint32_t offset, uint32_t count )
+    static T __call( T base, T insert, uint32_t offset, uint32_t count )
     {
         return spirv::bitFieldInsert<T>( base, insert, offset, count );
     }
@@ -224,9 +223,29 @@ struct bitfieldInsert
 } //namespace impl
 
 template<typename T>
-T bitfieldInsert( T base, T insert, uint32_t offset, uint32_t count )
+T bitfieldInsert( T base, T insert, uint32_t offset, uint32_t bits )
+{
+    return impl::bitfieldInsert<T>::__call(base, insert, offset, bits);
+}
+
+namespace impl 
+{
+
+template<typename T>
+struct bitfieldReverse
+{
+    static T __call( T base )
+    {
+        return spirv::bitFieldReverse<T>( base );
+    }
+};
+
+} //namespace impl
+
+template<typename T>
+T bitfieldReverse( T value )
 {
-    return impl::bitfieldInsert<T>::__call(base, insert, offset, count);
+    return impl::bitfieldReverse<T>::__call(value);
 }
 
 #endif

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

@@ -234,7 +234,11 @@ enable_if_t<is_signed_v<Signed>, Signed> bitFieldSExtract( Signed val, uint32_t
 
 template<typename Integral>
 [[vk::ext_instruction( spv::OpBitFieldInsert )]]
-Integral bitFieldInsert( Integral base, Integral insert, uint32_t offset, uint32_t count );
+enable_if_t<is_integral_v<Integral>, Integral> bitFieldInsert( Integral base, Integral insert, uint32_t offset, uint32_t count );
+
+template<typename Integral>
+[[vk::ext_instruction( spv::OpBitReverse )]]
+enable_if_t<is_integral_v<Integral>, Integral> bitFieldReverse( Integral base );
 
 }
 

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -306,7 +306,9 @@ template<class T>
 NBL_CONSTEXPR_STATIC_INLINE bool is_unsigned_v = is_unsigned<T>::value;
 
 template<class T> 
-struct is_integral : impl::base_type_forwarder<impl::is_integral, T> {};
+struct is_integral : impl::base_type_forwarder<impl::is_integral, typename remove_cv<T>::type> {};
+template<class T>
+NBL_CONSTEXPR_STATIC_INLINE bool is_integral_v = is_integral<T>::value;
 
 template<class T> 
 struct is_floating_point : impl::base_type_forwarder<impl::is_floating_point, typename remove_cv<T>::type> {};
@@ -321,6 +323,8 @@ struct is_scalar : bool_constant<
     impl::is_integral<typename remove_cv<T>::type>::value || 
     impl::is_floating_point<typename remove_cv<T>::type>::value
 > {};
+template<class T>
+NBL_CONSTEXPR_STATIC_INLINE bool is_scalar_v = is_scalar<T>::value;
 
 template<class T>
 struct is_const : bool_constant<false> {};
@@ -395,12 +399,6 @@ struct enable_if<true, T> : type_identity<T> {};
 template<bool B, class T = void>
 using enable_if_t = typename enable_if<B, T>::type;
 
-template<class T>
-NBL_CONSTEXPR_STATIC_INLINE bool is_integral_v = is_integral<T>::value;
-
-template<class T>
-NBL_CONSTEXPR_STATIC_INLINE bool is_scalar_v = is_scalar<T>::value;
-
 template<class T>
 struct alignment_of;
 template<class T>