diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-08 14:10:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:03:48 +0100 |
commit | ca649e3f6f03c5351a090852ff93a23e7382c86a (patch) | |
tree | 3273897abf1ea0991a78ae884f967b2c88fa9811 /recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch | |
parent | ede15adc71f7f1c2acd63e96777b5d02d052a681 (diff) |
qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch index 7f6e4bdf..4dafd779 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch @@ -24,18 +24,19 @@ moment. Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> --- - .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index de14e65b94e..b8be7852086 100644 +index b59506d..b8f22c9 100644 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { +@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { } SI F from_half(U16 h) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - __fp16 fp16; - memcpy(&fp16, &h, sizeof(U16)); - return float(fp16); @@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644 return _mm256_cvtph_ps(h); #else -@@ -751,13 +746,7 @@ SI F from_half(U16 h) { +@@ -995,14 +989,7 @@ SI F from_half(U16 h) { } SI U16 to_half(F f) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - __fp16 fp16 = __fp16(f); - U16 u16; - memcpy(&u16, &fp16, sizeof(U16)); |