cc: Adding ETC1 support to UIResourceBitmap and ResourceProvider

cc/resources/resource_provider.h

 // Copyright 2012 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.
 
 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
 #include <string>
@@ skipping 470 matching lines @@
 
   scoped_refptr<Fence> current_read_lock_fence_;
   bool use_rgba_4444_texture_format_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 
 // TODO(epenner): Move these format conversions to resource_format.h
 // once that builds on mac (npapi.h currently #includes OpenGL.h).
 inline unsigned BytesPerPixel(ResourceFormat format) {

[aelias_OOO_until_Jul13, 2013/10/18 01:59:24]

Please rename this method to BitsPerPixel and multiply everything by 8.  ETC1
would be 4.

[powei, 2013/10/23 05:36:15]

Done.

   DCHECK_LE(format, RESOURCE_FORMAT_MAX);
   static const unsigned format_bytes_per_pixel[RESOURCE_FORMAT_MAX + 1] = {
+    0,  // ETC1
     4,  // RGBA_8888
     2,  // RGBA_4444
     4,  // BGRA_8888
     1,  // LUMINANCE_8
     2   // RGB_565
   };
   return format_bytes_per_pixel[format];
 }
 
 inline GLenum GLDataType(ResourceFormat format) {
   DCHECK_LE(format, RESOURCE_FORMAT_MAX);
   static const unsigned format_gl_data_type[RESOURCE_FORMAT_MAX + 1] = {
+    GL_UNSIGNED_BYTE,           // ETC1
     GL_UNSIGNED_BYTE,           // RGBA_8888
     GL_UNSIGNED_SHORT_4_4_4_4,  // RGBA_4444
     GL_UNSIGNED_BYTE,           // BGRA_8888
     GL_UNSIGNED_BYTE,           // LUMINANCE_8
     GL_UNSIGNED_SHORT_5_6_5     // RGB_565
   };
   return format_gl_data_type[format];
 }
 
 inline GLenum GLDataFormat(ResourceFormat format) {
   DCHECK_LE(format, RESOURCE_FORMAT_MAX);
   static const unsigned format_gl_data_format[RESOURCE_FORMAT_MAX + 1] = {
-    GL_RGBA,       // RGBA_8888
-    GL_RGBA,       // RGBA_4444
-    GL_BGRA_EXT,   // BGRA_8888
-    GL_LUMINANCE,  // LUMINANCE_8
-    GL_RGB         // RGB_565
+    GL_ETC1_RGB8_OES,  // ETC1

[kaanb, 2013/10/18 16:54:49]

Is this a GL data format or a GL internal format? 

[powei, 2013/10/23 05:36:15]

If I'm reading the spec correctly.  We're suppose to use GL_ETC1_RGB8_OES for
the internal format in glCompressedTexImage2D and for the data format in
glCompressedTexSubImage2D

http://www.khronos.org/registry/gles/extensions/OES/OES_compressed_ETC1_RGB8_...

http://www.khronos.org/opengles/sdk/1.1/docs/man/glCompressedTexSubImage2D.xml

+    GL_RGBA,           // RGBA_8888
+    GL_RGBA,           // RGBA_4444
+    GL_BGRA_EXT,       // BGRA_8888
+    GL_LUMINANCE,      // LUMINANCE_8
+    GL_RGB             // RGB_565
   };
   return format_gl_data_format[format];
 }
 
 inline GLenum GLInternalFormat(ResourceFormat format) {
   return GLDataFormat(format);
 }
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_