22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
diff -up chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|
--- chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-05-30 12:38:06.131467092 -0400
|
|
+++ chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-05-30 12:38:39.861734819 -0400
|
|
@@ -653,7 +653,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)
|
|
@@ -673,7 +673,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)
|