From c85a5291401806f48c6d5b762870dde73395be5a Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Thu, 23 Aug 2012 01:38:37 +0300
Subject: [PATCH] refactor NEON blit checks

---
 src/video/SDL_blit_A.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 565879d..d5000b2 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -2857,7 +2857,9 @@ SDL_loblit SDL_CalculateAlphaBlit(SDL_Surface *surface, int blit_index)
 			if(sf->Rshift % 8 == 0
 			   && sf->Gshift % 8 == 0
 			   && sf->Bshift % 8 == 0)
+			{
 				return BlitARGBtoXRGBalphaS_neon;
+			}
 #endif
 			if((sf->Rmask | sf->Gmask | sf->Bmask) == 0xffffff)
 			{
@@ -2869,6 +2871,13 @@ SDL_loblit SDL_CalculateAlphaBlit(SDL_Surface *surface, int blit_index)
 				return BlitRGBtoRGBSurfaceAlpha;
 			}
 		}
+#ifdef __ARM_NEON__
+		if (sf->Gmask == df->Gmask && sf->Rmask == df->Bmask && sf->Bmask == df->Rmask
+		    && sf->Rshift % 8 == 0 && sf->Gshift % 8 == 0 && sf->Bshift % 8 == 0)
+		{
+			return BlitABGRtoXRGBalphaS_neon;
+		}
+#endif
 #if SDL_ALTIVEC_BLITTERS
 		if((sf->BytesPerPixel == 4) &&
 		   !(surface->map->dst->flags & SDL_HWSURFACE) && SDL_HasAltiVec())
@@ -2925,6 +2934,15 @@ SDL_loblit SDL_CalculateAlphaBlit(SDL_Surface *surface, int blit_index)
 			if(SDL_HasMMX())
 				return BlitRGBtoRGBPixelAlphaMMX;
 		}
+#endif
+#ifdef __ARM_NEON__
+		if(sf->Rshift % 8 == 0
+		   && sf->Gshift % 8 == 0
+		   && sf->Bshift % 8 == 0
+		   && sf->Ashift % 8 == 0)
+		{
+			return BlitARGBtoXRGBalpha_neon;
+		}
 #endif
 		if(sf->Amask == 0xff000000)
 		{
@@ -2932,17 +2950,14 @@ SDL_loblit SDL_CalculateAlphaBlit(SDL_Surface *surface, int blit_index)
 			if(!(surface->map->dst->flags & SDL_HWSURFACE)
 				&& SDL_HasAltiVec())
 				return BlitRGBtoRGBPixelAlphaAltivec;
-#endif
-#ifdef __ARM_NEON__
-			return BlitARGBtoXRGBalpha_neon;
 #endif
 			return BlitRGBtoRGBPixelAlpha;
 		}
 	    }
 #ifdef __ARM_NEON__
-	    if (sf->Gmask == df->Gmask && sf->Amask == 0xff000000 &&
-		((sf->Rmask == 0xff && df->Rmask == 0xff0000 && sf->Bmask == 0xff0000 && df->Bmask == 0xff) ||
-		 (sf->Rmask == 0xff0000 && df->Rmask == 0xff && sf->Bmask == 0xff && df->Bmask == 0xff0000)))
+	    if (sf->Gmask == df->Gmask && sf->Rmask == df->Bmask && sf->Bmask == df->Rmask
+		&& sf->Rshift % 8 == 0 && sf->Gshift % 8 == 0 && sf->Bshift % 8 == 0
+		&& sf->Amask == 0xff000000)
 	    {
 		return BlitABGRtoXRGBalpha_neon;
 	    }
-- 
2.39.2