From e42f21b7129b140fb6997908a15803a53e5c982b Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 25 Nov 2022 13:58:15 +0000
Subject: [PATCH] Only use simde, drop sse2neon

Signed-off-by: falkTX <falktx@falktx.com>
---
 .gitmodules                     | 3 ---
 include/simd-compat/mmintrin.h  | 2 --
 include/simd-compat/pmmintrin.h | 9 ++++++++-
 include/sse2neon                | 1 -
 4 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 160000 include/sse2neon

diff --git a/.gitmodules b/.gitmodules
index 4be9d87..028e6d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "plugins/Cardinal/mingw-std-threads"]
 	path = include/mingw-std-threads
 	url = https://github.com/meganz/mingw-std-threads.git
-[submodule "plugins/Cardinal/sse2neon"]
-	path = include/sse2neon
-	url = https://github.com/DLTcollab/sse2neon.git
 [submodule "plugins/Befaco"]
 	path = plugins/Befaco
 	url = https://github.com/VCVRack/Befaco.git
diff --git a/include/simd-compat/mmintrin.h b/include/simd-compat/mmintrin.h
index 9058d65..1efa66a 100644
--- a/include/simd-compat/mmintrin.h
+++ b/include/simd-compat/mmintrin.h
@@ -21,8 +21,6 @@
 # include_next <mmintrin.h>
 #elif defined(__EMSCRIPTEN__)
 # include <wasm_simd128.h>
-#elif defined(__ARM_NEON)
-# include "../sse2neon/sse2neon.h"
 #else
 # define SIMDE_ENABLE_NATIVE_ALIASES
 # include "../simde/simde/x86/mmx.h"
diff --git a/include/simd-compat/pmmintrin.h b/include/simd-compat/pmmintrin.h
index 6b57055..8593e1e 100644
--- a/include/simd-compat/pmmintrin.h
+++ b/include/simd-compat/pmmintrin.h
@@ -20,6 +20,11 @@
 #if defined(__i386__) || defined(__x86_64__)
 # include_next <pmmintrin.h>
 
+// bring in extra SSE3 support via simde
+# define SIMDE_X86_SSE2_NATIVE
+# define SIMDE_X86_SSE3_ENABLE_NATIVE_ALIASES
+# include "../simde/simde/x86/sse3.h"
+
 #elif defined(__EMSCRIPTEN__)
 # include_next <pmmintrin.h>
 
@@ -29,6 +34,7 @@ __m64 _mm_set1_pi16(short w)
     return __extension__ (__m64){ static_cast<float>(w), static_cast<float>(w) };
 }
 
+/*
 #elif defined(__ARM_NEON)
 # include "../sse2neon/sse2neon.h"
 
@@ -43,11 +49,12 @@ __m64 _mm_set1_pi16(short w)
 {
     return vreinterpret_s64_s16(vdup_n_s16(w));
 }
+*/
 
 #else
 # define SIMDE_ENABLE_NATIVE_ALIASES
 # include "../simde/simde/x86/sse.h"
 # include "../simde/simde/x86/sse2.h"
-// # include "../simde/simde/x86/sse3.h"
+# include "../simde/simde/x86/sse3.h"
 
 #endif
diff --git a/include/sse2neon b/include/sse2neon
deleted file mode 160000
index 1dfa401..0000000
--- a/include/sse2neon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1dfa40113a03a682dc79ba42235c5b0d1c50aaf2