Conform to glsl

Author: Eichenherz

include/nbl/builtin/hlsl/bit.hlsl

@@ -3,6 +3,7 @@
 
 
 #include <nbl/builtin/hlsl/cpp_compat.hlsl>
+#include <nbl/builtin/hlsl/type_traits.hlsl>
 
 
 #ifndef __HLSL_VERSION
@@ -23,12 +24,6 @@ NBL_ALIAS_TEMPLATE_FUNCTION(std::rotl, rotl);
 NBL_ALIAS_TEMPLATE_FUNCTION(std::rotr, rotr);
 NBL_ALIAS_TEMPLATE_FUNCTION(std::countl_zero, countl_zero);
 
-template<typename Unsigned>
-Unsigned bitfield_extract_unsigned( Unsigned val, uint32_t offsetBits, uint32_t numBits )
-{
-    return ( val >> offsetBits ) & ( ( 1 << numBits ) - 1 );
-}
-
 }
 #else
 
@@ -108,13 +103,6 @@ uint16_t countl_zero(T n)
     return impl::clz<sizeof(T)*8>(n);
 }
 
-// TODO: templated "switch" depending on signedness  
-template<typename Unsigned>
-Unsigned bitfield_extract_unsigned( Unsigned val, uint32_t offsetBits, uint32_t numBits )
-{
-    return spirv::bitfieldExtractUnsigned<Unsigned>( val, offsetBits, numBits );
-}
-
 }
 }
 #endif

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

@@ -56,6 +56,18 @@ T atomicCompSwap(NBL_REF_ARG(T) ptr, T comparator, T value)
     return spirv::atomicCompSwap<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, spv::DecorationRelaxedPrecision, value, comparator);
 }
 
+template<typename T>
+T bitfieldExtract( T val, uint32_t offsetBits, uint32_t numBits )
+{
+    static_assert( is_integral<T>::value );
+    if( is_unsigned<T>::value )
+    {
+        return spirv::bitFieldUExtract<T>( val, offsetBits, numBits );
+    }
+    //if( is_signed<T>::value )
+        return spirv::bitFieldSExtract<T>( val, offsetBits, numBits );
+}
+
 /**
  * For Compute Shaders
  */

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

@@ -132,11 +132,11 @@ T bitcast(U);
 
 template<typename Unsigned>
 [[vk::ext_instruction( spv::OpBitFieldUExtract )]]
-Unsigned bitfieldExtractUnsigned( Unsigned val, uint32_t offsetBits, uint32_t numBits );
+Unsigned bitFieldUExtract( Unsigned val, uint32_t offsetBits, uint32_t numBits );
 
 template<typename Signed>
 [[vk::ext_instruction( spv::OpBitFieldSExtract )]]
-Signed bitfieldExtractSigned( Signed val, uint32_t offsetBits, uint32_t numBits );
+Signed bitFieldSExtract( Signed val, uint32_t offsetBits, uint32_t numBits );
 
 }
 #endif