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

Side by Side Diff: gpu/command_buffer/service/renderbuffer_manager.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "gpu/command_buffer/service/renderbuffer_manager.h" 5 #include "gpu/command_buffer/service/renderbuffer_manager.h"
6 #include "base/debug/trace_event.h" 6 #include "base/debug/trace_event.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
10 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 renderbuffers_.insert(std::make_pair(client_id, renderbuffer)); 130 renderbuffers_.insert(std::make_pair(client_id, renderbuffer));
131 DCHECK(result.second); 131 DCHECK(result.second);
132 if (!renderbuffer->cleared()) { 132 if (!renderbuffer->cleared()) {
133 ++num_uncleared_renderbuffers_; 133 ++num_uncleared_renderbuffers_;
134 } 134 }
135 } 135 }
136 136
137 Renderbuffer* RenderbufferManager::GetRenderbuffer( 137 Renderbuffer* RenderbufferManager::GetRenderbuffer(
138 GLuint client_id) { 138 GLuint client_id) {
139 RenderbufferMap::iterator it = renderbuffers_.find(client_id); 139 RenderbufferMap::iterator it = renderbuffers_.find(client_id);
140 return it != renderbuffers_.end() ? it->second : NULL; 140 return it != renderbuffers_.end() ? it->second.get() : NULL;
141 } 141 }
142 142
143 void RenderbufferManager::RemoveRenderbuffer(GLuint client_id) { 143 void RenderbufferManager::RemoveRenderbuffer(GLuint client_id) {
144 RenderbufferMap::iterator it = renderbuffers_.find(client_id); 144 RenderbufferMap::iterator it = renderbuffers_.find(client_id);
145 if (it != renderbuffers_.end()) { 145 if (it != renderbuffers_.end()) {
146 Renderbuffer* renderbuffer = it->second.get(); 146 Renderbuffer* renderbuffer = it->second.get();
147 renderbuffer->MarkAsDeleted(); 147 renderbuffer->MarkAsDeleted();
148 renderbuffers_.erase(it); 148 renderbuffers_.erase(it);
149 } 149 }
150 } 150 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 return GL_RGB; 182 return GL_RGB;
183 } 183 }
184 } 184 }
185 return impl_format; 185 return impl_format;
186 } 186 }
187 187
188 } // namespace gles2 188 } // namespace gles2
189 } // namespace gpu 189 } // namespace gpu
190 190
191 191
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/query_manager.cc ('k') | gpu/command_buffer/service/shader_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698