File mozilla-bmo1005535.patch of Package MozillaFirefox.11385

Overview Repositories Revisions Requests Users Attributes Meta

File mozilla-bmo1005535.patch of Package MozillaFirefox.11385

# HG changeset patch
# User Steve Singer <steve@ssinger.info>
# Date 1558421131 -7200
#      Tue May 21 08:45:31 2019 +0200
# Node ID 10d881820dca5899ed4c046ee6306197becb3da3
# Parent  6eb163c079083ded783ed827583ac130cf37de24
Bug 1005535 - Get skia GPU building on big endian.

diff -r 6eb163c07908 gfx/skia/skia/include/core/SkColorPriv.h
--- a/gfx/skia/skia/include/core/SkColorPriv.h	Tue May 21 08:45:28 2019 +0200
+++ b/gfx/skia/skia/include/core/SkColorPriv.h	Tue May 21 17:38:09 2019 +0200
@@ -55,6 +55,7 @@
  *  Here we enforce this constraint.
  */
 
+/*
 #ifdef SK_CPU_BENDIAN
     #define SK_RGBA_R32_SHIFT   24
     #define SK_RGBA_G32_SHIFT   16
@@ -66,6 +67,16 @@
     #define SK_RGBA_B32_SHIFT   16
     #define SK_RGBA_A32_SHIFT   24
 #endif
+*/
+    #define SK_RGBA_R32_SHIFT   0
+    #define SK_RGBA_G32_SHIFT   8
+    #define SK_RGBA_B32_SHIFT   16
+    #define SK_RGBA_A32_SHIFT   24
+ 
+    #define SK_BGRA_B32_SHIFT   0
+    #define SK_BGRA_G32_SHIFT   8
+    #define SK_BGRA_R32_SHIFT   16
+    #define SK_BGRA_A32_SHIFT   24
 
 #define SkGetPackedA32(packed)      ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
 #define SkGetPackedR32(packed)      ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
diff -r 6eb163c07908 gfx/skia/skia/include/core/SkImageInfo.h
--- a/gfx/skia/skia/include/core/SkImageInfo.h	Tue May 21 08:45:28 2019 +0200
+++ b/gfx/skia/skia/include/core/SkImageInfo.h	Tue May 21 17:38:09 2019 +0200
@@ -84,7 +84,7 @@
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
     kN32_SkColorType = kRGBA_8888_SkColorType,
 #else
-    #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
+    kN32_SkColorType = kBGRA_8888_SkColorType
 #endif
 };
 
diff -r 6eb163c07908 gfx/skia/skia/include/gpu/GrTypes.h
--- a/gfx/skia/skia/include/gpu/GrTypes.h	Tue May 21 08:45:28 2019 +0200
+++ b/gfx/skia/skia/include/gpu/GrTypes.h	Tue May 21 17:38:09 2019 +0200
@@ -344,15 +344,13 @@
 static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
 
 // Aliases for pixel configs that match skia's byte order.
-#ifndef SK_CPU_LENDIAN
-    #error "Skia gpu currently assumes little endian"
-#endif
+
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
     static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
     static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
 #else
-    #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
+    static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
 #endif
 
 /**
diff -r 6eb163c07908 gfx/skia/skia/include/private/GrColor.h
--- a/gfx/skia/skia/include/private/GrColor.h	Tue May 21 08:45:28 2019 +0200
+++ b/gfx/skia/skia/include/private/GrColor.h	Tue May 21 17:38:09 2019 +0200
@@ -74,7 +74,7 @@
  *  Since premultiplied means that alpha >= color, we construct a color with
  *  each component==255 and alpha == 0 to be "illegal"
  */
-#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A))
+#define GrColor_ILLEGAL     ((uint32_t)(~(0xFF << GrColor_SHIFT_A)))
 
 #define GrColor_WHITE 0xFFFFFFFF
 #define GrColor_TRANSPARENT_BLACK 0x0
diff -r 6eb163c07908 gfx/skia/skia/src/core/SkColorData.h
--- a/gfx/skia/skia/src/core/SkColorData.h	Tue May 21 08:45:28 2019 +0200
+++ b/gfx/skia/skia/src/core/SkColorData.h	Tue May 21 17:38:09 2019 +0200
@@ -82,7 +82,7 @@
     #elif LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_BGRA
         #define SK_PMCOLOR_IS_BGRA
     #else
-        #error "need 32bit packing to be either RGBA or BGRA"
+        #define SK_PMCOLOR_IS_BGRA
     #endif
 #endif

Places

File mozilla-bmo1005535.patch of Package MozillaFirefox.11385

Places