summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoryongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 09:46:31 +0000
committeryongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 09:46:31 +0000
commit1b6d130700ac7b9250c034ef497675b2c6d4fee2 (patch)
treee1d0c0dc47680835f2b6917c8d8825067bf4a8f1 /gpu
parentb1e270b5b771f615ad74c91b2f98007d42a29a91 (diff)
downloadchromium_src-1b6d130700ac7b9250c034ef497675b2c6d4fee2.zip
chromium_src-1b6d130700ac7b9250c034ef497675b2c6d4fee2.tar.gz
chromium_src-1b6d130700ac7b9250c034ef497675b2c6d4fee2.tar.bz2
Fix the DCHECK problem for TextureManager::TextureInfo::SetTarget
It's because GLES2DecoderImpl::HandleDestroyStreamTextureCHROMIUM can clear the target of a streamtexture which is not zero. It occurs when destorying a html5 video on Android platform because it will create/destroy streamtextures. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/11421148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 2ec1e96..06dea03 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -8742,7 +8742,6 @@ error::Error GLES2DecoderImpl::HandleDestroyStreamTextureCHROMIUM(
stream_texture_manager_->DestroyStreamTexture(info->service_id());
info->SetStreamTexture(false);
- texture_manager()->SetInfoTarget(info, 0);
} else {
SetGLError(GL_INVALID_VALUE,
"glDestroyStreamTextureCHROMIUM", "bad texture id.");