diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-10-02 15:01:50 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-10-02 15:01:50 -0400 |
| commit | 18c84a9d6ad2381836a0c8263a8e9cb800b6c28e (patch) | |
| tree | 6410603aa44e66f726aebe030ecfa31d37db1f68 /indra/llmath/llsimdmath.h | |
| parent | f25c2a56c0c8079163e9ef18f6a9e590341b1e1a (diff) | |
| parent | 6dba35d74e27125b39860f9a3df176d7f3a087b5 (diff) | |
Merge branch 'release/2025.07' into project/lua_editor
Diffstat (limited to 'indra/llmath/llsimdmath.h')
| -rw-r--r-- | indra/llmath/llsimdmath.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index 40953dc2e8..b27b034cf3 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -31,16 +31,26 @@ #error "Please include llmath.h before this file." #endif -#if ( ( LL_DARWIN || LL_LINUX ) && !(__SSE2__) ) || ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) -#error SSE2 not enabled. LLVector4a and related class will not compile. +// the check for this error case must be split into multiple parts +// because some versions of VS complain about '__SSE2__' +#if ( ( LL_DARWIN || LL_LINUX ) ) + #if !(__SSE2__) && !(__arm64__) && !(__aarch64__) + #error SSE2 not enabled. LLVector4a and related class will not compile. + #endif +#elif ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) + #error SSE2 not enabled. LLVector4a and related class will not compile. #endif #if !LL_WINDOWS #include <stdint.h> #endif +#if defined(__arm64__) || defined(__aarch64__) +#include "sse2neon.h" +#else #include <xmmintrin.h> #include <emmintrin.h> +#endif #include "llmemory.h" #include "llsimdtypes.h" |