summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/texture_manager.cc14
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;
}
}