Bug 1426116 - Regenerate FFI header and remove RGB8 references to go with changes in WR PR 2260. r?jrmuizel draft
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 08 Jan 2018 09:19:27 -0500
changeset 717229 5a4ac850bd3873bd137cdade7b533831bc4ba91f
parent 717228 46916b8aa1b4d565df921d66eba5aeb4a73cfe75
child 717230 a8d02c0e752133038e95bc908ba84fe50c31bf18
push id94606
push userkgupta@mozilla.com
push dateMon, 08 Jan 2018 14:20:02 +0000
reviewersjrmuizel
bugs1426116
milestone59.0a1
Bug 1426116 - Regenerate FFI header and remove RGB8 references to go with changes in WR PR 2260. r?jrmuizel MozReview-Commit-ID: 41bny8b6KSi
gfx/webrender_bindings/WebRenderTypes.h
gfx/webrender_bindings/webrender_ffi_generated.h
--- a/gfx/webrender_bindings/WebRenderTypes.h
+++ b/gfx/webrender_bindings/WebRenderTypes.h
@@ -69,18 +69,16 @@ SurfaceFormatToImageFormat(gfx::SurfaceF
       // TODO: use RGBA + opaque flag
     case gfx::SurfaceFormat::R8G8B8A8:
       return Some(wr::ImageFormat::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(wr::ImageFormat::BGRA8);
-    case gfx::SurfaceFormat::B8G8R8:
-      return Some(wr::ImageFormat::RGB8);
     case gfx::SurfaceFormat::A8:
       return Some(wr::ImageFormat::A8);
     case gfx::SurfaceFormat::R8G8:
       return Some(wr::ImageFormat::RG8);
     case gfx::SurfaceFormat::UNKNOWN:
       return Some(wr::ImageFormat::Invalid);
     default:
       return Nothing();
@@ -89,18 +87,16 @@ SurfaceFormatToImageFormat(gfx::SurfaceF
 
 inline gfx::SurfaceFormat
 ImageFormatToSurfaceFormat(ImageFormat aFormat) {
   switch (aFormat) {
     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;
   }
 }
 
 struct ImageDescriptor: public wr::WrImageDescriptor {
   // We need a default constructor for ipdl serialization.
   ImageDescriptor()
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -92,17 +92,16 @@ enum class FontRenderMode : uint32_t {
   Subpixel = 2,
 
   Sentinel /* this must be last for serialization purposes. */
 };
 
 enum class ImageFormat : uint32_t {
   Invalid = 0,
   A8 = 1,
-  RGB8 = 2,
   BGRA8 = 3,
   RGBAF32 = 4,
   RG8 = 5,
 
   Sentinel /* this must be last for serialization purposes. */
 };
 
 enum class ImageRendering : uint32_t {