| Index: ui/gl/gl_image_linux_dma_buffer.cc
|
| diff --git a/ui/gl/gl_image_linux_dma_buffer.cc b/ui/gl/gl_image_linux_dma_buffer.cc
|
| index 080c9b5a2da306913b2fa734beef317b9061fb1f..ff18f8f0c2b9e9df4d468338ffb1ab955c309a06 100644
|
| --- a/ui/gl/gl_image_linux_dma_buffer.cc
|
| +++ b/ui/gl/gl_image_linux_dma_buffer.cc
|
| @@ -37,6 +37,7 @@ bool ValidFormat(unsigned internalformat, gfx::GpuMemoryBuffer::Format format) {
|
| case gfx::GpuMemoryBuffer::DXT1:
|
| case gfx::GpuMemoryBuffer::DXT5:
|
| case gfx::GpuMemoryBuffer::ETC1:
|
| + case gfx::GpuMemoryBuffer::R_8:
|
| case gfx::GpuMemoryBuffer::RGBA_8888:
|
| case gfx::GpuMemoryBuffer::BGRA_8888:
|
| case gfx::GpuMemoryBuffer::YUV_420:
|
| @@ -53,6 +54,7 @@ bool ValidFormat(unsigned internalformat, gfx::GpuMemoryBuffer::Format format) {
|
| case gfx::GpuMemoryBuffer::DXT1:
|
| case gfx::GpuMemoryBuffer::DXT5:
|
| case gfx::GpuMemoryBuffer::ETC1:
|
| + case gfx::GpuMemoryBuffer::R_8:
|
| case gfx::GpuMemoryBuffer::RGBX_8888:
|
| case gfx::GpuMemoryBuffer::RGBA_8888:
|
| case gfx::GpuMemoryBuffer::YUV_420:
|
| @@ -60,6 +62,8 @@ bool ValidFormat(unsigned internalformat, gfx::GpuMemoryBuffer::Format format) {
|
| }
|
| NOTREACHED();
|
| return false;
|
| + case GL_R8:
|
| + return false;
|
| default:
|
| return false;
|
| }
|
| @@ -76,6 +80,7 @@ EGLint FourCC(gfx::GpuMemoryBuffer::Format format) {
|
| case gfx::GpuMemoryBuffer::DXT1:
|
| case gfx::GpuMemoryBuffer::DXT5:
|
| case gfx::GpuMemoryBuffer::ETC1:
|
| + case gfx::GpuMemoryBuffer::R_8:
|
| case gfx::GpuMemoryBuffer::RGBA_8888:
|
| case gfx::GpuMemoryBuffer::YUV_420:
|
| NOTREACHED();
|
|
|