Optimized Texture::Update() function.

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 258 matching lines @@
     return min_filter_ != GL_NEAREST && min_filter_ != GL_LINEAR;
   }
 
   // True if this texture meets all the GLES2 criteria for rendering.
   // See section 3.8.2 of the GLES2 spec.
   bool CanRender(const FeatureInfo* feature_info) const;
 
   // Returns true if mipmaps can be generated by GL.
   bool CanGenerateMipmaps(const FeatureInfo* feature_info) const;
 
+  // Returns true if any of the texture dimensions are not a power of two.
+  static bool TextureIsNPOT(GLsizei width, GLsizei height, GLsizei depth);
+
+  // Returns true if texture face is complete relative to the first face.
+  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,
+                                 GLenum target,
+                                 GLint level,
+                                 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
   //           GL_TEXTURE_EXTERNAL_OES or GL_TEXTURE_RECTANGLE_ARB
   //   max_levels: The maximum levels this type of target can have.
   void SetTarget(
       const FeatureInfo* feature_info, GLenum target, GLint max_levels);
 
   // Update info about this texture.
   void Update(const FeatureInfo* feature_info);
@@ skipping 33 matching lines @@
 
   // Increment the framebuffer state change count in all the managers
   // referencing this texture.
   void IncAllFramebufferStateChangeCount();
 
   MailboxManager* mailbox_manager_;
 
   // Info about each face and level of texture.
   std::vector<std::vector<LevelInfo> > level_infos_;
 
+  // Number of mip levels for each level.
+  std::vector<GLsizei> num_mip_levels_;

[vmiura, 2014/10/07 00:13:03]

Is this number of mip levels for each face?

If so I think it would be nice to add a FaceInfo struct and move level infos to
there.

struct FaceInfo {
  std::vector<LevelInfo> level_infos;
  GLsizei num_mip_levels_;
};

[David Yen, 2014/10/09 20:20:16]

Done.

+
   // 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
   // one of refs_.
   TextureRef* memory_tracking_ref_;
 
   // The id of the texure
   GLuint service_id_;
 
   // Whether all renderable mips of this texture have been cleared.
   bool cleared_;
 
   int num_uncleared_mips_;
+  int num_npot_faces_;
+  int num_complete_faces_;
+  int num_incomplete_mips_;
 
   // The target. 0 if unset, otherwise GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP.
   GLenum target_;
 
   // Texture parameters.
   GLenum min_filter_;
   GLenum mag_filter_;
   GLenum wrap_s_;
   GLenum wrap_t_;
   GLenum usage_;
@@ skipping 467 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_