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

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: WIP - review comments addressed. Created 6 years, 7 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 a3ac4350c875fabb11f6e53375bfeef68d158e6f..1e62a9b3f199f48901db72213555a2aee8312c25 100644
--- a/gpu/command_buffer/service/image_manager.cc
+++ b/gpu/command_buffer/service/image_manager.cc
@@ -15,6 +15,14 @@ ImageManager::ImageManager() : release_after_use_(false) {
ImageManager::~ImageManager() {
}
+void ImageManager::Destroy(bool have_context) {
+ for (GLImageMap::const_iterator iter = gl_images_.begin();
+ iter != gl_images_.end();
+ ++iter)
+ iter->second.get()->Destroy(have_context);
+ gl_images_.clear();
+}
+
void ImageManager::RegisterGpuMemoryBuffer(int32 id,
gfx::GpuMemoryBufferHandle buffer,
size_t width,
@@ -44,7 +52,7 @@ void ImageManager::RegisterGpuMemoryBuffer(int32 id,
}
void ImageManager::UnregisterGpuMemoryBuffer(int32 id) {
- RemoveImage(id);
+ // This will be handled as part of ::Destroy.
reveman 2014/06/02 14:59:16 This is not right. If you're not removing and dest
sohanjg 2014/06/02 15:39:10 Done.
sohanjg 2014/06/02 15:39:10 Done.
}
void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) {

Powered by Google App Engine
This is Rietveld 408576698