summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 18:06:18 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 18:06:18 +0000
commitc322e88ff85d8e070fde297447144bff21682218 (patch)
treed36785be46bf5099fe86bb8af6b33b99a67bcd4e
parent2e332c80bb9784e43736bf67aaba90c1b94a1a89 (diff)
downloadchromium_src-c322e88ff85d8e070fde297447144bff21682218.zip
chromium_src-c322e88ff85d8e070fde297447144bff21682218.tar.gz
chromium_src-c322e88ff85d8e070fde297447144bff21682218.tar.bz2
Check for null GLES2DecoderImpl::copy_texture_CHROMIUM_
BUG=129211 Review URL: https://chromiumcodereview.appspot.com/10414051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138526 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 3de630b..1c79b39b 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2753,7 +2753,10 @@ void GLES2DecoderImpl::Destroy(bool have_context) {
bound_renderbuffer_ = NULL;
if (have_context) {
- copy_texture_CHROMIUM_->Destroy();
+ if (copy_texture_CHROMIUM_.get()) {
+ copy_texture_CHROMIUM_->Destroy();
+ copy_texture_CHROMIUM_.reset();
+ }
if (current_program_) {
program_manager()->UnuseProgram(shader_manager(), current_program_);