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

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.cc

Issue 1483633002: ozone: support gfx::BufferFormat::RGBX_8888 as a native pixmap format. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gl_image_ozone_native_pixmap also, which gl_unittests check Created 5 years 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 818426178aea6fa8af3f49e92d0251fed0f445fc..2c88d753fda046011f5db366941ff285c65d5cda 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -11,6 +11,7 @@
#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')
+#define DRM_FORMAT_XBGR8888 FOURCC('X', 'B', '2', '4')
namespace gfx {
namespace {
@@ -29,6 +30,7 @@ bool ValidInternalFormat(unsigned internalformat) {
bool ValidFormat(BufferFormat format) {
switch (format) {
case BufferFormat::RGBA_8888:
+ case BufferFormat::RGBX_8888:
case BufferFormat::BGRA_8888:
case BufferFormat::BGRX_8888:
return true;
@@ -39,7 +41,6 @@ bool ValidFormat(BufferFormat format) {
case BufferFormat::ETC1:
case BufferFormat::R_8:
case BufferFormat::RGBA_4444:
- case BufferFormat::RGBX_8888:
case BufferFormat::YUV_420:
case BufferFormat::YUV_420_BIPLANAR:
case BufferFormat::UYVY_422:
@@ -54,6 +55,8 @@ EGLint FourCC(BufferFormat format) {
switch (format) {
case BufferFormat::RGBA_8888:
return DRM_FORMAT_ABGR8888;
+ case BufferFormat::RGBX_8888:
+ return DRM_FORMAT_XBGR8888;
case BufferFormat::BGRA_8888:
return DRM_FORMAT_ARGB8888;
case BufferFormat::BGRX_8888:
@@ -65,7 +68,6 @@ EGLint FourCC(BufferFormat format) {
case BufferFormat::ETC1:
case BufferFormat::R_8:
case BufferFormat::RGBA_4444:
- case BufferFormat::RGBX_8888:
case BufferFormat::YUV_420:
case BufferFormat::YUV_420_BIPLANAR:
case BufferFormat::UYVY_422:

Powered by Google App Engine
This is Rietveld 408576698