|
 |
71c2a1 |
diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
|
|
|
71c2a1 |
--- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2018-04-09 22:50:48.000000000 +0200
|
|
|
71c2a1 |
+++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h 2018-04-18 11:51:38.748680174 +0200
|
|
|
71c2a1 |
@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB
|
|
|
71c2a1 |
*
|
|
|
71c2a1 |
* Here we enforce this constraint.
|
|
|
71c2a1 |
*/
|
|
|
71c2a1 |
-
|
|
|
71c2a1 |
+/*
|
|
|
71c2a1 |
#ifdef SK_CPU_BENDIAN
|
|
|
71c2a1 |
#define SK_RGBA_R32_SHIFT 24
|
|
|
71c2a1 |
#define SK_RGBA_G32_SHIFT 16
|
|
|
71c2a1 |
#define SK_RGBA_B32_SHIFT 8
|
|
|
71c2a1 |
#define SK_RGBA_A32_SHIFT 0
|
|
|
71c2a1 |
#else
|
|
|
71c2a1 |
+*/
|
|
|
71c2a1 |
#define SK_RGBA_R32_SHIFT 0
|
|
|
71c2a1 |
#define SK_RGBA_G32_SHIFT 8
|
|
|
71c2a1 |
#define SK_RGBA_B32_SHIFT 16
|
|
|
71c2a1 |
#define SK_RGBA_A32_SHIFT 24
|
|
|
71c2a1 |
-#endif
|
|
|
71c2a1 |
+/*#endif*/
|
|
|
71c2a1 |
|
|
|
71c2a1 |
#define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
|
|
|
71c2a1 |
#define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
|
|
|
71c2a1 |
diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
|
|
|
71c2a1 |
--- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2018-04-09 22:50:48.000000000 +0200
|
|
|
71c2a1 |
+++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h 2018-04-18 11:51:38.748680174 +0200
|
|
|
71c2a1 |
@@ -84,7 +84,8 @@ enum SkColorType {
|
|
|
71c2a1 |
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
|
|
71c2a1 |
kN32_SkColorType = kRGBA_8888_SkColorType,
|
|
|
71c2a1 |
#else
|
|
|
71c2a1 |
- #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
|
|
|
71c2a1 |
+ //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
|
|
|
71c2a1 |
+ kN32_SkColorType = kBGRA_8888_SkColorType
|
|
|
71c2a1 |
#endif
|
|
|
71c2a1 |
};
|
|
|
71c2a1 |
|
|
|
71c2a1 |
diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
|
|
|
71c2a1 |
--- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2018-04-09 22:50:48.000000000 +0200
|
|
|
71c2a1 |
+++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h 2018-04-18 11:51:38.748680174 +0200
|
|
|
71c2a1 |
@@ -344,15 +344,13 @@ enum GrPixelConfig {
|
|
|
71c2a1 |
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
|
|
|
71c2a1 |
|
|
|
71c2a1 |
// Aliases for pixel configs that match skia's byte order.
|
|
|
71c2a1 |
-#ifndef SK_CPU_LENDIAN
|
|
|
71c2a1 |
- #error "Skia gpu currently assumes little endian"
|
|
|
71c2a1 |
-#endif
|
|
|
71c2a1 |
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
|
|
|
71c2a1 |
static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
|
|
|
71c2a1 |
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
|
|
71c2a1 |
static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
|
|
|
71c2a1 |
#else
|
|
|
71c2a1 |
- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
|
|
|
71c2a1 |
+ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
|
|
|
71c2a1 |
+ static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
|
|
|
71c2a1 |
#endif
|
|
|
71c2a1 |
|
|
|
71c2a1 |
/**
|
|
|
71c2a1 |
diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h
|
|
|
71c2a1 |
--- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian 2018-04-18 13:42:06.980476156 +0200
|
|
|
71c2a1 |
+++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h 2018-04-18 13:42:50.493520552 +0200
|
|
|
71c2a1 |
@@ -31,18 +31,19 @@
|
|
|
71c2a1 |
*
|
|
|
71c2a1 |
* Here we enforce this constraint.
|
|
|
71c2a1 |
*/
|
|
|
71c2a1 |
-
|
|
|
71c2a1 |
+/*
|
|
|
71c2a1 |
#ifdef SK_CPU_BENDIAN
|
|
|
71c2a1 |
#define SK_BGRA_B32_SHIFT 24
|
|
|
71c2a1 |
#define SK_BGRA_G32_SHIFT 16
|
|
|
71c2a1 |
#define SK_BGRA_R32_SHIFT 8
|
|
|
71c2a1 |
#define SK_BGRA_A32_SHIFT 0
|
|
|
71c2a1 |
#else
|
|
|
71c2a1 |
+*/
|
|
|
71c2a1 |
#define SK_BGRA_B32_SHIFT 0
|
|
|
71c2a1 |
#define SK_BGRA_G32_SHIFT 8
|
|
|
71c2a1 |
#define SK_BGRA_R32_SHIFT 16
|
|
|
71c2a1 |
#define SK_BGRA_A32_SHIFT 24
|
|
|
71c2a1 |
-#endif
|
|
|
71c2a1 |
+//#endif
|
|
|
71c2a1 |
|
|
|
71c2a1 |
#if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
|
|
|
71c2a1 |
#error "can't define PMCOLOR to be RGBA and BGRA"
|