refactor NEON blit checks
[sdl_omap.git] / src / video / SDL_blit_A.c
index 5a4cff0..d5000b2 100644 (file)
@@ -82,8 +82,29 @@ static void name(SDL_BlitInfo *info) \
        } \
 }
 
+#define make_neon_callerS(name, neon_name) \
+extern void neon_name(void *dst, const void *src, int count, unsigned int alpha); \
+static void name(SDL_BlitInfo *info) \
+{ \
+       int width = info->d_width; \
+       int height = info->d_height; \
+       Uint8 *src = info->s_pixels; \
+       Uint8 *dst = info->d_pixels; \
+       int srcskip = info->s_skip; \
+       int dstskip = info->d_skip; \
+       unsigned alpha = info->src->alpha;\
+\
+       while ( height-- ) { \
+           neon_name(dst, src, width, alpha); \
+           src += width * 4 + srcskip; \
+           dst += width * 4 + dstskip; \
+       } \
+}
+
 make_neon_caller(BlitABGRtoXRGBalpha_neon, neon_ABGRtoXRGBalpha)
 make_neon_caller(BlitARGBtoXRGBalpha_neon, neon_ARGBtoXRGBalpha)
+make_neon_callerS(BlitABGRtoXRGBalphaS_neon, neon_ABGRtoXRGBalphaS)
+make_neon_callerS(BlitARGBtoXRGBalphaS_neon, neon_ARGBtoXRGBalphaS)
 
 #endif /* __ARM_NEON__ */
 
@@ -2831,6 +2852,14 @@ SDL_loblit SDL_CalculateAlphaBlit(SDL_Surface *surface, int blit_index)
                           && sf->Bshift % 8 == 0
                           && SDL_HasMMX())
                            return BlitRGBtoRGBSurfaceAlphaMMX;
+#endif
+#ifdef __ARM_NEON__
+                       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)
                        {
@@ -2842,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())
@@ -2898,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)
                {
@@ -2905,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;
            }