OLD | NEW |
---|---|
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 |
18 void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) { | 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 | |
26 bool ImageManager::AddImage(gfx::GLImage* image, int32 service_id) { | |
27 GLImageMap::const_iterator iter = images_.find(service_id); | |
28 if (iter != images_.end()) { | |
29 LOG(ERROR) << "Image already exists with same ID."; | |
30 return false; | |
31 } | |
19 images_[service_id] = image; | 32 images_[service_id] = image; |
33 return true; | |
20 } | 34 } |
21 | 35 |
22 void ImageManager::RemoveImage(int32 service_id) { | 36 void ImageManager::RemoveImage(int32 service_id) { |
23 images_.erase(service_id); | 37 GLImageMap::iterator iter = images_.find(service_id); |
38 LOG_IF(ERROR, iter == images_.end()); | |
reveman
2014/07/30 14:11:12
You need to return early if the service id doesn't
| |
39 iter->second.get()->Destroy(true); | |
reveman
2014/07/30 14:11:12
This is where the GPU process would crash or behav
| |
40 images_.erase(iter); | |
24 } | 41 } |
25 | 42 |
26 gfx::GLImage* ImageManager::LookupImage(int32 service_id) { | 43 gfx::GLImage* ImageManager::LookupImage(int32 service_id) { |
27 GLImageMap::const_iterator iter = images_.find(service_id); | 44 GLImageMap::const_iterator iter = images_.find(service_id); |
28 if (iter != images_.end()) | 45 if (iter != images_.end()) |
29 return iter->second.get(); | 46 return iter->second.get(); |
30 | 47 |
31 return NULL; | 48 return NULL; |
32 } | 49 } |
33 | 50 |
34 } // namespace gles2 | 51 } // namespace gles2 |
35 } // namespace gpu | 52 } // namespace gpu |
OLD | NEW |