cc: Adding support for RGBA_4444 tile textures

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 34 matching lines @@
   typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
   enum TextureUsageHint {
     TextureUsageAny,
     TextureUsageFramebuffer,
   };
   enum ResourceType {
     InvalidType = 0,
     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);
 
   virtual ~ResourceProvider();
 
   void InitializeSoftware();
   bool InitializeGL();
 
   void DidLoseOutputSurface() { lost_output_surface_ = true; }
 
   int max_texture_size() const { return max_texture_size_; }
   GLenum best_texture_format() const { return best_texture_format_; }
   size_t num_resources() const { return resources_.size(); }
 
   // Checks whether a resource is in use by a consumer.
   bool InUseByConsumer(ResourceId id);
 
 
   // Producer interface.
 
   ResourceType default_resource_type() const { return default_resource_type_; }
   ResourceType GetResourceType(ResourceId id);
 
   // Creates a resource of the default resource type.
   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.
   ResourceId CreateResourceFromExternalTexture(
       unsigned texture_target,
       unsigned texture_id);
 
   // Wraps an external texture mailbox into a GL resource.
   ResourceId CreateResourceFromTextureMailbox(const TextureMailbox& mailbox);
 
@@ skipping 215 matching lines @@
   }
   Fence* GetReadLockFence() { return current_read_lock_fence_.get(); }
 
   // Enable read lock fences for a specific resource.
   void EnableReadLockFences(ResourceProvider::ResourceId id, bool enable);
 
   // Indicates if we can currently lock this resource for write.
   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 {
     Resource();
     ~Resource();
     Resource(unsigned texture_id,
              gfx::Size size,
              GLenum format,
              GLenum filter,
              GLenum texture_pool,
              GLint wrap_mode,
-             TextureUsageHint hint);
+             TextureUsageHint hint,
+             TextureType texture_type);
     Resource(uint8_t* pixels,
              gfx::Size size,
              GLenum format,
              GLenum filter,
              GLint wrap_mode);
 
     unsigned gl_id;
     // Pixel buffer used for set pixels without unnecessary copying.
     unsigned gl_pixel_buffer_id;
     // Query used to determine when asynchronous set pixels complete.
@@ skipping 14 matching lines @@
     scoped_refptr<Fence> read_lock_fence;
     gfx::Size size;
     GLenum format;
     // TODO(skyostil): Use a separate sampler object for filter state.
     GLenum filter;
     unsigned image_id;
     GLenum texture_pool;
     GLint wrap_mode;
     TextureUsageHint hint;
     ResourceType type;
+    TextureType texture_type;
   };
   typedef base::hash_map<ResourceId, Resource> ResourceMap;
   struct Child {
     Child();
     ~Child();
 
     ResourceIdMap child_to_parent_map;
     ResourceIdMap parent_to_child_map;
   };
   typedef base::hash_map<int, Child> ChildMap;
 
   bool ReadLockFenceHasPassed(Resource* resource) {
     return !resource->read_lock_fence.get() ||
            resource->read_lock_fence->HasPassed();
   }
 
-  explicit ResourceProvider(OutputSurface* output_surface,
-                            int highp_threshold_min);
+  ResourceProvider(OutputSurface* output_surface,
+                   int highp_threshold_min);
 
   void CleanUpGLIfNeeded();
 
   Resource* GetResource(ResourceId id);
   const Resource* LockForRead(ResourceId id);
   void UnlockForRead(ResourceId id);
   const Resource* LockForWrite(ResourceId id);
   void UnlockForWrite(ResourceId id);
   static void PopulateSkBitmapWithResource(SkBitmap* sk_bitmap,
                                            const Resource* resource);
@@ skipping 42 matching lines @@
   base::ThreadChecker thread_checker_;
 
   scoped_refptr<Fence> current_read_lock_fence_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_