refactoring

awxkee · Jun 15, 2024 · 336a94e · 336a94e
1 parent 345e994
commit 336a94e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/rgb_expand.rs b/src/rgb_expand.rs
@@ -1,6 +1,12 @@
-#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+#[cfg(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    target_feature = "avx2"
+))]
 use crate::avx::*;
-#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+#[cfg(all(
+    any(target_arch = "x86_64", target_arch = "x86"),
+    target_feature = "sse4.1"
+))]
 use crate::sse::*;
 #[cfg(all(
     any(target_arch = "aarch64", target_arch = "arm"),
@@ -25,7 +31,10 @@ pub fn rgb_to_rgba(
     let mut dst_offset = 0usize;
     let mut src_offset = 0usize;
 
-    #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+    #[cfg(all(
+        any(target_arch = "x86_64", target_arch = "x86"),
+        target_feature = "sse4.1"
+    ))]
     let mut _use_sse = false;
 
     #[cfg(all(

diff --git a/src/sse/sse_support.rs b/src/sse/sse_support.rs
@@ -1,9 +1,13 @@
-use crate::avx::shuffle;
 #[cfg(target_arch = "x86")]
 use std::arch::x86::*;
 #[cfg(target_arch = "x86_64")]
 use std::arch::x86_64::*;
 
+pub const fn shuffle(z: u32, y: u32, x: u32, w: u32) -> i32 {
+    // Checked: we want to reinterpret the bits
+    ((z << 6) | (y << 4) | (x << 2) | w) as i32
+}
+
 #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
 #[inline(always)]
 #[allow(dead_code)]