@shopify/react-native-skia 0.1.197 → 0.1.199

package/cpp/skia/modules/skcms/src/Transform_inl.h

@@ -51,11 +51,19 @@ using U8  = V<uint8_t>;
 // This is more for organizational clarity... skcms.cc doesn't force these.
 #if N > 1 && defined(__ARM_NEON)
     #define USING_NEON
-    #if __ARM_FP & 2
-        #define USING_NEON_F16C
-    #endif
-    #if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(SKCMS_OPT_INTO_NEON_FP16)
-        #define USING_NEON_FP16
+
+    // We have to use two different mechanisms to enable the f16 conversion intrinsics:
+    #if defined(__clang__)
+        // Clang's arm_neon.h guards them with the FP hardware bit:
+        #if __ARM_FP & 2
+            #define USING_NEON_F16C
+        #endif
+    #elif defined(__GNUC__)
+        // GCC's arm_neon.h guards them with the FP16 format macros (IEEE and ALTERNATIVE).
+        // We don't actually want the alternative format - we're reading/writing IEEE f16 values.
+        #if defined(__ARM_FP16_FORMAT_IEEE)
+            #define USING_NEON_F16C
+        #endif
     #endif
 #endif
 
@@ -132,12 +140,7 @@ SI D bit_pun(const S& v) {
 // When we convert from float to fixed point, it's very common to want to round,
 // and for some reason compilers generate better code when converting to int32_t.
 // To serve both those ends, we use this function to_fixed() instead of direct cast().
-#if defined(USING_NEON_FP16)
-    // NEON's got a F16 -> U16 instruction, so this should be fine without going via I16.
-    SI U16 to_fixed(F f) {  return cast<U16>(f + 0.5f); }
-#else
-    SI U32 to_fixed(F f) {  return (U32)cast<I32>(f + 0.5f); }
-#endif
+SI U32 to_fixed(F f) {  return (U32)cast<I32>(f + 0.5f); }
 
 
 // Sometimes we do something crazy on one branch of a conditonal,
@@ -158,9 +161,7 @@ SI D bit_pun(const S& v) {
 
 
 SI F F_from_Half(U16 half) {
-#if defined(USING_NEON_FP16)
-    return bit_pun<F>(half);
-#elif defined(USING_NEON_F16C)
+#if defined(USING_NEON_F16C)
     return vcvt_f32_f16((float16x4_t)half);
 #elif defined(USING_AVX512F)
     return (F)_mm512_cvtph_ps((__m256i)half);
@@ -187,9 +188,7 @@ SI F F_from_Half(U16 half) {
     __attribute__((no_sanitize("unsigned-integer-overflow")))
 #endif
 SI U16 Half_from_F(F f) {
-#if defined(USING_NEON_FP16)
-    return bit_pun<U16>(f);
-#elif defined(USING_NEON_F16C)
+#if defined(USING_NEON_F16C)
     return (U16)vcvt_f16_f32(f);
 #elif defined(USING_AVX512F)
     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
@@ -208,11 +207,7 @@ SI U16 Half_from_F(F f) {
 }
 
 // Swap high and low bytes of 16-bit lanes, converting between big-endian and little-endian.
-#if defined(USING_NEON_FP16)
-    SI U16 swap_endian_16(U16 v) {
-        return (U16)vrev16q_u8((uint8x16_t) v);
-    }
-#elif defined(USING_NEON)
+#if defined(USING_NEON)
     SI U16 swap_endian_16(U16 v) {
         return (U16)vrev16_u8((uint8x8_t) v);
     }
@@ -223,10 +218,7 @@ SI U64 swap_endian_16x4(const U64& rgba) {
          | (rgba & 0xff00ff00ff00ff00) >> 8;
 }
 
-#if defined(USING_NEON_FP16)
-    SI F min_(F x, F y) { return (F)vminq_f16((float16x8_t)x, (float16x8_t)y); }
-    SI F max_(F x, F y) { return (F)vmaxq_f16((float16x8_t)x, (float16x8_t)y); }
-#elif defined(USING_NEON)
+#if defined(USING_NEON)
     SI F min_(F x, F y) { return (F)vminq_f32((float32x4_t)x, (float32x4_t)y); }
     SI F max_(F x, F y) { return (F)vmaxq_f32((float32x4_t)x, (float32x4_t)y); }
 #else
@@ -237,8 +229,6 @@ SI U64 swap_endian_16x4(const U64& rgba) {
 SI F floor_(F x) {
 #if N == 1
     return floorf_(x);
-#elif defined(USING_NEON_FP16)
-    return vrndmq_f16(x);
 #elif defined(__aarch64__)
     return vrndmq_f32(x);
 #elif defined(USING_AVX512F)
@@ -263,10 +253,6 @@ SI F floor_(F x) {
 }
 
 SI F approx_log2(F x) {
-#if defined(USING_NEON_FP16)
-    // TODO(mtklein)
-    return x;
-#else
     // The first approximation of log2(x) is its exponent 'e', minus 127.
     I32 bits = bit_pun<I32>(x);
 
@@ -278,7 +264,6 @@ SI F approx_log2(F x) {
     return e - 124.225514990f
              -   1.498030302f*m
              -   1.725879990f/(0.3520887068f + m);
-#endif
 }
 
 SI F approx_log(F x) {
@@ -287,10 +272,6 @@ SI F approx_log(F x) {
 }
 
 SI F approx_exp2(F x) {
-#if defined(USING_NEON_FP16)
-    // TODO(mtklein)
-    return x;
-#else
     F fract = x - floor_(x);
 
     F fbits = (1.0f * (1<<23)) * (x + 121.274057500f
@@ -299,7 +280,6 @@ SI F approx_exp2(F x) {
     I32 bits = cast<I32>(min_(max_(fbits, F0), FInfBits));
 
     return bit_pun<F>(bits);
-#endif
 }
 
 SI F approx_pow(F x, float y) {
@@ -314,11 +294,6 @@ SI F approx_exp(F x) {
 
 // Return tf(x).
 SI F apply_tf(const skcms_TransferFunction* tf, F x) {
-#if defined(USING_NEON_FP16)
-    // TODO(mtklein)
-    (void)tf;
-    return x;
-#else
     // Peel off the sign bit and set x = |x|.
     U32 bits = bit_pun<U32>(x),
         sign = bits & 0x80000000;
@@ -330,15 +305,9 @@ SI F apply_tf(const skcms_TransferFunction* tf, F x) {
 
     // Tack the sign bit back on.
     return bit_pun<F>(sign | bit_pun<U32>(v));
-#endif
 }
 
 SI F apply_pq(const skcms_TransferFunction* tf, F x) {
-#if defined(USING_NEON_FP16)
-    // TODO(mtklein)
-    (void)tf;
-    return x;
-#else
     U32 bits = bit_pun<U32>(x),
         sign = bits & 0x80000000;
     x = bit_pun<F>(bits ^ sign);
@@ -348,15 +317,9 @@ SI F apply_pq(const skcms_TransferFunction* tf, F x) {
                      tf->f);
 
     return bit_pun<F>(sign | bit_pun<U32>(v));
-#endif
 }
 
 SI F apply_hlg(const skcms_TransferFunction* tf, F x) {
-#if defined(USING_NEON_FP16)
-    // TODO(mtklein)
-    (void)tf;
-    return x;
-#else
     const float R = tf->a, G = tf->b,
                 a = tf->c, b = tf->d, c = tf->e,
                 K = tf->f + 1;
@@ -368,15 +331,9 @@ SI F apply_hlg(const skcms_TransferFunction* tf, F x) {
                                , approx_exp((x-c)*a) + b);
 
     return K*bit_pun<F>(sign | bit_pun<U32>(v));
-#endif
 }
 
 SI F apply_hlginv(const skcms_TransferFunction* tf, F x) {
-#if defined(USING_NEON_FP16)
-    // TODO(mtklein)
-    (void)tf;
-    return x;
-#else
     const float R = tf->a, G = tf->b,
                 a = tf->c, b = tf->d, c = tf->e,
                 K = tf->f + 1;
@@ -389,7 +346,6 @@ SI F apply_hlginv(const skcms_TransferFunction* tf, F x) {
                              , a * approx_log(x - b) + c);
 
     return bit_pun<F>(sign | bit_pun<U32>(v));
-#endif
 }
 
 
@@ -636,11 +592,7 @@ SI U16 U16_from_F(F v) {
 }
 
 SI F minus_1_ulp(F v) {
-#if defined(USING_NEON_FP16)
-    return bit_pun<F>( bit_pun<U16>(v) - 1 );
-#else
     return bit_pun<F>( bit_pun<U32>(v) - 1 );
-#endif
 }
 
 SI F table(const skcms_Curve* curve, F v) {
@@ -835,23 +787,7 @@ static void exec_ops(const Op* ops, const void** args,
 
             case Op_load_888:{
                 const uint8_t* rgb = (const uint8_t*)(src + 3*i);
-            #if defined(USING_NEON_FP16)
-                // See the explanation under USING_NEON below.  This is that doubled up.
-                uint8x16x3_t v = {{ vdupq_n_u8(0), vdupq_n_u8(0), vdupq_n_u8(0) }};
-                v = vld3q_lane_u8(rgb+ 0, v,  0);
-                v = vld3q_lane_u8(rgb+ 3, v,  2);
-                v = vld3q_lane_u8(rgb+ 6, v,  4);
-                v = vld3q_lane_u8(rgb+ 9, v,  6);
-
-                v = vld3q_lane_u8(rgb+12, v,  8);
-                v = vld3q_lane_u8(rgb+15, v, 10);
-                v = vld3q_lane_u8(rgb+18, v, 12);
-                v = vld3q_lane_u8(rgb+21, v, 14);
-
-                r = cast<F>((U16)v.val[0]) * (1/255.0f);
-                g = cast<F>((U16)v.val[1]) * (1/255.0f);
-                b = cast<F>((U16)v.val[2]) * (1/255.0f);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 // There's no uint8x4x3_t or vld3 load for it, so we'll load each rgb pixel one at
                 // a time.  Since we're doing that, we might as well load them into 16-bit lanes.
                 // (We'd even load into 32-bit lanes, but that's not possible on ARMv7.)
@@ -917,12 +853,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 6*i);
                 assert( (ptr & 1) == 0 );                   // src must be 2-byte aligned for this
                 const uint16_t* rgb = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x3_t v = vld3q_u16(rgb);
-                r = cast<F>((U16)v.val[0]) * (1/65535.0f);
-                g = cast<F>((U16)v.val[1]) * (1/65535.0f);
-                b = cast<F>((U16)v.val[2]) * (1/65535.0f);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x3_t v = vld3_u16(rgb);
                 r = cast<F>((U16)v.val[0]) * (1/65535.0f);
                 g = cast<F>((U16)v.val[1]) * (1/65535.0f);
@@ -938,13 +869,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 8*i);
                 assert( (ptr & 1) == 0 );                    // src must be 2-byte aligned for this
                 const uint16_t* rgba = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x4_t v = vld4q_u16(rgba);
-                r = cast<F>((U16)v.val[0]) * (1/65535.0f);
-                g = cast<F>((U16)v.val[1]) * (1/65535.0f);
-                b = cast<F>((U16)v.val[2]) * (1/65535.0f);
-                a = cast<F>((U16)v.val[3]) * (1/65535.0f);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x4_t v = vld4_u16(rgba);
                 r = cast<F>((U16)v.val[0]) * (1/65535.0f);
                 g = cast<F>((U16)v.val[1]) * (1/65535.0f);
@@ -964,12 +889,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 6*i);
                 assert( (ptr & 1) == 0 );                   // src must be 2-byte aligned for this
                 const uint16_t* rgb = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x3_t v = vld3q_u16(rgb);
-                r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
-                g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
-                b = cast<F>(swap_endian_16((U16)v.val[2])) * (1/65535.0f);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x3_t v = vld3_u16(rgb);
                 r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
                 g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
@@ -989,13 +909,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 8*i);
                 assert( (ptr & 1) == 0 );                    // src must be 2-byte aligned for this
                 const uint16_t* rgba = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x4_t v = vld4q_u16(rgba);
-                r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
-                g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
-                b = cast<F>(swap_endian_16((U16)v.val[2])) * (1/65535.0f);
-                a = cast<F>(swap_endian_16((U16)v.val[3])) * (1/65535.0f);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x4_t v = vld4_u16(rgba);
                 r = cast<F>(swap_endian_16((U16)v.val[0])) * (1/65535.0f);
                 g = cast<F>(swap_endian_16((U16)v.val[1])) * (1/65535.0f);
@@ -1015,12 +929,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 6*i);
                 assert( (ptr & 1) == 0 );                   // src must be 2-byte aligned for this
                 const uint16_t* rgb = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x3_t v = vld3q_u16(rgb);
-                U16 R = (U16)v.val[0],
-                    G = (U16)v.val[1],
-                    B = (U16)v.val[2];
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x3_t v = vld3_u16(rgb);
                 U16 R = (U16)v.val[0],
                     G = (U16)v.val[1],
@@ -1039,13 +948,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 8*i);
                 assert( (ptr & 1) == 0 );                    // src must be 2-byte aligned for this
                 const uint16_t* rgba = (const uint16_t*)ptr; // cast to const uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x4_t v = vld4q_u16(rgba);
-                U16 R = (U16)v.val[0],
-                    G = (U16)v.val[1],
-                    B = (U16)v.val[2],
-                    A = (U16)v.val[3];
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x4_t v = vld4_u16(rgba);
                 U16 R = (U16)v.val[0],
                     G = (U16)v.val[1],
@@ -1068,13 +971,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 12*i);
                 assert( (ptr & 3) == 0 );                   // src must be 4-byte aligned for this
                 const float* rgb = (const float*)ptr;       // cast to const float* to be safe.
-            #if defined(USING_NEON_FP16)
-                float32x4x3_t lo = vld3q_f32(rgb +  0),
-                              hi = vld3q_f32(rgb + 12);
-                r = (F)vcombine_f16(vcvt_f16_f32(lo.val[0]), vcvt_f16_f32(hi.val[0]));
-                g = (F)vcombine_f16(vcvt_f16_f32(lo.val[1]), vcvt_f16_f32(hi.val[1]));
-                b = (F)vcombine_f16(vcvt_f16_f32(lo.val[2]), vcvt_f16_f32(hi.val[2]));
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 float32x4x3_t v = vld3q_f32(rgb);
                 r = (F)v.val[0];
                 g = (F)v.val[1];
@@ -1090,14 +987,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(src + 16*i);
                 assert( (ptr & 3) == 0 );                   // src must be 4-byte aligned for this
                 const float* rgba = (const float*)ptr;      // cast to const float* to be safe.
-            #if defined(USING_NEON_FP16)
-                float32x4x4_t lo = vld4q_f32(rgba +  0),
-                              hi = vld4q_f32(rgba + 16);
-                r = (F)vcombine_f16(vcvt_f16_f32(lo.val[0]), vcvt_f16_f32(hi.val[0]));
-                g = (F)vcombine_f16(vcvt_f16_f32(lo.val[1]), vcvt_f16_f32(hi.val[1]));
-                b = (F)vcombine_f16(vcvt_f16_f32(lo.val[2]), vcvt_f16_f32(hi.val[2]));
-                a = (F)vcombine_f16(vcvt_f16_f32(lo.val[3]), vcvt_f16_f32(hi.val[3]));
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 float32x4x4_t v = vld4q_f32(rgba);
                 r = (F)v.val[0];
                 g = (F)v.val[1];
@@ -1280,23 +1170,7 @@ static void exec_ops(const Op* ops, const void** args,
 
             case Op_store_888: {
                 uint8_t* rgb = (uint8_t*)dst + 3*i;
-            #if defined(USING_NEON_FP16)
-                // See the explanation under USING_NEON below.  This is that doubled up.
-                U16 R = to_fixed(r * 255),
-                    G = to_fixed(g * 255),
-                    B = to_fixed(b * 255);
-
-                uint8x16x3_t v = {{ (uint8x16_t)R, (uint8x16_t)G, (uint8x16_t)B }};
-                vst3q_lane_u8(rgb+ 0, v,  0);
-                vst3q_lane_u8(rgb+ 3, v,  2);
-                vst3q_lane_u8(rgb+ 6, v,  4);
-                vst3q_lane_u8(rgb+ 9, v,  6);
-
-                vst3q_lane_u8(rgb+12, v,  8);
-                vst3q_lane_u8(rgb+15, v, 10);
-                vst3q_lane_u8(rgb+18, v, 12);
-                vst3q_lane_u8(rgb+21, v, 14);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 // Same deal as load_888 but in reverse... we'll store using uint8x8x3_t, but
                 // get there via U16 to save some instructions converting to float.  And just
                 // like load_888, we'd prefer to go via U32 but for ARMv7 support.
@@ -1343,14 +1217,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(dst + 6*i);
                 assert( (ptr & 1) == 0 );                // The dst pointer must be 2-byte aligned
                 uint16_t* rgb = (uint16_t*)ptr;          // for this cast to uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x3_t v = {{
-                    (uint16x8_t)U16_from_F(r),
-                    (uint16x8_t)U16_from_F(g),
-                    (uint16x8_t)U16_from_F(b),
-                }};
-                vst3q_u16(rgb, v);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x3_t v = {{
                     (uint16x4_t)U16_from_F(r),
                     (uint16x4_t)U16_from_F(g),
@@ -1369,15 +1236,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(dst + 8*i);
                 assert( (ptr & 1) == 0 );               // The dst pointer must be 2-byte aligned
                 uint16_t* rgba = (uint16_t*)ptr;        // for this cast to uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x4_t v = {{
-                    (uint16x8_t)U16_from_F(r),
-                    (uint16x8_t)U16_from_F(g),
-                    (uint16x8_t)U16_from_F(b),
-                    (uint16x8_t)U16_from_F(a),
-                }};
-                vst4q_u16(rgba, v);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x4_t v = {{
                     (uint16x4_t)U16_from_F(r),
                     (uint16x4_t)U16_from_F(g),
@@ -1398,14 +1257,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(dst + 6*i);
                 assert( (ptr & 1) == 0 );                // The dst pointer must be 2-byte aligned
                 uint16_t* rgb = (uint16_t*)ptr;          // for this cast to uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x3_t v = {{
-                    (uint16x8_t)swap_endian_16(U16_from_F(r)),
-                    (uint16x8_t)swap_endian_16(U16_from_F(g)),
-                    (uint16x8_t)swap_endian_16(U16_from_F(b)),
-                }};
-                vst3q_u16(rgb, v);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x3_t v = {{
                     (uint16x4_t)swap_endian_16(cast<U16>(U16_from_F(r))),
                     (uint16x4_t)swap_endian_16(cast<U16>(U16_from_F(g))),
@@ -1427,15 +1279,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(dst + 8*i);
                 assert( (ptr & 1) == 0 );               // The dst pointer must be 2-byte aligned
                 uint16_t* rgba = (uint16_t*)ptr;        // for this cast to uint16_t* to be safe.
-            #if defined(USING_NEON_FP16)
-                uint16x8x4_t v = {{
-                    (uint16x8_t)swap_endian_16(U16_from_F(r)),
-                    (uint16x8_t)swap_endian_16(U16_from_F(g)),
-                    (uint16x8_t)swap_endian_16(U16_from_F(b)),
-                    (uint16x8_t)swap_endian_16(U16_from_F(a)),
-                }};
-                vst4q_u16(rgba, v);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x4_t v = {{
                     (uint16x4_t)swap_endian_16(cast<U16>(U16_from_F(r))),
                     (uint16x4_t)swap_endian_16(cast<U16>(U16_from_F(g))),
@@ -1460,14 +1304,7 @@ static void exec_ops(const Op* ops, const void** args,
                 U16 R = Half_from_F(r),
                     G = Half_from_F(g),
                     B = Half_from_F(b);
-            #if defined(USING_NEON_FP16)
-                uint16x8x3_t v = {{
-                    (uint16x8_t)R,
-                    (uint16x8_t)G,
-                    (uint16x8_t)B,
-                }};
-                vst3q_u16(rgb, v);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x3_t v = {{
                     (uint16x4_t)R,
                     (uint16x4_t)G,
@@ -1490,15 +1327,7 @@ static void exec_ops(const Op* ops, const void** args,
                     G = Half_from_F(g),
                     B = Half_from_F(b),
                     A = Half_from_F(a);
-            #if defined(USING_NEON_FP16)
-                uint16x8x4_t v = {{
-                    (uint16x8_t)R,
-                    (uint16x8_t)G,
-                    (uint16x8_t)B,
-                    (uint16x8_t)A,
-                }};
-                vst4q_u16(rgba, v);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 uint16x4x4_t v = {{
                     (uint16x4_t)R,
                     (uint16x4_t)G,
@@ -1519,19 +1348,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(dst + 12*i);
                 assert( (ptr & 3) == 0 );                // The dst pointer must be 4-byte aligned
                 float* rgb = (float*)ptr;                // for this cast to float* to be safe.
-            #if defined(USING_NEON_FP16)
-                float32x4x3_t lo = {{
-                    vcvt_f32_f16(vget_low_f16(r)),
-                    vcvt_f32_f16(vget_low_f16(g)),
-                    vcvt_f32_f16(vget_low_f16(b)),
-                }}, hi = {{
-                    vcvt_f32_f16(vget_high_f16(r)),
-                    vcvt_f32_f16(vget_high_f16(g)),
-                    vcvt_f32_f16(vget_high_f16(b)),
-                }};
-                vst3q_f32(rgb +  0, lo);
-                vst3q_f32(rgb + 12, hi);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 float32x4x3_t v = {{
                     (float32x4_t)r,
                     (float32x4_t)g,
@@ -1549,21 +1366,7 @@ static void exec_ops(const Op* ops, const void** args,
                 uintptr_t ptr = (uintptr_t)(dst + 16*i);
                 assert( (ptr & 3) == 0 );                // The dst pointer must be 4-byte aligned
                 float* rgba = (float*)ptr;               // for this cast to float* to be safe.
-            #if defined(USING_NEON_FP16)
-                float32x4x4_t lo = {{
-                    vcvt_f32_f16(vget_low_f16(r)),
-                    vcvt_f32_f16(vget_low_f16(g)),
-                    vcvt_f32_f16(vget_low_f16(b)),
-                    vcvt_f32_f16(vget_low_f16(a)),
-                }}, hi = {{
-                    vcvt_f32_f16(vget_high_f16(r)),
-                    vcvt_f32_f16(vget_high_f16(g)),
-                    vcvt_f32_f16(vget_high_f16(b)),
-                    vcvt_f32_f16(vget_high_f16(a)),
-                }};
-                vst4q_f32(rgba +  0, lo);
-                vst4q_f32(rgba + 16, hi);
-            #elif defined(USING_NEON)
+            #if defined(USING_NEON)
                 float32x4x4_t v = {{
                     (float32x4_t)r,
                     (float32x4_t)g,
@@ -1621,8 +1424,5 @@ static void run_program(const Op* program, const void** arguments,
 #if defined(USING_NEON_F16C)
     #undef  USING_NEON_F16C
 #endif
-#if defined(USING_NEON_FP16)
-    #undef  USING_NEON_FP16
-#endif
 
 #undef FALLTHROUGH

package/cpp/skia/modules/skparagraph/include/Paragraph.h

@@ -6,6 +6,7 @@
 #include "modules/skparagraph/include/Metrics.h"
 #include "modules/skparagraph/include/ParagraphStyle.h"
 #include "modules/skparagraph/include/TextStyle.h"
+#include <unordered_set>
 
 class SkCanvas;
 
@@ -69,6 +70,7 @@ public:
     // This function will return the number of unresolved glyphs or
     // -1 if not applicable (has not been shaped yet - valid case)
     virtual int32_t unresolvedGlyphs() = 0;
+    virtual std::unordered_set<SkUnichar> unresolvedCodepoints() = 0;
 
     // Experimental API that allows fast way to update some of "immutable" paragraph attributes
     // but not the text itself

package/cpp/skia/modules/skparagraph/include/ParagraphBuilder.h

@@ -10,6 +10,7 @@
 #include "modules/skparagraph/include/Paragraph.h"
 #include "modules/skparagraph/include/ParagraphStyle.h"
 #include "modules/skparagraph/include/TextStyle.h"
+#include "modules/skunicode/include/SkUnicode.h"
 
 namespace skia {
 namespace textlayout {
@@ -55,6 +56,21 @@ public:
     // Constructs a SkParagraph object that can be used to layout and paint the text to a SkCanvas.
     virtual std::unique_ptr<Paragraph> Build() = 0;
 
+    virtual SkSpan<char> getText() = 0;
+    virtual const ParagraphStyle& getParagraphStyle() const = 0;
+
+    // Mainly, support for "Client" unicode
+    virtual void setWordsUtf8(std::vector<SkUnicode::Position> wordsUtf8) = 0;
+    virtual void setWordsUtf16(std::vector<SkUnicode::Position> wordsUtf16) = 0;
+
+    virtual void setGraphemeBreaksUtf8(std::vector<SkUnicode::Position> graphemesUtf8) = 0;
+    virtual void setGraphemeBreaksUtf16(std::vector<SkUnicode::Position> graphemesUtf16) = 0;
+
+    virtual void setLineBreaksUtf8(std::vector<SkUnicode::LineBreakBefore> lineBreaksUtf8) = 0;
+    virtual void setLineBreaksUtf16(std::vector<SkUnicode::LineBreakBefore> lineBreaksUtf16) = 0;
+
+    virtual void SetUnicode(std::unique_ptr<SkUnicode> unicode) = 0;
+
     // Resets this builder to its initial state, discarding any text, styles, placeholders that have
     // been added, but keeping the initial ParagraphStyle.
     virtual void Reset() = 0;

package/cpp/skia/modules/skparagraph/include/TextStyle.h

@@ -173,10 +173,12 @@ public:
     ParagraphPainter::SkPaintOrID getForegroundPaintOrID() const {
         return fForeground;
     }
-    void setForegroundColor(SkPaint paint) {
+    void setForegroundPaint(SkPaint paint) {
         fHasForeground = true;
         fForeground = std::move(paint);
     }
+    // DEPRECATED: prefer `setForegroundPaint`.
+    void setForegroundColor(SkPaint paint) { setForegroundPaint(paint); }
     // Set the foreground to a paint ID.  This is intended for use by clients
     // that implement a custom ParagraphPainter that can not accept an SkPaint.
     void setForegroundPaintID(ParagraphPainter::PaintID paintID) {
@@ -193,10 +195,12 @@ public:
     ParagraphPainter::SkPaintOrID getBackgroundPaintOrID() const {
         return fBackground;
     }
-    void setBackgroundColor(SkPaint paint) {
+    void setBackgroundPaint(SkPaint paint) {
         fHasBackground = true;
         fBackground = std::move(paint);
     }
+    // DEPRECATED: prefer `setBackgroundPaint`.
+    void setBackgroundColor(SkPaint paint) { setBackgroundPaint(paint); }
     void setBackgroundPaintID(ParagraphPainter::PaintID paintID) {
         fHasBackground = true;
         fBackground = paintID;

package/cpp/skia/modules/skresources/include/SkResources.h

@@ -225,7 +225,7 @@ protected:
     sk_sp<SkData> loadFont(const char[], const char[]) const override;
     sk_sp<ExternalTrackAsset> loadAudioAsset(const char[], const char[], const char[]) override;
 
-private:
+protected:
     const sk_sp<ResourceProvider> fProxy;
 };
 

package/cpp/skia/modules/svg/include/SkSVGCircle.h

@@ -13,7 +13,7 @@
 
 struct SkPoint;
 
-class SkSVGCircle final : public SkSVGShape {
+class SK_API SkSVGCircle final : public SkSVGShape {
 public:
     static sk_sp<SkSVGCircle> Make() { return sk_sp<SkSVGCircle>(new SkSVGCircle()); }
 

package/cpp/skia/modules/svg/include/SkSVGClipPath.h

@@ -11,7 +11,7 @@
 #include "modules/svg/include/SkSVGHiddenContainer.h"
 #include "modules/svg/include/SkSVGTypes.h"
 
-class SkSVGClipPath final : public SkSVGHiddenContainer {
+class SK_API SkSVGClipPath final : public SkSVGHiddenContainer {
 public:
     static sk_sp<SkSVGClipPath> Make() {
         return sk_sp<SkSVGClipPath>(new SkSVGClipPath());

package/cpp/skia/modules/svg/include/SkSVGContainer.h

@@ -11,7 +11,7 @@
 #include "include/private/base/SkTArray.h"
 #include "modules/svg/include/SkSVGTransformableNode.h"
 
-class SkSVGContainer : public SkSVGTransformableNode {
+class SK_API SkSVGContainer : public SkSVGTransformableNode {
 public:
     void appendChild(sk_sp<SkSVGNode>) override;
 

package/cpp/skia/modules/svg/include/SkSVGDOM.h

@@ -22,7 +22,7 @@ class SkSVGNode;
 struct SkSVGPresentationContext;
 class SkSVGSVG;
 
-class SkSVGDOM : public SkRefCnt {
+class SK_API SkSVGDOM : public SkRefCnt {
 public:
     class Builder final {
     public:

package/cpp/skia/modules/svg/include/SkSVGDefs.h

@@ -10,7 +10,7 @@
 
 #include "modules/svg/include/SkSVGHiddenContainer.h"
 
-class SkSVGDefs : public SkSVGHiddenContainer {
+class SK_API SkSVGDefs : public SkSVGHiddenContainer {
 public:
     static sk_sp<SkSVGDefs> Make() { return sk_sp<SkSVGDefs>(new SkSVGDefs()); }
 

package/cpp/skia/modules/svg/include/SkSVGEllipse.h

@@ -13,7 +13,7 @@
 
 struct SkRect;
 
-class SkSVGEllipse final : public SkSVGShape {
+class SK_API SkSVGEllipse final : public SkSVGShape {
 public:
     static sk_sp<SkSVGEllipse> Make() { return sk_sp<SkSVGEllipse>(new SkSVGEllipse()); }
 

package/cpp/skia/modules/svg/include/SkSVGFe.h

@@ -15,7 +15,7 @@
 class SkImageFilter;
 class SkSVGFilterContext;
 
-class SkSVGFe : public SkSVGHiddenContainer {
+class SK_API SkSVGFe : public SkSVGHiddenContainer {
 public:
     static bool IsFilterEffect(const sk_sp<SkSVGNode>& node) {
         switch (node->tag()) {