gpu: If not cube complete, the texture isn't renderable, no matter mipmap complete.

gpu/command_buffer/service/texture_manager.cc

 // Copyright (c) 2012 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.
 
 #include "gpu/command_buffer/service/texture_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 425 matching lines @@
         first_face.height == 0 ||
         first_face.depth == 0) {
       return CAN_RENDER_NEVER;
     }
   }
 
   bool needs_mips = NeedsMips();
   if (needs_mips) {
     if (!texture_complete())
       return CAN_RENDER_NEVER;
-    if (target_ == GL_TEXTURE_CUBE_MAP && !cube_complete())
-      return CAN_RENDER_NEVER;
   }
 
+  if (target_ == GL_TEXTURE_CUBE_MAP && !cube_complete())
+    return CAN_RENDER_NEVER;

[dshwang, 2015/08/18 07:18:16]

I change the CL's goal. Texture::GetCanRenderCondition() is wrong about cube
complete. This fixes it.

Without this change, the unittest TextureTest.POTCubeMapWithoutMipmap fails as
follows;

[ RUN      ] TextureTest.POTCubeMapWithoutMipmap
../../gpu/command_buffer/service/texture_manager_unittest.cc:864: Failure
Value of: manager_->CanRender(texture_ref_.get())
  Actual: true
Expected: false
../../gpu/command_buffer/service/texture_manager_unittest.cc:865: Failure
Value of: manager_->HaveUnrenderableTextures()
  Actual: false
Expected: true
../../gpu/command_buffer/service/texture_manager_unittest.cc:873: Failure
Value of: manager_->CanRender(texture_ref_.get())
  Actual: true
Expected: false
../../gpu/command_buffer/service/texture_manager_unittest.cc:874: Failure
Value of: manager_->HaveUnrenderableTextures()
  Actual: false
Expected: true
../../gpu/command_buffer/service/texture_manager_unittest.cc:882: Failure
Value of: manager_->CanRender(texture_ref_.get())
  Actual: true
Expected: false
../../gpu/command_buffer/service/texture_manager_unittest.cc:883: Failure
Value of: manager_->HaveUnrenderableTextures()
  Actual: false
Expected: true
../../gpu/command_buffer/service/texture_manager_unittest.cc:890: Failure
Value of: manager_->CanRender(texture_ref_.get())
  Actual: true
Expected: false
../../gpu/command_buffer/service/texture_manager_unittest.cc:892: Failure
Value of: manager_->HaveUnrenderableTextures()
  Actual: false
Expected: true
../../gpu/command_buffer/service/texture_manager_unittest.cc:900: Failure
Value of: manager_->CanRender(texture_ref_.get())
  Actual: true
Expected: false
../../gpu/command_buffer/service/texture_manager_unittest.cc:901: Failure
Value of: manager_->HaveUnrenderableTextures()
  Actual: false
Expected: true
[  FAILED  ] TextureTest.POTCubeMapWithoutMipmap (1 ms)

+
   bool is_npot_compatible = !needs_mips &&
       wrap_s_ == GL_CLAMP_TO_EDGE &&
       wrap_t_ == GL_CLAMP_TO_EDGE;
 
   if (!is_npot_compatible) {
     if (target_ == GL_TEXTURE_RECTANGLE_ARB)
       return CAN_RENDER_NEVER;
     else if (npot())
       return CAN_RENDER_ONLY_IF_NPOT;
   }
@@ skipping 1639 matching lines @@
   // The link to the memory tracking |client_id| is given a higher importance
   // than other refs.
   if (ref == ref->texture()->memory_tracking_ref_)
     importance = 2;
 
   pmd->AddOwnershipEdge(client_guid, service_guid, importance);
 }
 
 }  // namespace gles2
 }  // namespace gpu