summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2023-04-07 20:31:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-04-07 20:31:49 +0000
commit50ac4f7c97ae29ebf16e3364c057bdc46782a47d (patch)
treed3d66baa9aee326508d8d0e1ed7c2eff3a1f5a86
parent4b7d7b4f2ba53f2bde0d0f4f4ec9c2fbbb7c3f53 (diff)
parent0afbd97b4540c8053730289bd42b0395c53235f1 (diff)
downloadlibwebp-50ac4f7c97ae29ebf16e3364c057bdc46782a47d.tar.gz
Merge "cpu.h: enable NEON w/_M_ARM64EC" into main
-rw-r--r--src/dsp/cpu.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dsp/cpu.h b/src/dsp/cpu.h
index be80727c..785a0569 100644
--- a/src/dsp/cpu.h
+++ b/src/dsp/cpu.h
@@ -98,8 +98,9 @@
// inclusion of arm64_neon.h; Visual Studio 2019 includes this file in
// arm_neon.h. Compile errors were seen with Visual Studio 2019 16.4 with
// vtbl4_u8(); a fix was made in 16.6.
-#if defined(_MSC_VER) && ((_MSC_VER >= 1700 && defined(_M_ARM)) || \
- (_MSC_VER >= 1926 && defined(_M_ARM64)))
+#if defined(_MSC_VER) && \
+ ((_MSC_VER >= 1700 && defined(_M_ARM)) || \
+ (_MSC_VER >= 1926 && (defined(_M_ARM64) || defined(_M_ARM64EC))))
#define WEBP_USE_NEON
#define WEBP_USE_INTRINSICS
#endif