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

Unified 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: prevent crash when accessing destroyed glimage while doing bind/releaseTexImage. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/image_manager.cc
diff --git a/gpu/command_buffer/service/image_manager.cc b/gpu/command_buffer/service/image_manager.cc
index 953e3bcb5731b3b98bfaeef8d6b7bae11c96d376..3ac86f8c0a799a877923af71dbd78994121955e1 100644
--- a/gpu/command_buffer/service/image_manager.cc
+++ b/gpu/command_buffer/service/image_manager.cc
@@ -15,11 +15,19 @@ ImageManager::ImageManager() {
ImageManager::~ImageManager() {
}
+void ImageManager::Destroy(bool have_context) {
+ for (GLImageMap::const_iterator iter = images_.begin(); iter != images_.end();
+ ++iter)
+ iter->second.get()->Destroy(have_context);
+ images_.clear();
+}
+
void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) {
images_[service_id] = image;
}
void ImageManager::RemoveImage(int32 service_id) {
+ LookupImage(service_id)->Destroy(true);
sohanjg 2014/07/24 13:24:10 Will it be safe to assume we have context while de
reveman 2014/07/24 13:51:55 It's safe to assume that you have a context here.
sohanjg 2014/07/24 15:26:59 Done.
images_.erase(service_id);
}
« 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