Support different formats in the same resource pool.

cc/resources/resource_pool.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_POOL_H_
 #define CC_RESOURCES_RESOURCE_POOL_H_
 
 #include <list>
+#include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/renderer.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_format.h"
 
 namespace cc {
 class ScopedResource;
 
 class CC_EXPORT ResourcePool {
  public:
   static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
                                          GLenum target,
-                                         ResourceFormat format) {
-    return make_scoped_ptr(new ResourcePool(resource_provider, target, format));
+                                         bool use_memory_efficient_format) {

[reveman, 2015/01/13 16:25:55]

does the resource pool need to know about use_memory_efficient_format? is it not
enough to remove format from here and add it to AcquireResource?

[peterp, 2015/01/14 12:33:36]

The problem then is that when the tile manager asks the resource pool which
format to use the pool doesn't know if we have for example gpu rasterization
enabled.

+    return make_scoped_ptr(new ResourcePool(resource_provider,
+                                            target,
+                                            use_memory_efficient_format));
   }
 
   virtual ~ResourcePool();
 
-  scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size);
+  scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
+                                             ResourceFormat format);
+  scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
+                                             ResourceFormatUsage usage);
   void ReleaseResource(scoped_ptr<ScopedResource>);
 
   void SetResourceUsageLimits(size_t max_memory_usage_bytes,
                               size_t max_unused_memory_usage_bytes,
                               size_t max_resource_count);
 
   void ReduceResourceUsage();
   // This might block if |wait_if_needed| is true and one of the currently
   // busy resources has a read lock fence that needs to be waited upon before
   // it can be locked for write again.
   void CheckBusyResources(bool wait_if_needed);
 
   size_t total_memory_usage_bytes() const { return memory_usage_bytes_; }
   size_t acquired_memory_usage_bytes() const {
     return memory_usage_bytes_ - unused_memory_usage_bytes_;
   }
   size_t total_resource_count() const { return resource_count_; }
-  size_t acquired_resource_count() const {
-    return resource_count_ - unused_resources_.size();
-  }
+  size_t acquired_resource_count() const;
   size_t busy_resource_count() const { return busy_resources_.size(); }
 
-  ResourceFormat resource_format() const { return format_; }
+  ResourceFormat resource_format(ResourceFormatUsage usage) const;
 
  protected:
   ResourcePool(ResourceProvider* resource_provider,
                GLenum target,
-               ResourceFormat format);
+               bool use_memory_efficient_format);
 
   bool ResourceUsageTooHigh();
 
  private:
   void DidFinishUsingResource(ScopedResource* resource);
 
   ResourceProvider* resource_provider_;
   const GLenum target_;
-  const ResourceFormat format_;
+  bool use_memory_efficient_format_;
   size_t max_memory_usage_bytes_;
   size_t max_unused_memory_usage_bytes_;
   size_t max_resource_count_;
   size_t memory_usage_bytes_;
   size_t unused_memory_usage_bytes_;
   size_t resource_count_;
 
   typedef std::list<ScopedResource*> ResourceList;
-  ResourceList unused_resources_;
+  typedef std::map<ResourceFormat, ResourceList> UnusedMap;

[reveman, 2015/01/13 16:25:55]

do we need a map for this? can we instead just check that the format matches the
requested format in the same way we check that width/height matches the
requested dimensions when acquiring a new resource?

[peterp, 2015/01/14 12:33:36]

You're right, good point. Patch updated.

+  UnusedMap unused_resources_;
   ResourceList busy_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_POOL_H_