diff options
author | reveman <reveman@chromium.org> | 2015-10-12 21:48:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-13 04:49:54 +0000 |
commit | 95b84db43caa5fa4a5e97fbc6793b0af7be8e40b (patch) | |
tree | 54093baadeeeb8e1505938c736a4cda2ee5d9796 /ui/gl | |
parent | cca90519e661d964887c42a8141b62f9045509db (diff) | |
download | chromium_src-95b84db43caa5fa4a5e97fbc6793b0af7be8e40b.zip chromium_src-95b84db43caa5fa4a5e97fbc6793b0af7be8e40b.tar.gz chromium_src-95b84db43caa5fa4a5e97fbc6793b0af7be8e40b.tar.bz2 |
ui: Add gfx::BufferFormat::RGBA_8888 as a supported ozone native pixmap format.
BUG=538325
Review URL: https://codereview.chromium.org/1401063002
Cr-Commit-Position: refs/heads/master@{#353679}
Diffstat (limited to 'ui/gl')
-rw-r--r-- | ui/gl/gl_image_ozone_native_pixmap.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc index 413c0ab..3e0cfb5 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: |