Add R_8 GPU memory buffers format.

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"
 
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
 #include "ui/gl/gl_surface_egl.h"
 #endif
 
 namespace gfx {
 namespace {
 
 bool ValidInternalFormat(unsigned internalformat) {
   switch (internalformat) {
+    case GL_R8:
     case GL_RGBA:
     case GL_BGRA_EXT:
       return true;
     default:
       return false;
   }
 }
 
 bool ValidFormat(gfx::GpuMemoryBuffer::Format format) {
   switch (format) {
     case gfx::GpuMemoryBuffer::ATC:
     case gfx::GpuMemoryBuffer::ATCIA:
     case gfx::GpuMemoryBuffer::DXT1:
     case gfx::GpuMemoryBuffer::DXT5:
     case gfx::GpuMemoryBuffer::ETC1:
+    case gfx::GpuMemoryBuffer::R_8:
     case gfx::GpuMemoryBuffer::RGBA_8888:
     case gfx::GpuMemoryBuffer::BGRA_8888:
       return true;
     case gfx::GpuMemoryBuffer::RGBX_8888:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 bool IsCompressedFormat(gfx::GpuMemoryBuffer::Format format) {
   switch (format) {
     case gfx::GpuMemoryBuffer::ATC:
     case gfx::GpuMemoryBuffer::ATCIA:
     case gfx::GpuMemoryBuffer::DXT1:
     case gfx::GpuMemoryBuffer::DXT5:
     case gfx::GpuMemoryBuffer::ETC1:
       return true;
+    case gfx::GpuMemoryBuffer::R_8:
     case gfx::GpuMemoryBuffer::RGBA_8888:
     case gfx::GpuMemoryBuffer::BGRA_8888:
     case gfx::GpuMemoryBuffer::RGBX_8888:
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) {
   switch (format) {
     case gfx::GpuMemoryBuffer::ATC:
       return GL_ATC_RGB_AMD;
     case gfx::GpuMemoryBuffer::ATCIA:
       return GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD;
     case gfx::GpuMemoryBuffer::DXT1:
       return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
     case gfx::GpuMemoryBuffer::DXT5:
       return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
     case gfx::GpuMemoryBuffer::ETC1:
       return GL_ETC1_RGB8_OES;
+    case gfx::GpuMemoryBuffer::R_8:
+      return GL_RED;
     case gfx::GpuMemoryBuffer::RGBA_8888:
       return GL_RGBA;
     case gfx::GpuMemoryBuffer::BGRA_8888:
       return GL_BGRA_EXT;
     case gfx::GpuMemoryBuffer::RGBX_8888:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
 GLenum DataFormat(gfx::GpuMemoryBuffer::Format format) {
   return TextureFormat(format);
 }
 
 GLenum DataType(gfx::GpuMemoryBuffer::Format format) {
   switch (format) {
     case gfx::GpuMemoryBuffer::RGBA_8888:
     case gfx::GpuMemoryBuffer::BGRA_8888:
+    case gfx::GpuMemoryBuffer::R_8:
       return GL_UNSIGNED_BYTE;
     case gfx::GpuMemoryBuffer::ATC:
     case gfx::GpuMemoryBuffer::ATCIA:
     case gfx::GpuMemoryBuffer::DXT1:
     case gfx::GpuMemoryBuffer::DXT5:
     case gfx::GpuMemoryBuffer::ETC1:
     case gfx::GpuMemoryBuffer::RGBX_8888:
       NOTREACHED();
       return 0;
   }
@@ skipping 35 matching lines @@
     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,
                                   gfx::GpuMemoryBuffer::Format format,
                                   size_t* stride_in_bytes) {
-  base::CheckedNumeric<size_t> s = width;
+  base::CheckedNumeric<size_t> checked_stride = width;
   switch (format) {
-    case gfx::GpuMemoryBuffer::ATCIA:
-    case gfx::GpuMemoryBuffer::DXT5:
+    case GpuMemoryBuffer::R_8:

[reveman, 2015/04/07 23:28:03]

nit: I prefer if you save gfx:: prefix removal to a different patch that removes
it everywhere in all gl_image* files

[Daniele Castagna, 2015/04/08 01:00:28]

Done.

+      checked_stride += 3;
+      if (!checked_stride.IsValid())
+        return false;
+      *stride_in_bytes = checked_stride.ValueOrDie() & ~0x3;
+      return true;
+    case GpuMemoryBuffer::ATCIA:
+    case GpuMemoryBuffer::DXT5:
       *stride_in_bytes = width;
       return true;
-    case gfx::GpuMemoryBuffer::ATC:
-    case gfx::GpuMemoryBuffer::DXT1:
-    case gfx::GpuMemoryBuffer::ETC1:
-      DCHECK_EQ(width % 2, 0U);
-      s /= 2;
-      if (!s.IsValid())
+    case GpuMemoryBuffer::ATC:
+    case GpuMemoryBuffer::DXT1:
+    case GpuMemoryBuffer::ETC1:
+      DCHECK_EQ(width % 2, 0u);
+      *stride_in_bytes = width / 2;
+      return true;
+    case GpuMemoryBuffer::RGBA_8888:
+    case GpuMemoryBuffer::RGBX_8888:
+    case GpuMemoryBuffer::BGRA_8888:
+      checked_stride *= 4;
+      if (!checked_stride.IsValid())
         return false;
-
-      *stride_in_bytes = s.ValueOrDie();
+      *stride_in_bytes = checked_stride.ValueOrDie();
       return true;
-    case gfx::GpuMemoryBuffer::RGBA_8888:
-    case gfx::GpuMemoryBuffer::BGRA_8888:
-      s *= 4;
-      if (!s.IsValid())
-        return false;
-
-      *stride_in_bytes = s.ValueOrDie();
-      return true;
-    case gfx::GpuMemoryBuffer::RGBX_8888:
-      NOTREACHED();
-      return false;
   }
-
   NOTREACHED();
   return false;
 }
 
 bool GLImageMemory::Initialize(const unsigned char* memory,
                                gfx::GpuMemoryBuffer::Format format) {
   if (!ValidInternalFormat(internalformat_)) {
     LOG(ERROR) << "Invalid internalformat: " << internalformat_;
     return false;
   }
@@ skipping 155 matching lines @@
     } else {
       ScopedTextureBinder texture_binder(GL_TEXTURE_2D, egl_texture_id_);
 
       if (IsCompressedFormat(format_)) {
         glCompressedTexSubImage2D(GL_TEXTURE_2D,
                                   0,  // mip level
                                   0,  // x-offset
                                   0,  // y-offset
                                   size_.width(), size_.height(),
                                   DataFormat(format_),
-                                  SizeInBytes(size_, format_),
-                                  memory_);
+                                  SizeInBytes(size_, format_), memory_);
       } else {
         glTexSubImage2D(GL_TEXTURE_2D,
                         0,  // mip level
                         0,  // x-offset
                         0,  // y-offset
                         size_.width(),
                         size_.height(),
                         DataFormat(format_),
                         DataType(format_),
                         memory_);
@@ skipping 21 matching lines @@
                  size_.width(),
                  size_.height(),
                  0,  // border
                  DataFormat(format_),
                  DataType(format_),
                  memory_);
   }
 }
 
 }  // namespace gfx