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

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.cc

Issue 1401063002: ui: Add gfx::BufferFormat::RGBA_8888 as a supported ozone native pixmap format. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ui/gl/gl_image_ozone_native_pixmap.cc
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index 413c0abe460a3fc4f418c674907f0bda6aa958e8..3e0cfb513fcf485f428c627562a8b2b78a25c659 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -9,6 +9,7 @@
(static_cast<uint32>(c) << 16) | (static_cast<uint32>(d) << 24))
#define DRM_FORMAT_ARGB8888 FOURCC('A', 'R', '2', '4')
+#define DRM_FORMAT_ABGR8888 FOURCC('A', 'B', '2', '4')
#define DRM_FORMAT_XRGB8888 FOURCC('X', 'R', '2', '4')
namespace gfx {
@@ -17,6 +18,7 @@ namespace {
bool ValidInternalFormat(unsigned internalformat) {
switch (internalformat) {
case GL_RGB:
+ case GL_RGBA:
case GL_BGRA_EXT:
return true;
default:
@@ -26,6 +28,7 @@ bool ValidInternalFormat(unsigned internalformat) {
bool ValidFormat(gfx::BufferFormat format) {
switch (format) {
+ case BufferFormat::RGBA_8888:
case BufferFormat::BGRA_8888:
case BufferFormat::BGRX_8888:
return true;
@@ -36,7 +39,6 @@ bool ValidFormat(gfx::BufferFormat format) {
case BufferFormat::ETC1:
case BufferFormat::R_8:
case BufferFormat::RGBA_4444:
- case BufferFormat::RGBA_8888:
case BufferFormat::YUV_420:
case BufferFormat::YUV_420_BIPLANAR:
case BufferFormat::UYVY_422:
@@ -49,6 +51,8 @@ bool ValidFormat(gfx::BufferFormat format) {
EGLint FourCC(gfx::BufferFormat format) {
switch (format) {
+ case BufferFormat::RGBA_8888:
+ return DRM_FORMAT_ABGR8888;
case BufferFormat::BGRA_8888:
return DRM_FORMAT_ARGB8888;
case BufferFormat::BGRX_8888:
@@ -60,7 +64,6 @@ EGLint FourCC(gfx::BufferFormat format) {
case BufferFormat::ETC1:
case BufferFormat::R_8:
case BufferFormat::RGBA_4444:
- case BufferFormat::RGBA_8888:
case BufferFormat::YUV_420:
case BufferFormat::YUV_420_BIPLANAR:
case BufferFormat::UYVY_422:

Powered by Google App Engine
This is Rietveld 408576698