summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 20:43:05 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 20:43:05 +0000
commitfe87166fa7a39facee4015d74dae13dec7c14827 (patch)
tree3ad3644819111ef89656379e66a5951cacc1c191 /gpu
parent74543ad3c5d278fab5c7278f7d2b27aaf4a9afc5 (diff)
downloadchromium_src-fe87166fa7a39facee4015d74dae13dec7c14827.zip
chromium_src-fe87166fa7a39facee4015d74dae13dec7c14827.tar.gz
chromium_src-fe87166fa7a39facee4015d74dae13dec7c14827.tar.bz2
Release current context before destroying, so that it properly releases its resources
BUG=chromium-os:85082 TEST=see bug Review URL: http://codereview.chromium.org/7182003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 7a81586..28d6557 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2621,8 +2621,10 @@ void GLES2DecoderImpl::Destroy() {
offscreen_saved_color_texture_->Invalidate();
}
- if (context_.get())
+ if (context_.get()) {
+ context_->ReleaseCurrent(NULL);
context_->Destroy();
+ }
context_ = NULL;
offscreen_target_frame_buffer_.reset();