diff options
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. | |||
24 | 24 | ||
25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | 25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> |
26 | --- | 26 | --- |
27 | .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- | 27 | .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- |
28 | 1 file changed, 2 insertions(+), 13 deletions(-) | 28 | 1 file changed, 2 insertions(+), 15 deletions(-) |
29 | 29 | ||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
31 | index de14e65b94e..b8be7852086 100644 | 31 | index b59506d..b8f22c9 100644 |
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
34 | @@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { | 34 | @@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { |
35 | } | 35 | } |
36 | 36 | ||
37 | SI F from_half(U16 h) { | 37 | SI F from_half(U16 h) { |
38 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | 38 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ |
39 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
39 | - __fp16 fp16; | 40 | - __fp16 fp16; |
40 | - memcpy(&fp16, &h, sizeof(U16)); | 41 | - memcpy(&fp16, &h, sizeof(U16)); |
41 | - return float(fp16); | 42 | - return float(fp16); |
@@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644 | |||
45 | return _mm256_cvtph_ps(h); | 46 | return _mm256_cvtph_ps(h); |
46 | 47 | ||
47 | #else | 48 | #else |
48 | @@ -751,13 +746,7 @@ SI F from_half(U16 h) { | 49 | @@ -995,14 +989,7 @@ SI F from_half(U16 h) { |
49 | } | 50 | } |
50 | 51 | ||
51 | SI U16 to_half(F f) { | 52 | SI U16 to_half(F f) { |
52 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | 53 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ |
54 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
53 | - __fp16 fp16 = __fp16(f); | 55 | - __fp16 fp16 = __fp16(f); |
54 | - U16 u16; | 56 | - U16 u16; |
55 | - memcpy(&u16, &fp16, sizeof(U16)); | 57 | - memcpy(&u16, &fp16, sizeof(U16)); |