Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Unified Diff: cc/resources/resource_pool.cc

Issue 1422103003: cc: Remove the ability to specify a GL texture target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()));

Powered by Google App Engine
This is Rietveld 408576698