Fix ARM64 Android build

This commit is contained in:
Henrik Rydgard 2016-11-03 22:15:50 +01:00
parent da97119388
commit ea5e9f8c35
2 changed files with 2 additions and 2 deletions

View File

@ -310,7 +310,7 @@ ReliableHash64Func DoReliableHash64 = &XXH64;
// This has to be done after CPUDetect has done its magic.
void SetupTextureDecoder() {
#if PPSSPP_ARCH(ARM_NEON)
#if PPSSPP_ARCH(ARM_NEON) && !PPSSPP_ARCH(ARM64)
if (cpu_info.bNEON) {
DoQuickTexHash = &QuickTexHashNEON;
StableQuickTexHash = &QuickTexHashNEON;

View File

@ -58,7 +58,7 @@ typedef u32 ReliableHashType;
#endif
// For ARM64, NEON is mandatory, so we also statically link.
#elif defined(ARM64)
#elif PPSSPP_ARCH(ARM64)
#define DoQuickTexHash QuickTexHashNEON
#define StableQuickTexHash QuickTexHashNEON
#define DoUnswizzleTex16 DoUnswizzleTex16NEON