cc: Adding support for RGBA_4444 tile textures

cc/resources/resource_provider.h

Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index e2d7878415d333e2f059e7984cd849337163a2cf..bfee0490ebb9b68e543ff049e5c89f6b0d4e3631 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -52,6 +52,12 @@ class CC_EXPORT ResourceProvider {
     GLTexture = 1,
     Bitmap,
   };
+  enum TextureType {
+    INVALID_TYPE,

[reveman, 2013/09/11 20:19:13]

Do we need INVALID_TYPE? It's easier to maintain and add new enum values if all
values are valid.

[kaanb, 2013/09/12 07:53:44]

There were cases where 0 was being used as the GL format, so I replaced them
with INVALID_FORMAT

+    RGBA_8888,
+    RGBA_4444,
+    BGRA_8888,
+  };
 
   static scoped_ptr<ResourceProvider> Create(OutputSurface* output_surface,
                                              int highp_threshold_min);
@@ -80,21 +86,24 @@ class CC_EXPORT ResourceProvider {
   ResourceId CreateResource(gfx::Size size,
                             GLenum format,
                             GLint wrap_mode,
-                            TextureUsageHint hint);
+                            TextureUsageHint hint,
+                            TextureType texture_type);

[epennerAtGoogle, 2013/09/11 19:21:04]

This is nice, IMO :)

[reveman, 2013/09/11 20:19:13]

Could the enum type be TextureFormat instead and replace "GLenum format"?

[kaanb, 2013/09/12 07:53:44]

Done.

 
   // Creates a resource which is tagged as being managed for GPU memory
   // accounting purposes.
   ResourceId CreateManagedResource(gfx::Size size,
                                    GLenum format,
                                    GLint wrap_mode,
-                                   TextureUsageHint hint);
+                                   TextureUsageHint hint,
+                                   TextureType texture_type);
 
   // You can also explicitly create a specific resource type.
   ResourceId CreateGLTexture(gfx::Size size,
                              GLenum format,
                              GLenum texture_pool,
                              GLint wrap_mode,
-                             TextureUsageHint hint);
+                             TextureUsageHint hint,
+                             TextureType texture_type);
 
   ResourceId CreateBitmap(gfx::Size size);
   // Wraps an external texture into a GL resource.
@@ -330,6 +339,8 @@ class CC_EXPORT ResourceProvider {
   bool CanLockForWrite(ResourceId id);
 
   static GLint GetActiveTextureUnit(WebKit::WebGraphicsContext3D* context);
+  static size_t BytesPerPixel(GLenum format, TextureType type);
+  static GLenum GetTextureDataType(GLenum texture_type);

[epennerAtGoogle, 2013/09/11 19:21:04]

Could we call this GetGLTextureType, and also add a function GetGLTextureFormat,
and get rid of 'GLenum format' in the remaining few places? It looks like we are
almost there. Is there a reason to keep 'GLenum format' as a parameter anywhere?

[reveman, 2013/09/11 20:19:13]

Yes, something like the following set of helper functions would be nice:
static size_t GetBytesPerPixel(TextureFormat format);
static GLenum GetGLInternalFormat(TextureFormat format);
static GLenum GetGLDataFormat(TextureFormat format);
static GLenum GetGLDataType(TextureFormat format);

[kaanb, 2013/09/12 07:53:44]

Done.

 
  private:
   struct Resource {
@@ -341,7 +352,8 @@ class CC_EXPORT ResourceProvider {
              GLenum filter,
              GLenum texture_pool,
              GLint wrap_mode,
-             TextureUsageHint hint);
+             TextureUsageHint hint,
+             TextureType texture_type);
     Resource(uint8_t* pixels,
              gfx::Size size,
              GLenum format,
@@ -376,6 +388,7 @@ class CC_EXPORT ResourceProvider {
     GLint wrap_mode;
     TextureUsageHint hint;
     ResourceType type;
+    TextureType texture_type;
   };
   typedef base::hash_map<ResourceId, Resource> ResourceMap;
   struct Child {
@@ -392,8 +405,8 @@ class CC_EXPORT ResourceProvider {
            resource->read_lock_fence->HasPassed();
   }
 
-  explicit ResourceProvider(OutputSurface* output_surface,
-                            int highp_threshold_min);
+  ResourceProvider(OutputSurface* output_surface,
+                   int highp_threshold_min);
 
   void CleanUpGLIfNeeded();