Fix S32A_D565_Opaque for RGBA on arm64

src/opts/SkBlitRow_opts_arm_neon.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlitRow_opts_arm_neon.h"
 
 #include "SkBlitMask.h"
@@ skipping 405 matching lines @@
             "ushr    v18.8h, v5.8h, #6              \t\n"
             "ushr    v21.8h, v17.8h, #5             \t\n"
             "addhn2  v7.16b, v5.8h, v18.8h          \t\n"
             "addhn2  v20.16b, v17.8h, v21.8h        \t\n"
             "mov     v22.16b, v4.16b                \t\n"
             "addhn   v6.8b, v6.8h, v19.8h           \t\n"
             "umlal2  v22.8h, v3.16b, v16.16b        \t\n"
             "ushr    v5.8h, v22.8h, #5              \t\n"
             "addhn2  v6.16b, v22.8h, v5.8h          \t\n"
             "uqadd   v7.16b, v1.16b, v7.16b         \t\n"
+#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
             "uqadd   v20.16b, v2.16b, v20.16b       \t\n"
             "uqadd   v6.16b, v0.16b, v6.16b         \t\n"
+#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
+            "uqadd   v20.16b, v0.16b, v20.16b       \t\n"
+            "uqadd   v6.16b, v2.16b, v6.16b         \t\n"
+#else
+#error "This function only supports BGRA and RGBA."
+#endif
             "shll    v22.8h, v20.8b, #8             \t\n"
             "shll    v5.8h, v7.8b, #8               \t\n"
             "sri     v22.8h, v5.8h, #5              \t\n"
             "shll    v17.8h, v6.8b, #8              \t\n"
             "shll2   v23.8h, v20.16b, #8            \t\n"
             "shll2   v7.8h, v7.16b, #8              \t\n"
             "sri     v22.8h, v17.8h, #11            \t\n"
             "sri     v23.8h, v7.8h, #5              \t\n"
             "shll2   v6.8h, v6.16b, #8              \t\n"
             "st1     {v22.8h}, [%[dst]], #16        \t\n"
@@ skipping 1198 matching lines @@
         count--;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 const SkBlitRow::Proc sk_blitrow_platform_565_procs_arm_neon[] = {
     // no dither
     S32_D565_Opaque_neon,
     S32_D565_Blend_neon,
-#ifdef SK_CPU_ARM32
     S32A_D565_Opaque_neon,
-#else
-    NULL,
-#endif
     S32A_D565_Blend_neon,
 
     // dither
     S32_D565_Opaque_Dither_neon,
     S32_D565_Blend_Dither_neon,
     S32A_D565_Opaque_Dither_neon,
     NULL,   // S32A_D565_Blend_Dither
 };
 
 const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm_neon[] = {
@@ skipping 13 matching lines @@
     S32A_Opaque_BlitRow32_neon_src_alpha,   // S32A_Opaque,
 #else
     S32A_Opaque_BlitRow32_neon,     // S32A_Opaque,
 #endif
 #ifdef SK_CPU_ARM32
     S32A_Blend_BlitRow32_neon        // S32A_Blend
 #else
     NULL
 #endif
 };