diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:49 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:49 +0300 |
| commit | 7824fe51318b8a87caa9ef3ed4db99914e22e6e4 (patch) | |
| tree | 7b861acefc1acb41a8bc806dfa7693aa41f53263 /src/3rdparty/libwebp/src/dsp/cpu.c | |
| parent | 3c316057a0e6dae324f92a3bef2c31c398c2ea51 (diff) | |
| parent | 6c0e0f2a82d8d26e33eb7190066c9872a00a0f8b (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Change-Id: I8f97dd74f81ed23ca3cb6634068e2c77e7ea9275
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/cpu.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/cpu.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/cpu.c b/src/3rdparty/libwebp/src/dsp/cpu.c index 4ca90d8..3145e19 100644 --- a/src/3rdparty/libwebp/src/dsp/cpu.c +++ b/src/3rdparty/libwebp/src/dsp/cpu.c @@ -189,17 +189,17 @@ VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo; // Use compile flags as an indicator of SIMD support instead of a runtime check. static int wasmCPUInfo(CPUFeature feature) { switch (feature) { -#ifdef WEBP_USE_SSE2 +#ifdef WEBP_HAVE_SSE2 case kSSE2: return 1; #endif -#ifdef WEBP_USE_SSE41 +#ifdef WEBP_HAVE_SSE41 case kSSE3: case kSlowSSSE3: case kSSE4_1: return 1; #endif -#ifdef WEBP_USE_NEON +#ifdef WEBP_HAVE_NEON case kNEON: return 1; #endif @@ -209,9 +209,10 @@ static int wasmCPUInfo(CPUFeature feature) { return 0; } VP8CPUInfo VP8GetCPUInfo = wasmCPUInfo; -#elif defined(WEBP_USE_NEON) -// define a dummy function to enable turning off NEON at runtime by setting -// VP8DecGetCPUInfo = NULL +#elif defined(WEBP_HAVE_NEON) +// In most cases this function doesn't check for NEON support (it's assumed by +// the configuration), but enables turning off NEON at runtime, for testing +// purposes, by setting VP8DecGetCPUInfo = NULL. static int armCPUInfo(CPUFeature feature) { if (feature != kNEON) return 0; #if defined(__linux__) && defined(WEBP_HAVE_NEON_RTCD) |