| 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 04ad06bd438433b270c60b804509a088d08e0a44..e59758251584840543511ae3e55b4064c92b9084 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:
|
| return false;
|
| @@ -52,12 +53,16 @@ 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:
|
| return false;
|
| }
|
| NOTREACHED();
|
| return false;
|
| + case GL_LUMINANCE:
|
| + case GL_R8:
|
| + return false;
|
| default:
|
| return false;
|
| }
|
| @@ -74,6 +79,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:
|
| NOTREACHED();
|
| return 0;
|
|
|