Bug 1373381 - Update RGBA8 to BGRA8 since it was renamed in WR cset 264d53d. r=jrmuizel,kvark
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 20 Jun 2017 09:38:14 -0400
changeset 365085 fcfdb4036a06eb644d4441547b8d474b1bd62973
parent 365084 71560f69abe2c11df90e59056cdc165c08a159b3
child 365086 9d65d68d9e5c7d83ec9116384635ed6c3f87e49a
push id91680
push userkwierso@gmail.com
push dateWed, 21 Jun 2017 01:32:01 +0000
treeherdermozilla-inbound@f7b9dc31956c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, kvark
bugs1373381
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1373381 - Update RGBA8 to BGRA8 since it was renamed in WR cset 264d53d. r=jrmuizel,kvark MozReview-Commit-ID: 9iGffjS0sKs
gfx/webrender_bindings/WebRenderTypes.h
--- a/gfx/webrender_bindings/WebRenderTypes.h
+++ b/gfx/webrender_bindings/WebRenderTypes.h
@@ -46,39 +46,39 @@ inline Epoch NewEpoch(uint32_t aEpoch) {
   return e;
 }
 
 inline Maybe<WrImageFormat>
 SurfaceFormatToWrImageFormat(gfx::SurfaceFormat aFormat) {
   switch (aFormat) {
     case gfx::SurfaceFormat::R8G8B8X8:
       // TODO: use RGBA + opaque flag
-      return Some(WrImageFormat::RGBA8);
+      return Some(WrImageFormat::BGRA8);
     case gfx::SurfaceFormat::B8G8R8X8:
       // TODO: WebRender will have a BGRA + opaque flag for this but does not
       // have it yet (cf. issue #732).
     case gfx::SurfaceFormat::B8G8R8A8:
-      return Some(WrImageFormat::RGBA8);
+      return Some(WrImageFormat::BGRA8);
     case gfx::SurfaceFormat::B8G8R8:
       return Some(WrImageFormat::RGB8);
     case gfx::SurfaceFormat::A8:
       return Some(WrImageFormat::A8);
     case gfx::SurfaceFormat::R8G8:
       return Some(WrImageFormat::RG8);
     case gfx::SurfaceFormat::UNKNOWN:
       return Some(WrImageFormat::Invalid);
     default:
       return Nothing();
   }
 }
 
 inline gfx::SurfaceFormat
 WrImageFormatToSurfaceFormat(ImageFormat aFormat) {
   switch (aFormat) {
-    case ImageFormat::RGBA8:
+    case ImageFormat::BGRA8:
       return gfx::SurfaceFormat::B8G8R8A8;
     case ImageFormat::A8:
       return gfx::SurfaceFormat::A8;
     case ImageFormat::RGB8:
       return gfx::SurfaceFormat::B8G8R8;
     default:
       return gfx::SurfaceFormat::UNKNOWN;
   }