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

Unified Diff: gpu/command_buffer/service/renderbuffer_manager.cc

Issue 11516014: Track managed memory usage in the command buffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test compile error Created 8 years 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
« no previous file with comments | « gpu/command_buffer/service/renderbuffer_manager.h ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/renderbuffer_manager.cc
diff --git a/gpu/command_buffer/service/renderbuffer_manager.cc b/gpu/command_buffer/service/renderbuffer_manager.cc
index 56a849089770df4f2009c19cf0851a476164c5ad..e94518ac457e7bf1b3289ce46874ad2923ca0488 100644
--- a/gpu/command_buffer/service/renderbuffer_manager.cc
+++ b/gpu/command_buffer/service/renderbuffer_manager.cc
@@ -17,14 +17,14 @@ RenderbufferManager::RenderbufferManager(
MemoryTracker* memory_tracker,
GLint max_renderbuffer_size,
GLint max_samples)
- : renderbuffer_memory_tracker_(new MemoryTypeTracker(memory_tracker)),
+ : memory_tracker_(
+ new MemoryTypeTracker(memory_tracker, MemoryTracker::kUnmanaged)),
max_renderbuffer_size_(max_renderbuffer_size),
max_samples_(max_samples),
num_uncleared_renderbuffers_(0),
- mem_represented_(0),
renderbuffer_info_count_(0),
have_context_(true) {
- UpdateMemRepresented();
+ memory_tracker_->UpdateMemRepresented();
}
RenderbufferManager::~RenderbufferManager() {
@@ -60,16 +60,11 @@ RenderbufferManager::RenderbufferInfo::~RenderbufferInfo() {
}
}
-
-void RenderbufferManager::UpdateMemRepresented() {
- renderbuffer_memory_tracker_->UpdateMemRepresented(mem_represented_);
-}
-
void RenderbufferManager::Destroy(bool have_context) {
have_context_ = have_context;
renderbuffer_infos_.clear();
- DCHECK_EQ(0u, mem_represented_);
- UpdateMemRepresented();
+ DCHECK_EQ(0u, memory_tracker_->GetMemRepresented());
+ memory_tracker_->UpdateMemRepresented();
}
void RenderbufferManager::StartTracking(RenderbufferInfo* /* renderbuffer */) {
@@ -81,7 +76,8 @@ void RenderbufferManager::StopTracking(RenderbufferInfo* renderbuffer) {
if (!renderbuffer->cleared()) {
--num_uncleared_renderbuffers_;
}
- mem_represented_ -= renderbuffer->EstimatedSize();
+ memory_tracker_->TrackMemFree(renderbuffer->EstimatedSize());
+ memory_tracker_->UpdateMemRepresented();
}
void RenderbufferManager::SetInfo(
@@ -91,10 +87,10 @@ void RenderbufferManager::SetInfo(
if (!renderbuffer->cleared()) {
--num_uncleared_renderbuffers_;
}
- mem_represented_ -= renderbuffer->EstimatedSize();
+ memory_tracker_->TrackMemFree(renderbuffer->EstimatedSize());
renderbuffer->SetInfo(samples, internalformat, width, height);
- mem_represented_ += renderbuffer->EstimatedSize();
- UpdateMemRepresented();
+ memory_tracker_->TrackMemAlloc(renderbuffer->EstimatedSize());
+ memory_tracker_->UpdateMemRepresented();
if (!renderbuffer->cleared()) {
++num_uncleared_renderbuffers_;
}
« no previous file with comments | « gpu/command_buffer/service/renderbuffer_manager.h ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698