diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 02:20:56 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 02:20:56 +0000 |
| commit | 21bd81995a2dbeb92833ee6b55612ec30ce6122f (patch) | |
| tree | 7b7af872213ea42935b77d33a3a798f807ab8ed2 /gpu/command_buffer | |
| parent | a9de3d34b4eee06c5539ec43e7843f38fd7ac12c (diff) | |
| download | chromium_src-21bd81995a2dbeb92833ee6b55612ec30ce6122f.zip chromium_src-21bd81995a2dbeb92833ee6b55612ec30ce6122f.tar.gz chromium_src-21bd81995a2dbeb92833ee6b55612ec30ce6122f.tar.bz2 | |
Fixed off-by-one bug in returned name length in glGetActiveAttrib and
glGetActiveUniform.
BUG=none
TEST=ran o3d-webgl tests
Review URL: http://codereview.chromium.org/1748014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 2536af5..7ab7c0a 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -937,7 +937,8 @@ void GLES2Implementation::GetActiveAttrib( std::vector<int8> str; GetBucketContents(kResultBucketId, &str); GLsizei max_size = std::min(static_cast<size_t>(bufsize) - 1, - str.size()); + std::max(static_cast<size_t>(0), + str.size() - 1)); if (length) { *length = max_size; } @@ -976,7 +977,8 @@ void GLES2Implementation::GetActiveUniform( std::vector<int8> str; GetBucketContents(kResultBucketId, &str); GLsizei max_size = std::min(static_cast<size_t>(bufsize) - 1, - str.size()); + std::max(static_cast<size_t>(0), + str.size() - 1)); if (length) { *length = max_size; } |