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

Side by Side Diff: cc/resources/resource_pool.h

Issue 860813002: Remove the default format from ResourcePool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ResourceFormat from TileManager and call TileTaskRunner::GetResourceFormat() directly instea… Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « cc/resources/rasterizer.h ('k') | cc/resources/resource_pool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_RESOURCES_RESOURCE_POOL_H_ 5 #ifndef CC_RESOURCES_RESOURCE_POOL_H_
6 #define CC_RESOURCES_RESOURCE_POOL_H_ 6 #define CC_RESOURCES_RESOURCE_POOL_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.h"
12 #include "cc/output/renderer.h" 12 #include "cc/output/renderer.h"
13 #include "cc/resources/resource.h" 13 #include "cc/resources/resource.h"
14 #include "cc/resources/resource_format.h" 14 #include "cc/resources/resource_format.h"
15 15
16 namespace cc { 16 namespace cc {
17 class ScopedResource; 17 class ScopedResource;
18 18
19 class CC_EXPORT ResourcePool { 19 class CC_EXPORT ResourcePool {
20 public: 20 public:
21 static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider, 21 static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
22 GLenum target, 22 GLenum target) {
23 ResourceFormat default_format) { 23 return make_scoped_ptr(new ResourcePool(resource_provider, target));
24 return make_scoped_ptr(new ResourcePool(resource_provider,
25 target,
26 default_format));
27 } 24 }
28 25
29 virtual ~ResourcePool(); 26 virtual ~ResourcePool();
30 27
31 scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size, 28 scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
32 ResourceFormat format); 29 ResourceFormat format);
33 void ReleaseResource(scoped_ptr<ScopedResource>); 30 void ReleaseResource(scoped_ptr<ScopedResource>);
34 31
35 void SetResourceUsageLimits(size_t max_memory_usage_bytes, 32 void SetResourceUsageLimits(size_t max_memory_usage_bytes,
36 size_t max_unused_memory_usage_bytes, 33 size_t max_unused_memory_usage_bytes,
37 size_t max_resource_count); 34 size_t max_resource_count);
38 35
39 void ReduceResourceUsage(); 36 void ReduceResourceUsage();
40 // This might block if |wait_if_needed| is true and one of the currently 37 // This might block if |wait_if_needed| is true and one of the currently
41 // busy resources has a read lock fence that needs to be waited upon before 38 // busy resources has a read lock fence that needs to be waited upon before
42 // it can be locked for write again. 39 // it can be locked for write again.
43 void CheckBusyResources(bool wait_if_needed); 40 void CheckBusyResources(bool wait_if_needed);
44 41
45 size_t total_memory_usage_bytes() const { return memory_usage_bytes_; } 42 size_t total_memory_usage_bytes() const { return memory_usage_bytes_; }
46 size_t acquired_memory_usage_bytes() const { 43 size_t acquired_memory_usage_bytes() const {
47 return memory_usage_bytes_ - unused_memory_usage_bytes_; 44 return memory_usage_bytes_ - unused_memory_usage_bytes_;
48 } 45 }
49 size_t total_resource_count() const { return resource_count_; } 46 size_t total_resource_count() const { return resource_count_; }
50 size_t acquired_resource_count() const { 47 size_t acquired_resource_count() const {
51 return resource_count_ - unused_resources_.size(); 48 return resource_count_ - unused_resources_.size();
52 } 49 }
53 size_t busy_resource_count() const { return busy_resources_.size(); } 50 size_t busy_resource_count() const { return busy_resources_.size(); }
54 51
55 ResourceFormat default_format() const { return default_format_; }
56
57 protected: 52 protected:
58 ResourcePool(ResourceProvider* resource_provider, 53 ResourcePool(ResourceProvider* resource_provider, GLenum target);
59 GLenum target,
60 ResourceFormat default_format);
61 54
62 bool ResourceUsageTooHigh(); 55 bool ResourceUsageTooHigh();
63 56
64 private: 57 private:
65 void DidFinishUsingResource(ScopedResource* resource); 58 void DidFinishUsingResource(ScopedResource* resource);
66 59
67 ResourceProvider* resource_provider_; 60 ResourceProvider* resource_provider_;
68 const GLenum target_; 61 const GLenum target_;
69 // TODO(peterp): Remove the format state and let the clients keep track of
70 // this instead.
71 const ResourceFormat default_format_;
72 size_t max_memory_usage_bytes_; 62 size_t max_memory_usage_bytes_;
73 size_t max_unused_memory_usage_bytes_; 63 size_t max_unused_memory_usage_bytes_;
74 size_t max_resource_count_; 64 size_t max_resource_count_;
75 size_t memory_usage_bytes_; 65 size_t memory_usage_bytes_;
76 size_t unused_memory_usage_bytes_; 66 size_t unused_memory_usage_bytes_;
77 size_t resource_count_; 67 size_t resource_count_;
78 68
79 typedef std::list<ScopedResource*> ResourceList; 69 typedef std::list<ScopedResource*> ResourceList;
80 ResourceList unused_resources_; 70 ResourceList unused_resources_;
81 ResourceList busy_resources_; 71 ResourceList busy_resources_;
82 72
83 DISALLOW_COPY_AND_ASSIGN(ResourcePool); 73 DISALLOW_COPY_AND_ASSIGN(ResourcePool);
84 }; 74 };
85 75
86 } // namespace cc 76 } // namespace cc
87 77
88 #endif // CC_RESOURCES_RESOURCE_POOL_H_ 78 #endif // CC_RESOURCES_RESOURCE_POOL_H_
OLDNEW
« no previous file with comments | « cc/resources/rasterizer.h ('k') | cc/resources/resource_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698