Mercurial Mercurial > hg > mozilla / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-fix-skia-aarch64.patch
author <bjorn.lie@gmail.com>
Fri, 08 Jun 2018 22:31:03 +0200
changeset 1054 fbfe323c62cd
parent 1049 08307c08d990
permissions -rw-r--r--
Add conditional for pkgconfig(gconf-2.0) BuildRequires, and pass conditional --disable-gconf to configure: no longer pull in obsolete gconf2 for Tumbleweed.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1049
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     1
 
--- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.orig	2018-05-14 13:23:26.001095058 +0200
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     2
 
+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp	2018-05-14 13:24:46.851416500 +0200
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     3
 
@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     4
 
 }
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     5
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     6
 
 SI F from_half(U16 h) {
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     7
 
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     8
 
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     9
 
     return vcvt_f32_f16(h);
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    10
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    11
 
 #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    12
 
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    13
 
 }
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    14
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    15
 
 SI U16 to_half(F f) {
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    16
 
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    17
 
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    18
 
     return vcvt_f16_f32(f);
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    19
08307c08d990 architecture fixes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    20
 
 #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
mozilla