|
 |
9c0984 |
diff -up firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/DrawTargetSkia.cpp
|
|
|
9c0984 |
--- firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 2020-06-17 04:18:58.000000000 +0200
|
|
|
9c0984 |
+++ firefox-78.0/gfx/2d/DrawTargetSkia.cpp 2020-06-25 16:52:29.824532769 +0200
|
|
|
9c0984 |
@@ -135,8 +135,7 @@ static IntRect CalculateSurfaceBounds(co
|
|
|
d445b2 |
return surfaceBounds.Intersect(bounds);
|
|
|
d445b2 |
}
|
|
|
d445b2 |
|
|
|
d445b2 |
-static const int kARGBAlphaOffset =
|
|
|
d445b2 |
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
|
|
d445b2 |
+static const int kARGBAlphaOffset = 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
|
|
d445b2 |
|
|
|
d445b2 |
static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
|
|
|
d445b2 |
const int32_t aStride, SurfaceFormat aFormat) {
|
|
|
9c0984 |
diff -up firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/Types.h
|
|
|
9c0984 |
--- firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 2020-06-25 16:52:29.826532776 +0200
|
|
|
9c0984 |
+++ firefox-78.0/gfx/2d/Types.h 2020-06-25 16:55:02.942063616 +0200
|
|
|
9c0984 |
@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t {
|
|
|
d445b2 |
// The following values are endian-independent synonyms. The _UINT32 suffix
|
|
|
d445b2 |
// indicates that the name reflects the layout when viewed as a uint32_t
|
|
|
d445b2 |
// value.
|
|
|
9c0984 |
-#if MOZ_LITTLE_ENDIAN()
|
|
|
d445b2 |
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
|
|
|
9c0984 |
X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
|
|
|
9c0984 |
-#elif MOZ_BIG_ENDIAN()
|
|
|
d445b2 |
- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
|
|
|
9c0984 |
- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
|
|
|
d445b2 |
-#else
|
|
|
d445b2 |
-# error "bad endianness"
|
|
|
d445b2 |
-#endif
|
|
|
d445b2 |
|
|
|
9c0984 |
// The following values are OS and endian-independent synonyms.
|
|
|
9c0984 |
//
|
|
|
9c0984 |
diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc
|
|
|
9c0984 |
--- firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1 2020-06-17 04:18:58.000000000 +0200
|
|
|
9c0984 |
+++ firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc 2020-06-25 16:54:02.993855444 +0200
|
|
|
9c0984 |
@@ -30,6 +30,8 @@
|
|
|
9c0984 |
#include <avx512fintrin.h>
|
|
|
9c0984 |
#include <avx512dqintrin.h>
|
|
|
9c0984 |
#endif
|
|
|
d445b2 |
+#else
|
|
|
d445b2 |
+ #define SKCMS_PORTABLE
|
|
|
d445b2 |
#endif
|
|
|
d445b2 |
|
|
|
d445b2 |
// sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
|
|
|
9c0984 |
@@ -280,20 +282,28 @@ enum {
|
|
|
d445b2 |
static uint16_t read_big_u16(const uint8_t* ptr) {
|
|
|
d445b2 |
uint16_t be;
|
|
|
d445b2 |
memcpy(&be, ptr, sizeof(be));
|
|
|
d445b2 |
-#if defined(_MSC_VER)
|
|
|
9c0984 |
- return _byteswap_ushort(be);
|
|
|
d445b2 |
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
|
|
d445b2 |
+ return be;
|
|
|
9c0984 |
#else
|
|
|
d445b2 |
+ #if defined(_MSC_VER)
|
|
|
9c0984 |
+ return _byteswap_ushort(be);
|
|
|
d445b2 |
+ #else
|
|
|
d445b2 |
return __builtin_bswap16(be);
|
|
|
d445b2 |
+ #endif
|
|
|
d445b2 |
#endif
|
|
|
d445b2 |
}
|
|
|
d445b2 |
|
|
|
d445b2 |
static uint32_t read_big_u32(const uint8_t* ptr) {
|
|
|
d445b2 |
uint32_t be;
|
|
|
d445b2 |
memcpy(&be, ptr, sizeof(be));
|
|
|
d445b2 |
-#if defined(_MSC_VER)
|
|
|
9c0984 |
- return _byteswap_ulong(be);
|
|
|
d445b2 |
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
|
|
|
d445b2 |
+ return be;
|
|
|
9c0984 |
#else
|
|
|
d445b2 |
+ #if defined(_MSC_VER)
|
|
|
9c0984 |
+ return _byteswap_ulong(be);
|
|
|
d445b2 |
+ #else
|
|
|
d445b2 |
return __builtin_bswap32(be);
|
|
|
d445b2 |
+ #endif
|
|
|
d445b2 |
#endif
|
|
|
d445b2 |
}
|
|
|
d445b2 |
|