diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-30 06:05:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 06:05:23 +0200 |
| commit | 6b25f35f84960ddb7fbfc3b4df3f244e42bb4470 (patch) | |
| tree | e7408959f9dd586159e3481120fa047f9c377b44 /media/libwebp/dsp/neon.h | |
| parent | b5b0b28441642f1c15b6ca0834bfca068bcbb154 (diff) | |
| parent | 53407e7bf2d8a1a27efef4f15ec8032014273803 (diff) | |
| download | UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar.gz UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar.lz UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar.xz UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.zip | |
Merge pull request #566 from JustOff/PR_libwebp-1.0.0
Update libwebp to v1.0.0 + known security patches
Diffstat (limited to 'media/libwebp/dsp/neon.h')
| -rw-r--r-- | media/libwebp/dsp/neon.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/media/libwebp/dsp/neon.h b/media/libwebp/dsp/neon.h index 3b548a685..63c27a290 100644 --- a/media/libwebp/dsp/neon.h +++ b/media/libwebp/dsp/neon.h @@ -14,11 +14,12 @@ #include <arm_neon.h> -#include "./dsp.h" +#include "../dsp/dsp.h" // Right now, some intrinsics functions seem slower, so we disable them -// everywhere except aarch64 where the inline assembly is incompatible. -#if defined(__aarch64__) +// everywhere except newer clang/gcc or aarch64 where the inline assembly is +// incompatible. +#if LOCAL_CLANG_PREREQ(3,8) || LOCAL_GCC_PREREQ(4,9) || defined(__aarch64__) #define WEBP_USE_INTRINSICS // use intrinsics when possible #endif @@ -43,11 +44,11 @@ // if using intrinsics, this flag avoids some functions that make gcc-4.6.3 // crash ("internal compiler error: in immed_double_const, at emit-rtl."). // (probably similar to gcc.gnu.org/bugzilla/show_bug.cgi?id=48183) -#if !(LOCAL_GCC_PREREQ(4,8) || defined(__aarch64__)) +#if !(LOCAL_CLANG_PREREQ(3,8) || LOCAL_GCC_PREREQ(4,8) || defined(__aarch64__)) #define WORK_AROUND_GCC #endif -static WEBP_INLINE int32x4x4_t Transpose4x4(const int32x4x4_t rows) { +static WEBP_INLINE int32x4x4_t Transpose4x4_NEON(const int32x4x4_t rows) { uint64x2x2_t row01, row23; row01.val[0] = vreinterpretq_u64_s32(rows.val[0]); |