Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

ui/gl/gl_image_memory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_image_memory.h"
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_binders.h"
@@ skipping 15 matching lines @@
     case GL_ETC1_RGB8_OES:
     case GL_R8:
     case GL_RGBA:
     case GL_BGRA_EXT:
       return true;
     default:
       return false;
   }
 }
 
-bool ValidFormat(GpuMemoryBuffer::Format format) {
+bool ValidFormat(BufferFormat format) {
   switch (format) {
-    case GpuMemoryBuffer::ATC:
-    case GpuMemoryBuffer::ATCIA:
-    case GpuMemoryBuffer::DXT1:
-    case GpuMemoryBuffer::DXT5:
-    case GpuMemoryBuffer::ETC1:
-    case GpuMemoryBuffer::R_8:
-    case GpuMemoryBuffer::RGBA_4444:
-    case GpuMemoryBuffer::RGBA_8888:
-    case GpuMemoryBuffer::BGRA_8888:
+    case BufferFormat::ATC:
+    case BufferFormat::ATCIA:
+    case BufferFormat::DXT1:
+    case BufferFormat::DXT5:
+    case BufferFormat::ETC1:
+    case BufferFormat::R_8:
+    case BufferFormat::RGBA_4444:
+    case BufferFormat::RGBA_8888:
+    case BufferFormat::BGRA_8888:
       return true;
-    case GpuMemoryBuffer::RGBX_8888:
-    case GpuMemoryBuffer::YUV_420:
+    case BufferFormat::RGBX_8888:
+    case BufferFormat::YUV_420:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
-bool IsCompressedFormat(GpuMemoryBuffer::Format format) {
+bool IsCompressedFormat(BufferFormat format) {
   switch (format) {
-    case GpuMemoryBuffer::ATC:
-    case GpuMemoryBuffer::ATCIA:
-    case GpuMemoryBuffer::DXT1:
-    case GpuMemoryBuffer::DXT5:
-    case GpuMemoryBuffer::ETC1:
-    case GpuMemoryBuffer::YUV_420:
+    case BufferFormat::ATC:
+    case BufferFormat::ATCIA:
+    case BufferFormat::DXT1:
+    case BufferFormat::DXT5:
+    case BufferFormat::ETC1:
+    case BufferFormat::YUV_420:
       return true;
-    case GpuMemoryBuffer::R_8:
-    case GpuMemoryBuffer::RGBA_4444:
-    case GpuMemoryBuffer::RGBA_8888:
-    case GpuMemoryBuffer::BGRA_8888:
-    case GpuMemoryBuffer::RGBX_8888:
+    case BufferFormat::R_8:
+    case BufferFormat::RGBA_4444:
+    case BufferFormat::RGBA_8888:
+    case BufferFormat::BGRA_8888:
+    case BufferFormat::RGBX_8888:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
-GLenum TextureFormat(GpuMemoryBuffer::Format format) {
+GLenum TextureFormat(BufferFormat format) {
   switch (format) {
-    case GpuMemoryBuffer::ATC:
+    case BufferFormat::ATC:
       return GL_ATC_RGB_AMD;
-    case GpuMemoryBuffer::ATCIA:
+    case BufferFormat::ATCIA:
       return GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD;
-    case GpuMemoryBuffer::DXT1:
+    case BufferFormat::DXT1:
       return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-    case GpuMemoryBuffer::DXT5:
+    case BufferFormat::DXT5:
       return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-    case GpuMemoryBuffer::ETC1:
+    case BufferFormat::ETC1:
       return GL_ETC1_RGB8_OES;
-    case GpuMemoryBuffer::R_8:
+    case BufferFormat::R_8:
       return GL_RED;
-    case GpuMemoryBuffer::RGBA_4444:
-    case GpuMemoryBuffer::RGBA_8888:
+    case BufferFormat::RGBA_4444:
+    case BufferFormat::RGBA_8888:
       return GL_RGBA;
-    case GpuMemoryBuffer::BGRA_8888:
+    case BufferFormat::BGRA_8888:
       return GL_BGRA_EXT;
-    case GpuMemoryBuffer::RGBX_8888:
-    case GpuMemoryBuffer::YUV_420:
+    case BufferFormat::RGBX_8888:
+    case BufferFormat::YUV_420:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
-GLenum DataFormat(GpuMemoryBuffer::Format format) {
+GLenum DataFormat(BufferFormat format) {
   return TextureFormat(format);
 }
 
-GLenum DataType(GpuMemoryBuffer::Format format) {
+GLenum DataType(BufferFormat format) {
   switch (format) {
-    case GpuMemoryBuffer::RGBA_4444:
+    case BufferFormat::RGBA_4444:
       return GL_UNSIGNED_SHORT_4_4_4_4;
-    case GpuMemoryBuffer::RGBA_8888:
-    case GpuMemoryBuffer::BGRA_8888:
-    case GpuMemoryBuffer::R_8:
+    case BufferFormat::RGBA_8888:
+    case BufferFormat::BGRA_8888:
+    case BufferFormat::R_8:
       return GL_UNSIGNED_BYTE;
-    case GpuMemoryBuffer::ATC:
-    case GpuMemoryBuffer::ATCIA:
-    case GpuMemoryBuffer::DXT1:
-    case GpuMemoryBuffer::DXT5:
-    case GpuMemoryBuffer::ETC1:
-    case GpuMemoryBuffer::RGBX_8888:
-    case GpuMemoryBuffer::YUV_420:
+    case BufferFormat::ATC:
+    case BufferFormat::ATCIA:
+    case BufferFormat::DXT1:
+    case BufferFormat::DXT5:
+    case BufferFormat::ETC1:
+    case BufferFormat::RGBX_8888:
+    case BufferFormat::YUV_420:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
-GLsizei SizeInBytes(const Size& size,
-                    GpuMemoryBuffer::Format format) {
+GLsizei SizeInBytes(const Size& size, BufferFormat format) {
   size_t stride_in_bytes = 0;
   bool valid_stride = GLImageMemory::StrideInBytes(
       size.width(), format, &stride_in_bytes);
   DCHECK(valid_stride);
   return static_cast<GLsizei>(stride_in_bytes * size.height());
 }
 
 }  // namespace
 
 GLImageMemory::GLImageMemory(const Size& size, unsigned internalformat)
     : size_(size),
       internalformat_(internalformat),
       memory_(NULL),
-      format_(GpuMemoryBuffer::RGBA_8888),
+      format_(BufferFormat::RGBA_8888),
       in_use_(false),
       target_(0),
       need_do_bind_tex_image_(false)
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
       ,
       egl_texture_id_(0u),
       egl_image_(EGL_NO_IMAGE_KHR)
 #endif
 {
 }
 
 GLImageMemory::~GLImageMemory() {
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
   DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
   DCHECK_EQ(0u, egl_texture_id_);
 #endif
 }
 
 // static
 bool GLImageMemory::StrideInBytes(size_t width,
-                                  GpuMemoryBuffer::Format format,
+                                  BufferFormat format,
                                   size_t* stride_in_bytes) {
   base::CheckedNumeric<size_t> checked_stride = width;
   switch (format) {
-    case GpuMemoryBuffer::ATCIA:
-    case GpuMemoryBuffer::DXT5:
+    case BufferFormat::ATCIA:
+    case BufferFormat::DXT5:
       *stride_in_bytes = width;
       return true;
-    case GpuMemoryBuffer::ATC:
-    case GpuMemoryBuffer::DXT1:
-    case GpuMemoryBuffer::ETC1:
+    case BufferFormat::ATC:
+    case BufferFormat::DXT1:
+    case BufferFormat::ETC1:
       DCHECK_EQ(width % 2, 0u);
       *stride_in_bytes = width / 2;
       return true;
-    case GpuMemoryBuffer::R_8:
+    case BufferFormat::R_8:
       checked_stride += 3;
       if (!checked_stride.IsValid())
         return false;
       *stride_in_bytes = checked_stride.ValueOrDie() & ~0x3;
       return true;
-    case GpuMemoryBuffer::RGBA_4444:
+    case BufferFormat::RGBA_4444:
       checked_stride *= 2;
       if (!checked_stride.IsValid())
         return false;
       *stride_in_bytes = checked_stride.ValueOrDie();
       return true;
-    case GpuMemoryBuffer::RGBA_8888:
-    case GpuMemoryBuffer::BGRA_8888:
+    case BufferFormat::RGBA_8888:
+    case BufferFormat::BGRA_8888:
       checked_stride *= 4;
       if (!checked_stride.IsValid())
         return false;
       *stride_in_bytes = checked_stride.ValueOrDie();
       return true;
-    case GpuMemoryBuffer::RGBX_8888:
-    case GpuMemoryBuffer::YUV_420:
+    case BufferFormat::RGBX_8888:
+    case BufferFormat::YUV_420:
       NOTREACHED();
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 bool GLImageMemory::Initialize(const unsigned char* memory,
-                               GpuMemoryBuffer::Format format) {
+                               BufferFormat format) {
   if (!ValidInternalFormat(internalformat_)) {
     LOG(ERROR) << "Invalid internalformat: " << internalformat_;
     return false;
   }
 
   if (!ValidFormat(format)) {
-    LOG(ERROR) << "Invalid format: " << format;
+    LOG(ERROR) << "Invalid format: " << static_cast<int>(format);
     return false;
   }
 
   DCHECK(memory);
   DCHECK(!memory_);
   DCHECK_IMPLIES(IsCompressedFormat(format), size_.width() % 4 == 0);
   DCHECK_IMPLIES(IsCompressedFormat(format), size_.height() % 4 == 0);
   memory_ = memory;
   format_ = format;
   return true;
@@ skipping 199 matching lines @@
                  size_.width(),
                  size_.height(),
                  0,  // border
                  DataFormat(format_),
                  DataType(format_),
                  memory_);
   }
 }
 
 }  // namespace gfx