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

Unified Diff: cc/resources/resource_pool.cc

Issue 1251693003: cc: Fix the format of GpuMemoryBuffer for SurfaceTexture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move the targets to ResourceProvider and fix the nits Created 5 years, 5 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 f5c71678f2740a5966f41958c08a0bf49f77ae70..4cb8e3d60d2e19b42c15cca572f3c61a6a5537bb 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -9,6 +9,16 @@
namespace cc {
+ResourcePool::ResourcePool(ResourceProvider* resource_provider)
+ : resource_provider_(resource_provider),
+ target_(0),
+ max_memory_usage_bytes_(0),
+ max_unused_memory_usage_bytes_(0),
+ max_resource_count_(0),
+ memory_usage_bytes_(0),
+ unused_memory_usage_bytes_(0),
+ resource_count_(0) {}
+
ResourcePool::ResourcePool(ResourceProvider* resource_provider, GLenum target)
: resource_provider_(resource_provider),
target_(target),
@@ -17,7 +27,9 @@ ResourcePool::ResourcePool(ResourceProvider* resource_provider, GLenum target)
max_resource_count_(0),
memory_usage_bytes_(0),
unused_memory_usage_bytes_(0),
- resource_count_(0) {}
+ resource_count_(0) {
+ DCHECK_NE(0u, target);
+}
ResourcePool::~ResourcePool() {
while (!busy_resources_.empty()) {
@@ -54,7 +66,9 @@ scoped_ptr<ScopedResource> ResourcePool::AcquireResource(
scoped_ptr<ScopedResource> resource =
ScopedResource::Create(resource_provider_);
- resource->AllocateManaged(size, target_, format);
+ GLenum target =
+ target_ ? target_ : resource_provider_->GetImageTextureTarget(format);
+ resource->AllocateManaged(size, target, format);
DCHECK(Resource::VerifySizeInBytes(resource->size(), resource->format()));
memory_usage_bytes_ +=

Powered by Google App Engine
This is Rietveld 408576698