summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-08 20:46:37 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-08 20:46:37 +0000
commit03f882aa62d925a6f27e9038f4f7235be55afe02 (patch)
tree4f06e41eb249f8f9f335f292c35f27822221f636 /gpu/command_buffer/service
parentde049e2d0eab6145c2805de17ff838f58c14fdd3 (diff)
downloadchromium_src-03f882aa62d925a6f27e9038f4f7235be55afe02.zip
chromium_src-03f882aa62d925a6f27e9038f4f7235be55afe02.tar.gz
chromium_src-03f882aa62d925a6f27e9038f4f7235be55afe02.tar.bz2
Fixed some bugs that prevented the GPU plugin from shutting down without crashing.
TEST=trybots BUG=none Review URL: http://codereview.chromium.org/529004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index ade16c6..282fb99 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1148,8 +1148,7 @@ GLenum GLES2DecoderImpl::GetGLError() {
// Check the GL error first, then our wrapped error.
GLenum error = glGetError();
if (error == GL_NO_ERROR && error_bits_ != 0) {
- uint32 mask = 1;
- while (mask) {
+ for (uint32 mask = 1; mask != 0; mask = mask << 1) {
if ((error_bits_ & mask) != 0) {
error = GLErrorBitToGLError(mask);
break;