22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
diff -up chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp.aarch64fix chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp
|
|
--- chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp.aarch64fix 2018-03-15 15:27:35.201345844 -0400
|
|
+++ chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp 2018-03-15 15:31:30.471777400 -0400
|
|
@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
|
|
}
|
|
|
|
SI F from_half(U16 h) {
|
|
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
return vcvt_f32_f16(h);
|
|
|
|
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
|
|
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
|
|
}
|
|
|
|
SI U16 to_half(F f) {
|
|
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
+#if defined(JUMPER_IS_NEON) && 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)
|