cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=835c393d17a333675aa91ffcac801483fcbd5a35

commit 835c393d17a333675aa91ffcac801483fcbd5a35
Author: Yury Usishchev <y.usishc...@samsung.com>
Date:   Wed May 13 15:33:15 2015 +0200

    evas: add support for BUILD_NEON_INTRINSICS to evas_convert_rgb_32.c
    
    Summary: This fixes build for aarch64 when TILE_ROTATE is disabled and 
BUILD_NEON is enabled(it is enabled by default for aarch64 since 
https://phab.enlightenment.org/D2309).
    
    Reviewers: cedric, raster
    
    Subscribers: cedric
    
    Projects: #efl
    
    Differential Revision: https://phab.enlightenment.org/D2498
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/lib/evas/common/evas_convert_rgb_32.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/lib/evas/common/evas_convert_rgb_32.c 
b/src/lib/evas/common/evas_convert_rgb_32.c
index 0cc3315..89789b2 100644
--- a/src/lib/evas/common/evas_convert_rgb_32.c
+++ b/src/lib/evas/common/evas_convert_rgb_32.c
@@ -308,27 +308,32 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 
(DATA32 *src, DATA8 *dst, int
 void
 evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, 
int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y 
EINA_UNUSED, DATA8 *pal EINA_UNUSED)
 {
-# ifndef BUILD_NEON
-#  ifdef TILE_ROTATE
+#ifdef TILE_ROTATE
    blt_rotated_90_8888((DATA8 *)dst,  dst_jump+w, (const DATA8 *)src, 
src_jump+h, w, h) ;
-#  else
+#else
+# ifndef BUILD_NEON
    DATA32 *src_ptr;
    DATA32 *dst_ptr;
    int x, y;
-   
+
+   dst_ptr = (DATA32 *)dst;
+   CONVERT_LOOP_START_ROT_90();
+
+   *dst_ptr = *src_ptr;
+
+   CONVERT_LOOP_END_ROT_90();
+# elif defined BUILD_NEON_INTRINSICS
+   DATA32 *src_ptr;
+   DATA32 *dst_ptr;
+   int x, y;
+
    dst_ptr = (DATA32 *)dst;
    CONVERT_LOOP_START_ROT_90();
 
    *dst_ptr = *src_ptr;
 
    CONVERT_LOOP_END_ROT_90();
-#  endif
-   
 # else
-   
-#  ifdef TILE_ROTATE
-   blt_rotated_90_8888((DATA8 *)dst,  dst_jump+w, (const DATA8 *)src, 
src_jump+h, w, h) ;
-#  else
    if ((w & 1) || (h & 1))
      {
         /* Rarely (if ever) if ever: so slow path is fine */
@@ -345,7 +350,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 
*src, DATA8 *dst, int
      }
    else
      {
-#   define AP  "convert_rgba32_rot_90_"
+#  define AP  "convert_rgba32_rot_90_"
         asm volatile (
         ".fpu neon                      \n\t"
         "   mov     %[s1],  %[src]          \n\t"
@@ -417,9 +422,9 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 
*src, DATA8 *dst, int
 
         );
      }
-#   undef AP
-#  endif
+#  undef AP
 # endif
+#endif
    return;
 }
 

-- 


Reply via email to