Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1540)

Unified Diff: gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc

Issue 1415723006: ui: Add RGBX_8888 buffer format. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gles but no conversion needed case Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/image_factory.cc ('k') | ui/gfx/buffer_format_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
index 280de5f3734df60ffc3508bfa8462622b0349d29..f69a42902cb90024c8cb1862c9776df75f1055e3 100644
--- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
+++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
@@ -109,13 +109,14 @@ void SetRow(gfx::BufferFormat format,
return;
case gfx::BufferFormat::ATC:
case gfx::BufferFormat::ATCIA:
+ case gfx::BufferFormat::BGRX_8888:
case gfx::BufferFormat::DXT1:
case gfx::BufferFormat::DXT5:
case gfx::BufferFormat::ETC1:
- case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::RGBX_8888:
+ case gfx::BufferFormat::UYVY_422:
case gfx::BufferFormat::YUV_420:
case gfx::BufferFormat::YUV_420_BIPLANAR:
- case gfx::BufferFormat::UYVY_422:
NOTREACHED();
return;
}
@@ -134,13 +135,14 @@ GLenum InternalFormat(gfx::BufferFormat format) {
return GL_BGRA_EXT;
case gfx::BufferFormat::ATC:
case gfx::BufferFormat::ATCIA:
+ case gfx::BufferFormat::BGRX_8888:
case gfx::BufferFormat::DXT1:
case gfx::BufferFormat::DXT5:
case gfx::BufferFormat::ETC1:
- case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::RGBX_8888:
+ case gfx::BufferFormat::UYVY_422:
case gfx::BufferFormat::YUV_420:
case gfx::BufferFormat::YUV_420_BIPLANAR:
- case gfx::BufferFormat::UYVY_422:
NOTREACHED();
return 0;
}
« no previous file with comments | « gpu/command_buffer/service/image_factory.cc ('k') | ui/gfx/buffer_format_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698