diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 19:48:14 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 19:48:14 +0000 |
| commit | 8d25d04d29236b6714ea411fdba9fc2180c481d7 (patch) | |
| tree | 47b1ce5d1c54c001186ae69815646430a59e4b57 /gpu | |
| parent | 81d422345780da2adc1a449d0e6ebbafff1bb85f (diff) | |
| download | chromium_src-8d25d04d29236b6714ea411fdba9fc2180c481d7.zip chromium_src-8d25d04d29236b6714ea411fdba9fc2180c481d7.tar.gz chromium_src-8d25d04d29236b6714ea411fdba9fc2180c481d7.tar.bz2 | |
Fixed bug where code in GPU process was trying to lookup a texture by service if rather than client id.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/2858006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 508e0b3..1f4c2e0 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -1856,9 +1856,9 @@ bool GLES2DecoderImpl::UpdateOffscreenFrameBufferSize() { // The reference to the parent is a weak pointer and will become null if the // parent is later destroyed. GLuint service_id = offscreen_saved_color_texture_->id(); - - TextureManager::TextureInfo* info = - parent_->texture_manager()->GetTextureInfo(service_id); + GLuint client_id; + CHECK(parent_->texture_manager()->GetClientId(service_id, &client_id)); + TextureManager::TextureInfo* info = parent_->GetTextureInfo(client_id); DCHECK(info); texture_manager()->SetLevelInfo( |