| Index: ui/gfx/buffer_format_util.cc
|
| diff --git a/ui/gfx/buffer_format_util.cc b/ui/gfx/buffer_format_util.cc
|
| index 35003e1072d35d61bad2264967eb9cf4f1b17e1f..72667e654aac9643950a50f8baf22a2cfb3b0a9b 100644
|
| --- a/ui/gfx/buffer_format_util.cc
|
| +++ b/ui/gfx/buffer_format_util.cc
|
| @@ -11,16 +11,24 @@
|
| namespace gfx {
|
| namespace {
|
|
|
| -const BufferFormat kBufferFormats[] = {
|
| - BufferFormat::ATC, BufferFormat::ATCIA,
|
| - BufferFormat::DXT1, BufferFormat::DXT5,
|
| - BufferFormat::ETC1, BufferFormat::R_8,
|
| - BufferFormat::RG_88, BufferFormat::BGR_565,
|
| - BufferFormat::RGBA_4444, BufferFormat::RGBX_8888,
|
| - BufferFormat::RGBA_8888, BufferFormat::BGRX_8888,
|
| - BufferFormat::BGRA_8888, BufferFormat::RGBA_F16,
|
| - BufferFormat::UYVY_422, BufferFormat::YUV_420_BIPLANAR,
|
| - BufferFormat::YVU_420};
|
| +const BufferFormat kBufferFormats[] = {BufferFormat::ATC,
|
| + BufferFormat::ATCIA,
|
| + BufferFormat::DXT1,
|
| + BufferFormat::DXT5,
|
| + BufferFormat::ETC1,
|
| + BufferFormat::R_8,
|
| + BufferFormat::R_16,
|
| + BufferFormat::RG_88,
|
| + BufferFormat::BGR_565,
|
| + BufferFormat::RGBA_4444,
|
| + BufferFormat::RGBX_8888,
|
| + BufferFormat::RGBA_8888,
|
| + BufferFormat::BGRX_8888,
|
| + BufferFormat::BGRA_8888,
|
| + BufferFormat::RGBA_F16,
|
| + BufferFormat::UYVY_422,
|
| + BufferFormat::YUV_420_BIPLANAR,
|
| + BufferFormat::YVU_420};
|
|
|
| static_assert(arraysize(kBufferFormats) ==
|
| (static_cast<int>(BufferFormat::LAST) + 1),
|
| @@ -49,6 +57,7 @@ bool RowSizeForBufferFormatChecked(
|
| return false;
|
| *size_in_bytes = (checked_size & ~0x3).ValueOrDie();
|
| return true;
|
| + case BufferFormat::R_16:
|
| case BufferFormat::RG_88:
|
| case BufferFormat::BGR_565:
|
| case BufferFormat::RGBA_4444:
|
| @@ -102,6 +111,7 @@ size_t NumberOfPlanesForBufferFormat(BufferFormat format) {
|
| case BufferFormat::DXT5:
|
| case BufferFormat::ETC1:
|
| case BufferFormat::R_8:
|
| + case BufferFormat::R_16:
|
| case BufferFormat::RG_88:
|
| case BufferFormat::BGR_565:
|
| case BufferFormat::RGBA_4444:
|
| @@ -129,6 +139,7 @@ size_t SubsamplingFactorForBufferFormat(BufferFormat format, size_t plane) {
|
| case BufferFormat::DXT5:
|
| case BufferFormat::ETC1:
|
| case BufferFormat::R_8:
|
| + case BufferFormat::R_16:
|
| case BufferFormat::RG_88:
|
| case BufferFormat::BGR_565:
|
| case BufferFormat::RGBA_4444:
|
| @@ -201,6 +212,7 @@ size_t BufferOffsetForBufferFormat(const Size& size,
|
| case BufferFormat::DXT5:
|
| case BufferFormat::ETC1:
|
| case BufferFormat::R_8:
|
| + case BufferFormat::R_16:
|
| case BufferFormat::RG_88:
|
| case BufferFormat::BGR_565:
|
| case BufferFormat::RGBA_4444:
|
|
|