Browse Source

blit: Change ifdefs on NEON functions that use an aarch64-specific opcode.

Fixes #14519.
Ryan C. Gordon 3 weeks ago
parent
commit
15f98b2a61
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/video/SDL_blit_A.c
  2. 2 2
      src/video/SDL_blit_N.c

+ 2 - 2
src/video/SDL_blit_A.c

@@ -1299,7 +1299,7 @@ static void SDL_TARGETING("avx2") Blit8888to8888PixelAlphaSwizzleAVX2(SDL_BlitIn
 
 
 #endif
 #endif
 
 
-#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8)
+#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__)
 
 
 static void Blit8888to8888PixelAlphaSwizzleNEON(SDL_BlitInfo *info)
 static void Blit8888to8888PixelAlphaSwizzleNEON(SDL_BlitInfo *info)
 {
 {
@@ -1504,7 +1504,7 @@ SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface)
                     return Blit8888to8888PixelAlphaSwizzleLSX;
                     return Blit8888to8888PixelAlphaSwizzleLSX;
                 }
                 }
 #endif
 #endif
-#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8)
+#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__)
                 // To prevent "unused function" compiler warnings/errors
                 // To prevent "unused function" compiler warnings/errors
                 (void)Blit8888to8888PixelAlpha;
                 (void)Blit8888to8888PixelAlpha;
                 (void)Blit8888to8888PixelAlphaSwizzle;
                 (void)Blit8888to8888PixelAlphaSwizzle;

+ 2 - 2
src/video/SDL_blit_N.c

@@ -2689,7 +2689,7 @@ static void SDL_TARGETING("avx2") Blit8888to8888PixelSwizzleAVX2(SDL_BlitInfo *i
 
 
 #endif
 #endif
 
 
-#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8)
+#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__)
 
 
 static void Blit8888to8888PixelSwizzleNEON(SDL_BlitInfo *info)
 static void Blit8888to8888PixelSwizzleNEON(SDL_BlitInfo *info)
 {
 {
@@ -3117,7 +3117,7 @@ SDL_BlitFunc SDL_CalculateBlitN(SDL_Surface *surface)
                 return Blit8888to8888PixelSwizzleSSE41;
                 return Blit8888to8888PixelSwizzleSSE41;
             }
             }
 #endif
 #endif
-#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8)
+#if defined(SDL_NEON_INTRINSICS) && (__ARM_ARCH >= 8) && defined(__aarch64__)
             return Blit8888to8888PixelSwizzleNEON;
             return Blit8888to8888PixelSwizzleNEON;
 #endif
 #endif
         }
         }