Removed unnecessary struct for unused partial specialization of some bit functions in glsl_compat. Also added a few nice utilities to complex

Author: Fletterio

include/nbl/builtin/hlsl/complex.hlsl

@@ -361,6 +361,24 @@ complex_t<Scalar> polar(const Scalar r, const Scalar theta)
     return retVal;
 }
 
+
+// --------------------------------------------- Some more functions that come in handy --------------------------------------
+// Fast mul by i
+template<typename Scalar>
+complex_t<Scalar> rotateLeft(NBL_CONST_REF_ARG(complex_t<Scalar>) value)
+{
+    complex_t<Scalar> retVal = { -value.imag(), value.real() };
+    return retVal;
+}
+
+// Fast mul by -i
+template<typename Scalar>
+complex_t<Scalar> rotateRight(NBL_CONST_REF_ARG(complex_t<Scalar>) value)
+{
+    complex_t<Scalar> retVal = { value.imag(), -value.real() };
+    return retVal;
+}
+
 }
 }
 
@@ -378,23 +396,4 @@ NBL_REGISTER_OBJ_TYPE(complex_t<float64_t2>,::nbl::hlsl::alignment_of_v<float64_
 NBL_REGISTER_OBJ_TYPE(complex_t<float64_t3>,::nbl::hlsl::alignment_of_v<float64_t3>)
 NBL_REGISTER_OBJ_TYPE(complex_t<float64_t4>,::nbl::hlsl::alignment_of_v<float64_t4>)
 
-
-
---------------------------------------------- Some more functions that come in handy --------------------------------------
-// Fast mul by i
-template<typename Scalar>
-complex_t<Scalar> rotateLeft(NBL_CONST_REF_ARG(complex_t<Scalar>) value) 
-{
-    complex_t<Scalar> retVal = {- value.imag(), value.real()};
-    return retVal;
-}
-
-// Fast mul by -i
-template<typename Scalar>
-complex_t<Scalar> rotateRight(NBL_CONST_REF_ARG(complex_t<Scalar>) value) 
-{
-    complex_t<Scalar> retVal = {value.imag(), -value.real()};
-    return retVal;
-}
-
 #endif

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

@@ -208,44 +208,16 @@ 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 T __call( T base, T insert, uint32_t offset, uint32_t count )
-    {
-        return spirv::bitFieldInsert<T>( base, insert, offset, count );
-    }
-};
-
-} //namespace impl
-
 template<typename T>
-T bitfieldInsert( T base, T insert, uint32_t offset, uint32_t bits )
+T bitfieldInsert(T base, T insert, uint32_t offset, uint32_t bits)
 {
-    return impl::bitfieldInsert<T>::__call(base, insert, offset, bits);
+    return spirv::bitFieldInsert<T>(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 )
+T bitfieldReverse(T value)
 {
-    return impl::bitfieldReverse<T>::__call(value);
+    return spirv::bitFieldReverse<T>(value);
 }
 
 #endif