cc: Remove the ability to specify a GL texture target

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 <deque>
 
 #include "base/containers/scoped_ptr_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/output/renderer.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_format.h"
 #include "cc/resources/scoped_resource.h"
 
 namespace cc {
 
 class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
  public:
+  static scoped_ptr<ResourcePool> CreateForImageTextureTarget(

[reveman, 2015/10/29 14:11:39]

I think this change will break the ongoing work to support compressed tile
textures as we need a mix of texture targets in that case. Some tiles will be
compressed and some will not. E.g. the driver might only support compression
opaque contents.

[ccameron, 2015/10/29 19:08:29]

Is there a reason that the texture target selection cannot be pushed down to the
ResourceProvider level?

If we are planning to have the ResourceProvider have a flag saying "make all of
the texture backed by native GMBs", then it will be necessary to never specify a
texture target, because the choice of texture target is already fixed by the
decision to use GMBs.

IMO, the ResourceProvider's interface should be renderer-agnostic, and the GL
texture target is very non-renderer-agnostic.

[reveman, 2015/10/29 19:41:57]

There are some plans to allocate resources on worker threads instead of the
compositor thread and that wouldn't really allow us to use the RP. I don't think
there's any reason it couldn't be pushed down to RP in ToT though.
I agree. ResourcePool should be render agnostic too. 

+      ResourceProvider* resource_provider,
+      base::SingleThreadTaskRunner* task_runner) {
+    return make_scoped_ptr(
+        new ResourcePool(resource_provider, task_runner, true));
+  }
+
   static scoped_ptr<ResourcePool> Create(
       ResourceProvider* resource_provider,
       base::SingleThreadTaskRunner* task_runner) {
     return make_scoped_ptr(
-        new ResourcePool(resource_provider, task_runner, 0 /* target */));
-  }
-
-  static scoped_ptr<ResourcePool> Create(
-      ResourceProvider* resource_provider,
-      base::SingleThreadTaskRunner* task_runner,
-      GLenum target) {
-    DCHECK_NE(0u, target);
-    return make_scoped_ptr(
-        new ResourcePool(resource_provider, task_runner, target));
+        new ResourcePool(resource_provider, task_runner, false));
   }
 
   ~ResourcePool() override;
 
   Resource* AcquireResource(const gfx::Size& size, ResourceFormat format);
   Resource* TryAcquireResourceWithContentId(uint64 content_id);
   void ReleaseResource(Resource* resource, uint64_t content_id);
 
   void SetResourceUsageLimits(size_t max_memory_usage_bytes,
                               size_t max_resource_count);
@@ skipping 17 matching lines @@
   size_t GetBusyResourceCountForTesting() const {
     return busy_resources_.size();
   }
   void SetResourceExpirationDelayForTesting(base::TimeDelta delay) {
     resource_expiration_delay_ = delay;
   }
 
  protected:
   ResourcePool(ResourceProvider* resource_provider,
                base::SingleThreadTaskRunner* task_runner,
-               GLenum target);
+               bool use_image_texture_target);
 
   bool ResourceUsageTooHigh();
 
  private:
   class PoolResource : public ScopedResource {
    public:
     static scoped_ptr<PoolResource> Create(
         ResourceProvider* resource_provider) {
       return make_scoped_ptr(new PoolResource(resource_provider));
     }
@@ skipping 18 matching lines @@
   void DeleteResource(scoped_ptr<PoolResource> resource);
 
   // Functions which manage periodic eviction of expired resources.
   void ScheduleEvictExpiredResourcesIn(base::TimeDelta time_from_now);
   void EvictExpiredResources();
   void EvictResourcesNotUsedSince(base::TimeTicks time_limit);
   bool HasEvictableResources() const;
   base::TimeTicks GetUsageTimeForLRUResource() const;
 
   ResourceProvider* resource_provider_;
-  const GLenum target_;
+  bool use_image_texture_target_;
   size_t max_memory_usage_bytes_;
   size_t max_resource_count_;
   size_t in_use_memory_usage_bytes_;
   size_t total_memory_usage_bytes_;
   size_t total_resource_count_;
 
   using ResourceDeque = ScopedPtrDeque<PoolResource>;
   ResourceDeque unused_resources_;
   ResourceDeque busy_resources_;
 
   using ResourceMap = base::ScopedPtrMap<ResourceId, scoped_ptr<PoolResource>>;
   ResourceMap in_use_resources_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   bool evict_expired_resources_pending_;
   base::TimeDelta resource_expiration_delay_;
 
   base::WeakPtrFactory<ResourcePool> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_POOL_H_