Index: cc/resources/resource_pool.cc |
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc |
index 25cb3c1d2a8fd1fd9d93fb42db98c619916a393d..1a24ef572a54e22c4bd76aaa0c8f589eca7d6b3c 100644 |
--- a/cc/resources/resource_pool.cc |
+++ b/cc/resources/resource_pool.cc |
@@ -55,9 +55,9 @@ void ResourcePool::PoolResource::OnMemoryDump( |
ResourcePool::ResourcePool(ResourceProvider* resource_provider, |
base::SingleThreadTaskRunner* task_runner, |
- GLenum target) |
+ bool use_image_texture_target) |
: resource_provider_(resource_provider), |
- target_(target), |
+ use_image_texture_target_(use_image_texture_target), |
max_memory_usage_bytes_(0), |
max_resource_count_(0), |
in_use_memory_usage_bytes_(0), |
@@ -110,9 +110,13 @@ Resource* ResourcePool::AcquireResource(const gfx::Size& size, |
scoped_ptr<PoolResource> pool_resource = |
PoolResource::Create(resource_provider_); |
- GLenum target = |
- target_ ? target_ : resource_provider_->GetImageTextureTarget(format); |
- pool_resource->AllocateWithTextureTarget(size, target, format); |
+ |
+ if (use_image_texture_target_) { |
+ pool_resource->AllocateWithImageTextureTarget(size, format); |
+ } else { |
+ pool_resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, |
+ format); |
+ } |
DCHECK(ResourceUtil::VerifySizeInBytes<size_t>(pool_resource->size(), |
pool_resource->format())); |