Bug 1426116 - Regenerate FFI header and remove RGB8 references to go with changes in WR PR 2260. r?jrmuizel
MozReview-Commit-ID: 41bny8b6KSi
--- 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 {