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

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

Issue 301793003: During image destroy, delete textures only if we have a GL context. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve android clang dbg build issue. Created 6 years, 4 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
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/image_manager.h" 5 #include "gpu/command_buffer/service/image_manager.h"
6 6
7 #include "base/logging.h"
7 #include "ui/gl/gl_image.h" 8 #include "ui/gl/gl_image.h"
8 9
9 namespace gpu { 10 namespace gpu {
10 namespace gles2 { 11 namespace gles2 {
11 12
12 ImageManager::ImageManager() { 13 ImageManager::ImageManager() {
13 } 14 }
14 15
15 ImageManager::~ImageManager() { 16 ImageManager::~ImageManager() {
16 } 17 }
17 18
19 void ImageManager::Destroy(bool have_context) {
20 for (GLImageMap::const_iterator iter = images_.begin(); iter != images_.end();
21 ++iter)
22 iter->second.get()->Destroy(have_context);
23 images_.clear();
24 }
25
18 void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) { 26 void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) {
27 DCHECK(images_.find(service_id) == images_.end());
19 images_[service_id] = image; 28 images_[service_id] = image;
20 } 29 }
21 30
22 void ImageManager::RemoveImage(int32 service_id) { 31 void ImageManager::RemoveImage(int32 service_id) {
23 images_.erase(service_id); 32 GLImageMap::iterator iter = images_.find(service_id);
33 DCHECK(iter != images_.end());
34 iter->second.get()->Destroy(true);
35 images_.erase(iter);
24 } 36 }
25 37
26 gfx::GLImage* ImageManager::LookupImage(int32 service_id) { 38 gfx::GLImage* ImageManager::LookupImage(int32 service_id) {
27 GLImageMap::const_iterator iter = images_.find(service_id); 39 GLImageMap::const_iterator iter = images_.find(service_id);
28 if (iter != images_.end()) 40 if (iter != images_.end())
29 return iter->second.get(); 41 return iter->second.get();
30 42
31 return NULL; 43 return NULL;
32 } 44 }
33 45
34 } // namespace gles2 46 } // namespace gles2
35 } // namespace gpu 47 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/image_manager.h ('k') | gpu/command_buffer/service/stream_texture_manager_in_process_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698