2018-06-20 13:03:59 +00:00
|
|
|
diff -up firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp
|
|
|
|
|
--- firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-06-20 09:19:11.411939714 +0200
|
|
|
|
|
+++ firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-06-20 09:23:36.831919894 +0200
|
2018-04-25 08:57:43 +00:00
|
|
|
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SI U16 to_half(F f) {
|
2018-06-20 13:03:59 +00:00
|
|
|
-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
2018-04-25 08:57:43 +00:00
|
|
|
+#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
|
|
|
return vcvt_f16_f32(f);
|
|
|
|
|
|
|
|
|
|
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
|
2019-07-09 12:22:23 +00:00
|
|
|
diff -up firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old firefox-68.0/gfx/skia/skia/include/private/SkHalf.h
|
|
|
|
|
--- firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old 2019-07-09 14:20:12.527441789 +0200
|
|
|
|
|
+++ firefox-68.0/gfx/skia/skia/include/private/SkHalf.h 2019-07-09 14:20:31.744366018 +0200
|
|
|
|
|
@@ -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
|
