Resolved conflicts, merged master

Author: Przemog1

include/nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl

@@ -298,6 +298,41 @@ struct find_msb_return_type<vector<Integer, N> >
 template<typename Integer>
 using find_lsb_return_type = find_msb_return_type<Integer>;
 
+template<typename T NBL_STRUCT_CONSTRAINABLE>
+struct bitReverse_helper;
+
+template<typename Integer>
+NBL_PARTIAL_REQ_TOP(hlsl::is_integral_v<Integer> && hlsl::is_scalar_v<Integer>)
+struct bitReverse_helper<Integer NBL_PARTIAL_REQ_BOT(hlsl::is_integral_v<Integer>&& hlsl::is_scalar_v<Integer>) >
+{
+	static inline Integer __call(NBL_CONST_REF_ARG(Integer) val)
+	{
+#ifdef __HLSL_VERSION
+		return spirv::bitReverse(val);
+#else
+		return glm::bitfieldReverse(val);
+#endif
+	}
+};
+
+template<typename Vector>
+NBL_PARTIAL_REQ_TOP(hlsl::is_vector_v<Vector>)
+struct bitReverse_helper<Vector NBL_PARTIAL_REQ_BOT(hlsl::is_integral_v<Vector> && hlsl::is_vector_v<Vector>) >
+{
+	static Vector __call(NBL_CONST_REF_ARG(Vector) vec)
+	{
+#ifdef __HLSL_VERSION
+		return spirv::bitReverse(vec);
+#else
+		Vector output;
+		using traits = hlsl::vector_traits<Vector>;
+		for (uint32_t i = 0; i < traits::Dimension; ++i)
+			output[i] = bitReverse_helper<scalar_type_t<Vector> >::__call(vec[i]);
+		return output;
+#endif
+	}
+};
+
 template<typename Matrix>
 struct transpose_helper;
 

include/nbl/builtin/hlsl/cpp_compat/intrinsics.hlsl

@@ -146,6 +146,13 @@ inline FloatingPoint rsqrt(FloatingPoint x)
 #endif
 }
 
+template<typename Integer>
+inline Integer bitReverse(Integer val)
+{
+	return cpp_compat_intrinsics_impl::bitReverse_helper<Integer>::__call(val);
+}
+
+
 }
 }
 

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

@@ -223,7 +223,7 @@ T bitfieldInsert(T base, T insert, uint32_t offset, uint32_t bits)
 template<typename T>
 T bitfieldReverse(T value)
 {
-    return spirv::bitFieldReverse<T>(value);
+    return spirv::bitReverse<T>(value);
 }
 
 #endif

include/nbl/builtin/hlsl/impl/tgmath_impl.hlsl

@@ -101,8 +101,8 @@ template<typename V NBL_STRUCT_CONSTRAINABLE>
 struct floor_helper;
 
 template<typename FloatingPoint>
-NBL_PARTIAL_REQ_TOP(hlsl::is_floating_point_v<FloatingPoint>&& hlsl::is_scalar_v<FloatingPoint>)
-struct floor_helper<FloatingPoint NBL_PARTIAL_REQ_BOT(hlsl::is_vector_v<FloatingPoint>) >
+NBL_PARTIAL_REQ_TOP(hlsl::is_floating_point_v<FloatingPoint> && hlsl::is_scalar_v<FloatingPoint>)
+struct floor_helper<FloatingPoint NBL_PARTIAL_REQ_BOT(hlsl::is_floating_point_v<FloatingPoint>&& hlsl::is_scalar_v<FloatingPoint>) >
 {
 	static FloatingPoint __call(NBL_CONST_REF_ARG(FloatingPoint) val)
 	{
@@ -115,18 +115,18 @@ struct floor_helper<FloatingPoint NBL_PARTIAL_REQ_BOT(hlsl::is_vector_v<Floating
 };
 
 template<typename Vector>
-NBL_PARTIAL_REQ_TOP(hlsl::is_vector_v<Vector>)
-struct floor_helper<Vector NBL_PARTIAL_REQ_BOT(hlsl::is_vector_v<Vector>) >
+NBL_PARTIAL_REQ_TOP(hlsl::is_floating_point_v<Vector> && hlsl::is_vector_v<Vector>)
+struct floor_helper<Vector NBL_PARTIAL_REQ_BOT(hlsl::is_floating_point_v<Vector> && hlsl::is_vector_v<Vector>) >
 {
 	static Vector __call(NBL_CONST_REF_ARG(Vector) vec)
 	{
 		using traits = hlsl::vector_traits<Vector>;
-		array_get<Vector, traits::scalar_type> getter;
-		array_set<Vector, traits::scalar_type> setter;
+		array_get<Vector, typename traits::scalar_type> getter;
+		array_set<Vector, typename traits::scalar_type> setter;
 
 		Vector output;
 		for (uint32_t i = 0; i < traits::Dimension; ++i)
-			setter(output, i, floor_helper<traits::scalar_type>::__call(getter(vec, i)));
+			setter(output, i, floor_helper<typename traits::scalar_type>::__call(getter(vec, i)));
 
 		return output;
 	}

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

@@ -232,7 +232,7 @@ enable_if_t<is_integral_v<Integral>, Integral> bitFieldInsert( Integral base, In
 
 template<typename Integral>
 [[vk::ext_instruction( spv::OpBitReverse )]]
-enable_if_t<is_integral_v<Integral>, Integral> bitFieldReverse( Integral base );
+enable_if_t<is_integral_v<Integral>, Integral> bitReverse( Integral base );
 
 template<typename FloatingPoint>
 [[vk::ext_instruction( spv::OpIsNan )]]