ARM Skia NEON patches - 35 - First AArch64 support

src/opts/SkBitmapProcState_opts_arm.cpp

Index: src/opts/SkBitmapProcState_opts_arm.cpp
diff --git a/src/opts/SkBitmapProcState_opts_arm.cpp b/src/opts/SkBitmapProcState_opts_arm.cpp
index 96fbebd4e19b0cba8f51dad9c023d536f6c78d80..220e7f031059242e7ac4bca8f843c40dd47b3d46 100644
--- a/src/opts/SkBitmapProcState_opts_arm.cpp
+++ b/src/opts/SkBitmapProcState_opts_arm.cpp
@@ -15,7 +15,7 @@
 
 #include "SkConvolver.h"
 
-#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
+#if defined(SK_CPU_ARM) && SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)

[djsollen, 2014/03/20 14:40:16]

does this impl that SK_CPU_ARM is not defined for AARCH64? If you goal is to
just ensure this code does execute in 64-bit mode I think it would be clearer to
say !defined(SK_CPU_ARM64).

[kevin.petit, 2014/03/20 16:05:09]

Yes, that's the goal. I'll change it in the next patch.

 void SI8_D16_nofilter_DX_arm(
     const SkBitmapProcState& s,
     const uint32_t* SK_RESTRICT xy,
@@ -186,7 +186,7 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s,
 
     s.fBitmap->getColorTable()->unlockColors();
 }
-#endif // SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
+#endif // defined(SK_CPU_ARM) && SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -194,6 +194,7 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s,
     otherwise the shader won't even look at the matrix/sampler
  */
 void SkBitmapProcState::platformProcs() {
+#if defined(SK_CPU_ARM) && SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)

[kevin.petit, 2014/03/20 16:05:09]

Note to myself: do the same as above here.

     bool isOpaque = 256 == fAlphaScale;
     bool justDx = false;
 
@@ -203,7 +204,6 @@ void SkBitmapProcState::platformProcs() {
 
     switch (fBitmap->config()) {
         case SkBitmap::kIndex8_Config:
-#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
             if (justDx && SkPaint::kNone_FilterLevel == fFilterLevel) {
 #if 0   /* crashing on android device */
                 fSampleProc16 = SI8_D16_nofilter_DX_arm;
@@ -215,11 +215,11 @@ void SkBitmapProcState::platformProcs() {
                     fShaderProc32 = NULL;
                 }
             }
-#endif
             break;
         default:
             break;
     }
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////