From e479bf7f7bb1431f4f0f54a66d7f7245625916f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 27 Jun 2020 17:29:21 +0200 Subject: [PATCH] TextureDecoder: Fix misuse of NEON on all armv7 `ppsspp_config.h` properly defines `PPSSPP_ARCH(ARM_NEON)` already for arm64v8 and armv7+NEON, so we use that instead of using NEON instructions on all armv7. --- GPU/Common/TextureDecoder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GPU/Common/TextureDecoder.cpp b/GPU/Common/TextureDecoder.cpp index 68056ce4cd..0aca26ec84 100644 --- a/GPU/Common/TextureDecoder.cpp +++ b/GPU/Common/TextureDecoder.cpp @@ -614,7 +614,7 @@ CheckAlphaResult CheckAlphaRGBA8888Basic(const u32 *pixelData, int stride, int w if ((w & 3) == 0 && (stride & 3) == 0) { #ifdef _M_SSE return CheckAlphaRGBA8888SSE2(pixelData, stride, w, h); -#elif PPSSPP_ARCH(ARMV7) || PPSSPP_ARCH(ARM64) +#elif PPSSPP_ARCH(ARM_NEON) if (cpu_info.bNEON) { return CheckAlphaRGBA8888NEON(pixelData, stride, w, h); } @@ -644,7 +644,7 @@ CheckAlphaResult CheckAlphaABGR4444Basic(const u32 *pixelData, int stride, int w if ((w & 7) == 0 && (stride & 7) == 0) { #ifdef _M_SSE return CheckAlphaABGR4444SSE2(pixelData, stride, w, h); -#elif PPSSPP_ARCH(ARMV7) || PPSSPP_ARCH(ARM64) +#elif PPSSPP_ARCH(ARM_NEON) if (cpu_info.bNEON) { return CheckAlphaABGR4444NEON(pixelData, stride, w, h); } @@ -677,7 +677,7 @@ CheckAlphaResult CheckAlphaABGR1555Basic(const u32 *pixelData, int stride, int w if ((w & 7) == 0 && (stride & 7) == 0) { #ifdef _M_SSE return CheckAlphaABGR1555SSE2(pixelData, stride, w, h); -#elif PPSSPP_ARCH(ARMV7) || PPSSPP_ARCH(ARM64) +#elif PPSSPP_ARCH(ARM_NEON) if (cpu_info.bNEON) { return CheckAlphaABGR1555NEON(pixelData, stride, w, h); } @@ -709,7 +709,7 @@ CheckAlphaResult CheckAlphaRGBA4444Basic(const u32 *pixelData, int stride, int w if ((w & 7) == 0 && (stride & 7) == 0) { #ifdef _M_SSE return CheckAlphaRGBA4444SSE2(pixelData, stride, w, h); -#elif PPSSPP_ARCH(ARMV7) || PPSSPP_ARCH(ARM64) +#elif PPSSPP_ARCH(ARM_NEON) if (cpu_info.bNEON) { return CheckAlphaRGBA4444NEON(pixelData, stride, w, h); } @@ -742,7 +742,7 @@ CheckAlphaResult CheckAlphaRGBA5551Basic(const u32 *pixelData, int stride, int w if ((w & 7) == 0 && (stride & 7) == 0) { #ifdef _M_SSE return CheckAlphaRGBA5551SSE2(pixelData, stride, w, h); -#elif PPSSPP_ARCH(ARMV7) || PPSSPP_ARCH(ARM64) +#elif PPSSPP_ARCH(ARM_NEON) if (cpu_info.bNEON) { return CheckAlphaRGBA5551NEON(pixelData, stride, w, h); }