From ced095c4895647911c6d9ea6c352d1de2014c8aa Mon Sep 17 00:00:00 2001 From: Josh Simmons Date: Mon, 2 Dec 2024 22:55:01 +0100 Subject: [PATCH] narcissus-maths: Fix clippy lints --- engine/narcissus-maths/src/lib.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/engine/narcissus-maths/src/lib.rs b/engine/narcissus-maths/src/lib.rs index 8ec1f66..69eb438 100644 --- a/engine/narcissus-maths/src/lib.rs +++ b/engine/narcissus-maths/src/lib.rs @@ -229,8 +229,7 @@ pub fn f32_to_i32(x: f32) -> i32 { #[cfg(target_arch = "x86_64")] unsafe { - let x = core::arch::x86_64::_mm_load_ss(&x); - core::arch::x86_64::_mm_cvtt_ss2si(x) + core::arch::x86_64::_mm_cvtt_ss2si(core::arch::x86_64::_mm_load_ss(&x)) } } @@ -256,8 +255,7 @@ pub fn f32_to_i64(x: f32) -> i64 { #[cfg(target_arch = "x86_64")] unsafe { - let x = core::arch::x86_64::_mm_load_ss(&x); - core::arch::x86_64::_mm_cvttss_si64(x) + core::arch::x86_64::_mm_cvttss_si64(core::arch::x86_64::_mm_load_ss(&x)) } } @@ -277,11 +275,14 @@ fn select_f32(x: f32, y: f32, t: bool) -> f32 { #[cfg(all(target_feature = "sse4.1", not(target_feature = "avx512f")))] unsafe { - let x = core::arch::x86_64::_mm_load_ss(&x); - let y = core::arch::x86_64::_mm_load_ss(&y); - let mask = std::mem::transmute(core::arch::x86_64::_mm_cvtsi32_si128(-(t as i32))); + use core::arch::x86_64::{ + __m128, __m128i, _mm_blendv_ps, _mm_cvtsi32_si128, _mm_load_ss, _mm_store_ss, + }; + let x = _mm_load_ss(&x); + let y = _mm_load_ss(&y); + let mask = std::mem::transmute::<__m128i, __m128>(_mm_cvtsi32_si128(-(t as i32))); let mut res = 0.0_f32; - core::arch::x86_64::_mm_store_ss(&mut res, core::arch::x86_64::_mm_blendv_ps(x, y, mask)); + _mm_store_ss(&mut res, _mm_blendv_ps(x, y, mask)); res } } -- 2.49.0