46 lines
2.5 KiB
Diff
46 lines
2.5 KiB
Diff
diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
|
|
--- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia 2020-01-02 22:33:02.000000000 +0100
|
|
+++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h 2020-01-03 09:00:37.537296105 +0100
|
|
@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
|
|
|
|
static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
|
|
Sk4h hs = Sk4h::Load(&rgba);
|
|
-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
float32x4_t fs;
|
|
asm ("fcvtl %[fs].4s, %[hs].4h \n" // vcvt_f32_f16(...)
|
|
: [fs] "=w" (fs) // =w: write-only NEON register
|
|
@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
|
|
}
|
|
|
|
static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
|
|
-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
float32x4_t vec = fs.fVec;
|
|
asm ("fcvtn %[vec].4h, %[vec].4s \n" // vcvt_f16_f32(vec)
|
|
: [vec] "+w" (vec)); // +w: read-write NEON register
|
|
diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
|
|
--- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia 2020-01-03 09:00:37.538296107 +0100
|
|
+++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h 2020-01-03 10:11:41.259219508 +0100
|
|
@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
|
|
}
|
|
|
|
SI U16 to_half(F f) {
|
|
-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
|
+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
|
&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
return vcvt_f16_f32(f);
|
|
|
|
diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
|
|
--- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia 2020-01-03 09:00:37.538296107 +0100
|
|
+++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h 2020-01-03 10:11:53.513250979 +0100
|
|
@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
|
|
SI U16 Half_from_F(F f) {
|
|
#if defined(USING_NEON_FP16)
|
|
return bit_pun<U16>(f);
|
|
-#elif 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 );
|
|
#elif defined(USING_AVX_F16C)
|