1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent d1d66f7e4d0e7fd45e91e4fcee07555e72046d48 |
2 # Parent 09cd4ac2cc607e85aa572425b824fbab386af607 |
3 For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the |
3 For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the |
4 right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). |
4 right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). |
5 |
5 |
6 diff --git a/gfx/skia/skia/include/private/SkNx.h b/gfx/skia/skia/include/private/SkNx.h |
|
7 --- a/gfx/skia/skia/include/private/SkNx.h |
|
8 +++ b/gfx/skia/skia/include/private/SkNx.h |
|
9 @@ -233,17 +233,28 @@ struct SkNx<1,T> { |
|
10 AI SkNx operator<<(int bits) const { return fVal << bits; } |
|
11 AI SkNx operator>>(int bits) const { return fVal >> bits; } |
|
12 |
|
13 AI SkNx operator+(const SkNx& y) const { return fVal + y.fVal; } |
|
14 AI SkNx operator-(const SkNx& y) const { return fVal - y.fVal; } |
|
15 AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } |
|
16 AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } |
|
17 |
|
18 + // On Big endian the commented out variant doesn't work, |
|
19 + // and honestly, I have no idea why it exists in the first place. |
|
20 + // The reason its broken is, I think, that it defaults to the double-variant of ToBits() |
|
21 + // which gets a 64-bit integer, and FromBits returns 32-bit, |
|
22 + // cutting off the wrong half again. |
|
23 + // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). |
|
24 + // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) |
|
25 +#ifdef SK_CPU_BENDIAN |
|
26 + AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } |
|
27 +#else |
|
28 AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } |
|
29 +#endif |
|
30 AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } |
|
31 AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } |
|
32 |
|
33 AI SkNx operator==(const SkNx& y) const { return FromBits(fVal == y.fVal ? ~0 : 0); } |
|
34 AI SkNx operator!=(const SkNx& y) const { return FromBits(fVal != y.fVal ? ~0 : 0); } |
|
35 AI SkNx operator<=(const SkNx& y) const { return FromBits(fVal <= y.fVal ? ~0 : 0); } |
|
36 AI SkNx operator>=(const SkNx& y) const { return FromBits(fVal >= y.fVal ? ~0 : 0); } |
|
37 AI SkNx operator< (const SkNx& y) const { return FromBits(fVal < y.fVal ? ~0 : 0); } |
|
38 diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h |
6 diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h |
39 --- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h |
7 --- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h |
40 +++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h |
8 +++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h |
41 @@ -198,17 +198,23 @@ namespace SK_OPTS_NS { |
9 @@ -210,6 +210,8 @@ namespace SK_OPTS_NS { |
42 const SkAlpha* mask, size_t maskRB, |
|
43 int w, int h) { |
|
44 auto fn = [](const Sk4px& d, const Sk4px& aa) { |
|
45 // = (s + d(1-sa))aa + d(1-aa) |
|
46 // = s*aa + d(1-sa*aa) |
|
47 // ~~~> |
10 // ~~~> |
48 // a = 1*aa + d(1-1*aa) = aa + d(1-aa) |
11 // a = 1*aa + d(1-1*aa) = aa + d(1-aa) |
49 // c = 0*aa + d(1-1*aa) = d(1-aa) |
12 // c = 0*aa + d(1-1*aa) = d(1-aa) |
50 + |
13 + // TODO: Check this for endian-issues! |
51 + // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 |
14 + // Do we need to switch 255 to the front for all of those tuples? |
52 +#ifdef SK_CPU_BENDIAN |
15 return (aa & Sk4px(skvx::byte16{0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255})) |
53 + return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) |
|
54 +#else |
|
55 return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) |
|
56 +#endif |
|
57 + d.approxMulDiv255(aa.inv()); |
16 + d.approxMulDiv255(aa.inv()); |
58 }; |
17 }; |
59 while (h --> 0) { |
|
60 Sk4px::MapDstAlpha(w, dst, mask, fn); |
|
61 dst += dstRB / sizeof(*dst); |
|
62 mask += maskRB / sizeof(*mask); |
|
63 } |
|
64 } |
|