diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:39:17 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:39:17 +0000 |
| commit | 96fba197b33d6d831f5cfd2469202db4b6506557 (patch) | |
| tree | 84987c766b9437b61de2df51e4f3314d525aceaa /gpu/command_buffer/service | |
| parent | e6aa46992d11da1581f65c47e4f4c9bf81a27036 (diff) | |
| download | chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.zip chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.gz chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.bz2 | |
Revert r118240 - gles_2_c_lib as a component.
Broke compile on windows.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall greens up again
Review URL: https://chromiumcodereview.appspot.com/9264003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_autogen.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h index d36f425..5c06a57 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -2546,7 +2546,7 @@ error::Error GLES2DecoderImpl::HandleTexStorage2DEXT( uint32 immediate_data_size, const gles2::TexStorage2DEXT& c) { GLenum target = static_cast<GLenum>(c.target); GLsizei levels = static_cast<GLsizei>(c.levels); - GLenum internalFormat = static_cast<GLenum>(c.internalFormat); + GLint internalFormat = static_cast<GLint>(c.internalFormat); GLsizei width = static_cast<GLsizei>(c.width); GLsizei height = static_cast<GLsizei>(c.height); if (!validators_->texture_target.IsValid(target)) { @@ -2559,7 +2559,8 @@ error::Error GLES2DecoderImpl::HandleTexStorage2DEXT( } if (!validators_->texture_internal_format_storage.IsValid(internalFormat)) { SetGLError( - GL_INVALID_ENUM, "glTexStorage2DEXT: internalFormat GL_INVALID_ENUM"); + GL_INVALID_VALUE, + "glTexStorage2DEXT: internalFormat GL_INVALID_VALUE"); return error::kNoError; } if (width < 0) { |