diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 04:27:19 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 04:27:19 +0000 |
| commit | f024f7900b966402d73c9516a9b7e6fe7e98684c (patch) | |
| tree | fae561da12e5cbab2df4412c35bd6b75a0a18a06 /gpu | |
| parent | 30cb7a44b47b8ec5ef9607ef65dcd6aead29bbe9 (diff) | |
| download | chromium_src-f024f7900b966402d73c9516a9b7e6fe7e98684c.zip chromium_src-f024f7900b966402d73c9516a9b7e6fe7e98684c.tar.gz chromium_src-f024f7900b966402d73c9516a9b7e6fe7e98684c.tar.bz2 | |
Mac: Some clang appeasing.
BUG=TEST=none
Review URL: http://codereview.chromium.org/3089004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/program_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc index d9ad80e..7210bdb 100644 --- a/gpu/command_buffer/service/program_manager.cc +++ b/gpu/command_buffer/service/program_manager.cc @@ -204,7 +204,8 @@ const ProgramManager::ProgramInfo::UniformInfo* UniformInfo& info = uniform_infos_.back(); info.element_locations.resize(size); info.element_locations[0] = location; - size_t num_texture_units = info.IsSampler() ? size : 0u; + DCHECK_GE(size, 0); + size_t num_texture_units = info.IsSampler() ? static_cast<size_t>(size) : 0u; info.texture_units.clear(); info.texture_units.resize(num_texture_units, 0); |