cc: Fix R_8 GpuMemoryBuffers

cc/resources/resource_format.cc

 // Copyright 2013 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 "cc/resources/resource_format.h"
 
-#include "third_party/khronos/GLES2/gl2.h"
-#include "third_party/khronos/GLES2/gl2ext.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace cc {
 
 SkColorType ResourceFormatToSkColorType(ResourceFormat format) {
   switch (format) {
     case RGBA_4444:
       return kARGB_4444_SkColorType;
     case RGBA_8888:
     case BGRA_8888:
       return kN32_SkColorType;
@@ skipping 61 matching lines @@
   static_assert(arraysize(format_gl_data_format) == (RESOURCE_FORMAT_MAX + 1),
                 "format_gl_data_format does not handle all cases.");
 
   return format_gl_data_format[format];
 }
 
 GLenum GLInternalFormat(ResourceFormat format) {
   return GLDataFormat(format);
 }
 
+GLenum GLImageFormat(ResourceFormat format) {
+  if (format == RED_8)
+    return GL_R8_EXT;

[reveman, 2015/11/05 13:46:01]

Can we have normal textures use GL_R8_EXT as well? I don't think there's any
good reason for why we should have to special case this for GLImage.

[ccameron, 2015/11/05 19:09:20]

That was the first thing that I tried, but GL_R8_EXT doesn't go through the
various validators.

In particular, if we check out the GLES extension text:
https://www.khronos.org/registry/gles/extensions/EXT/EXT_texture_rg.txt
New Tokens
    Accepted by the <internalformat> parameter of TexImage2D and CopyTexImage2D,
    and the <format> parameter of TexImage2D, TexSubImage2D, and ReadPixels:
        RED_EXT                 0x1903
        RG_EXT                  0x8227
    Accepted by the <internalformat> parameter of RenderbufferStorage and
    RenderbufferStorageMultisampleAPPLE:
        R8_EXT                  0x8229
        RG8_EXT                 0x822B
So according to the extension spec, R8_EXT is not a valid argument for <format>
or <internalformat> for TexImage2D.

FWIW, for the related desktop GL extension text:
https://www.opengl.org/registry/specs/ARB/texture_rg.txt
It says that R8_ARB (which coincides with R8_EXT) is accepted as
<internalformat> but not <format>. I don't think that's relevant here because
the client code should be GLES and not desktop GL.

So I think that this is the right thing to do.

+  return GLInternalFormat(format);
+}
+
 gfx::BufferFormat BufferFormat(ResourceFormat format) {
   switch (format) {
+    case BGRA_8888:
+      return gfx::BufferFormat::BGRA_8888;
+    case RED_8:
+      return gfx::BufferFormat::R_8;
+    case RGBA_4444:
+      return gfx::BufferFormat::RGBA_4444;
     case RGBA_8888:
       return gfx::BufferFormat::RGBA_8888;
-    case BGRA_8888:
-      return gfx::BufferFormat::BGRA_8888;
-    case RGBA_4444:
-      return gfx::BufferFormat::RGBA_4444;
     case ALPHA_8:
     case LUMINANCE_8:
     case RGB_565:
     case ETC1:
-    case RED_8:
       break;
   }
   NOTREACHED();
   return gfx::BufferFormat::RGBA_8888;
 }
 
 }  // namespace cc