| Index: cc/resources/resource_pool.cc
|
| diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
|
| index f5c71678f2740a5966f41958c08a0bf49f77ae70..d276a8101af17a133989c766ab76484126a9ebec 100644
|
| --- a/cc/resources/resource_pool.cc
|
| +++ b/cc/resources/resource_pool.cc
|
| @@ -6,12 +6,14 @@
|
|
|
| #include "cc/resources/resource_provider.h"
|
| #include "cc/resources/scoped_resource.h"
|
| +#include "ui/gfx/gpu_memory_buffer.h"
|
|
|
| namespace cc {
|
|
|
| -ResourcePool::ResourcePool(ResourceProvider* resource_provider, GLenum target)
|
| +ResourcePool::ResourcePool(ResourceProvider* resource_provider,
|
| + std::vector<uint> targets)
|
| : resource_provider_(resource_provider),
|
| - target_(target),
|
| + targets_(targets),
|
| max_memory_usage_bytes_(0),
|
| max_unused_memory_usage_bytes_(0),
|
| max_resource_count_(0),
|
| @@ -54,7 +56,9 @@ scoped_ptr<ScopedResource> ResourcePool::AcquireResource(
|
|
|
| scoped_ptr<ScopedResource> resource =
|
| ScopedResource::Create(resource_provider_);
|
| - resource->AllocateManaged(size, target_, format);
|
| + resource->AllocateManaged(
|
| + size, targets_[resource_provider_->ToGpuMemoryBufferFormat(format)],
|
| + format);
|
|
|
| DCHECK(Resource::VerifySizeInBytes(resource->size(), resource->format()));
|
| memory_usage_bytes_ +=
|
|
|