thunderbird/SOURCES/mozilla-bmo1504834-part1.patch

90 lines
2.8 KiB
Diff
Raw Normal View History

2022-09-26 15:31:20 +00:00
# HG changeset patch
2023-10-05 15:21:15 +00:00
# Parent 9fcbd287056a40084b1e679f787bf683b291f323
2022-09-26 15:31:20 +00:00
Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
2023-10-05 15:21:15 +00:00
@@ -156,7 +156,8 @@ static IntRect CalculateSurfaceBounds(co
2022-05-17 08:38:49 +00:00
}
2023-10-05 15:21:15 +00:00
static const int kARGBAlphaOffset =
2022-05-17 08:38:49 +00:00
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
2023-10-05 15:21:15 +00:00
+ 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==
+ // SurfaceFormat::B8G8R8A8 ? 3 : 0;
2022-05-17 08:38:49 +00:00
static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
const int32_t aStride, SurfaceFormat aFormat) {
2022-09-26 15:31:20 +00:00
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
2023-10-05 15:21:15 +00:00
@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t {
2022-09-26 15:31:20 +00:00
// This represents the unknown format.
2023-10-05 15:21:15 +00:00
UNKNOWN, // TODO: Replace uses with Maybe<SurfaceFormat>.
2022-09-26 15:31:20 +00:00
2023-10-05 15:21:15 +00:00
-// The following values are endian-independent synonyms. The _UINT32 suffix
-// indicates that the name reflects the layout when viewed as a uint32_t
-// value.
2022-05-17 08:38:49 +00:00
-#if MOZ_LITTLE_ENDIAN()
2023-10-05 15:21:15 +00:00
+ // The following values are endian-independent synonyms. The _UINT32 suffix
+ // indicates that the name reflects the layout when viewed as a uint32_t
+ // value.
2022-05-17 08:38:49 +00:00
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
-#elif MOZ_BIG_ENDIAN()
- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
-#else
-# error "bad endianness"
-#endif
// The following values are OS and endian-independent synonyms.
//
2023-10-05 15:21:15 +00:00
diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
--- a/gfx/skia/skia/modules/skcms/skcms.cc
+++ b/gfx/skia/skia/modules/skcms/skcms.cc
@@ -30,6 +30,8 @@
2022-05-17 08:38:49 +00:00
#include <avx512fintrin.h>
#include <avx512dqintrin.h>
#endif
+#else
+ #define SKCMS_PORTABLE
#endif
2023-10-05 15:21:15 +00:00
static bool runtime_cpu_detection = true;
@@ -324,20 +326,28 @@ enum {
2022-05-17 08:38:49 +00:00
static uint16_t read_big_u16(const uint8_t* ptr) {
uint16_t be;
memcpy(&be, ptr, sizeof(be));
-#if defined(_MSC_VER)
2023-10-05 15:21:15 +00:00
- return _byteswap_ushort(be);
2022-05-17 08:38:49 +00:00
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+ return be;
2023-10-05 15:21:15 +00:00
#else
- return __builtin_bswap16(be);
2022-05-17 08:38:49 +00:00
+ #if defined(_MSC_VER)
2023-10-05 15:21:15 +00:00
+ return _byteswap_ushort(be);
2022-05-17 08:38:49 +00:00
+ #else
2023-10-05 15:21:15 +00:00
+ return __builtin_bswap16(be);
2022-05-17 08:38:49 +00:00
+ #endif
#endif
}
static uint32_t read_big_u32(const uint8_t* ptr) {
uint32_t be;
memcpy(&be, ptr, sizeof(be));
-#if defined(_MSC_VER)
2023-10-05 15:21:15 +00:00
- return _byteswap_ulong(be);
2022-05-17 08:38:49 +00:00
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
+ return be;
2023-10-05 15:21:15 +00:00
#else
- return __builtin_bswap32(be);
2022-05-17 08:38:49 +00:00
+ #if defined(_MSC_VER)
2023-10-05 15:21:15 +00:00
+ return _byteswap_ulong(be);
2022-05-17 08:38:49 +00:00
+ #else
2023-10-05 15:21:15 +00:00
+ return __builtin_bswap32(be);
2022-05-17 08:38:49 +00:00
+ #endif
#endif
}