diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 23:33:28 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 23:33:28 +0000 |
| commit | 3105e6af0b3c8161e77eb5a71cd9baf8bb545a50 (patch) | |
| tree | 2dcf8dc8d5c32dacf1668712f418e33305ad2ec9 /gpu | |
| parent | 9dd60a42e18aaf6d55f1302f6fe4d40cc6fd942d (diff) | |
| download | chromium_src-3105e6af0b3c8161e77eb5a71cd9baf8bb545a50.zip chromium_src-3105e6af0b3c8161e77eb5a71cd9baf8bb545a50.tar.gz chromium_src-3105e6af0b3c8161e77eb5a71cd9baf8bb545a50.tar.bz2 | |
Fix for build breakage
TEST=none
BUG=none
TBR=apatrick@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/texture_manager.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc index bbafb04..91b3462 100644 --- a/gpu/command_buffer/service/texture_manager.cc +++ b/gpu/command_buffer/service/texture_manager.cc @@ -89,13 +89,13 @@ bool TextureManager::TextureInfo::CanGenerateMipmaps() const { // TODO(gman): Check internal_format, format and type. for (size_t ii = 0; ii < level_infos_.size(); ++ii) { const LevelInfo& info = level_infos_[ii][0]; - if (!info.valid || - info.width != first.width && - info.height != first.height && - info.depth != 1 && - info.format != first.format && - info.internal_format != first.internal_format && - info.type != first.type) { + if ((!info.valid) || + (info.width != first.width) || + (info.height != first.height) || + (info.depth != 1) || + (info.format != first.format) || + (info.internal_format != first.internal_format) || + (info.type != first.type)) { return false; } } |