Fix WebGL 2 texture renderability check.

gpu/command_buffer/service/texture_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
 #include <algorithm>
 #include <list>
 #include <set>
@@ skipping 231 matching lines @@
     GLenum format;
     GLenum type;
     scoped_refptr<gfx::GLImage> image;
     uint32 estimated_size;
   };
 
   struct FaceInfo {
     FaceInfo();
     ~FaceInfo();
 
     GLsizei num_mip_levels;

[piman, 2015/10/22 01:18:36]

nit: can you add a comment indicating that this is relative to base_level? To
avoid confusion with level_infos (which contains slots for all levels starting
at 0).

[Zhenyao Mo, 2015/10/22 01:43:20]

Done.

     std::vector<LevelInfo> level_infos;
   };
 
   // Set the info for a particular level.
   void SetLevelInfo(const FeatureInfo* feature_info,
                     GLenum target,
                     GLint level,
                     GLenum internal_format,
                     GLsizei width,
                     GLsizei height,
@@ skipping 69 matching lines @@
   static bool TextureFaceComplete(const Texture::LevelInfo& first_face,
                                   size_t face_index,
                                   GLenum target,
                                   GLenum internal_format,
                                   GLsizei width,
                                   GLsizei height,
                                   GLsizei depth,
                                   GLenum format,
                                   GLenum type);
 
-  // Returns true if texture mip level is complete relative to first level.
-  static bool TextureMipComplete(const Texture::LevelInfo& level0_face,
+  // Returns true if texture mip level is complete relative to base level.
+  // Note that level_diff = level - base_level.
+  static bool TextureMipComplete(const Texture::LevelInfo& base_level_face,
                                  GLenum target,
-                                 GLint level,
+                                 GLint level_diff,
                                  GLenum internal_format,
                                  GLsizei width,
                                  GLsizei height,
                                  GLsizei depth,
                                  GLenum format,
                                  GLenum type);
 
   // Sets the Texture's target
   // Parameters:
   //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP or
@@ skipping 39 matching lines @@
   void UpdateCanRenderCondition();
 
   // Updates the images count in all the managers referencing this
   // texture.
   void UpdateHasImages();
 
   // Increment the framebuffer state change count in all the managers
   // referencing this texture.
   void IncAllFramebufferStateChangeCount();
 
+  void UpdateBaseLevel(GLint base_level);
+  void UpdateMaxLevel(GLint max_level);
+  void UpdateNumMipLevels();
+
   MailboxManager* mailbox_manager_;
 
   // Info about each face and level of texture.
   std::vector<FaceInfo> face_infos_;
 
   // The texture refs that point to this Texture.
   typedef std::set<TextureRef*> RefSet;
   RefSet refs_;
 
   // The single TextureRef that accounts for memory for this texture. Must be
@@ skipping 543 matching lines @@
  private:
   DecoderTextureState* texture_state_;
   base::TimeTicks begin_time_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_