Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

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 21 matching lines @@
 class FramebufferManager;
 class MailboxManager;
 class TextureManager;
 class TextureRef;
 
 // Info about Textures currently in the system.
 // This class wraps a real GL texture, keeping track of its meta-data. It is
 // jointly owned by possibly multiple TextureRef.
 class GPU_EXPORT Texture {
  public:
+  enum ImageState { UNBOUND, BOUND, COPIED };
+
   explicit Texture(GLuint service_id);
 
   GLenum min_filter() const {
     return min_filter_;
   }
 
   GLenum mag_filter() const {
     return mag_filter_;
   }
 
@@ skipping 74 matching lines @@
   // does not exist.
   // |depth| is optional and can be nullptr.
   bool GetLevelSize(
       GLint target, GLint level,
       GLsizei* width, GLsizei* height, GLsizei* depth) const;
 
   // Get the type of a level. Returns false if level does not exist.
   bool GetLevelType(
       GLint target, GLint level, GLenum* type, GLenum* internal_format) const;
 
-  // Get the image bound to a particular level. Returns NULL if level
+  // Set the image for a particular level.
+  void SetLevelImage(GLenum target,
+                     GLint level,
+                     gfx::GLImage* image,
+                     ImageState state);
+
+  // Get the image associated with a particular level. Returns NULL if level
   // does not exist.
-  gfx::GLImage* GetLevelImage(GLint target, GLint level) const;
+  gfx::GLImage* GetLevelImage(GLint target,

[Daniele Castagna, 2015/10/14 18:40:36]

nit: Maybe overload this without the state parameter since it's called in so
many places with it set to nullptr.

[reveman, 2015/10/14 19:28:01]

Done.

+                              GLint level,
+                              ImageState* state) const;
 
   bool HasImages() const {
     return has_images_;
   }
 
   // Returns true of the given dimensions are inside the dimensions of the
   // level.
   bool ValidForTexture(
       GLint target,
       GLint level,
@@ skipping 37 matching lines @@
   bool IsLevelCleared(GLenum target, GLint level) const;
 
   // Whether the texture has been defined
   bool IsDefined() const {
     return estimated_size() > 0;
   }
 
   // Initialize TEXTURE_MAX_ANISOTROPY to 1 if we haven't done so yet.
   void InitTextureMaxAnisotropyIfNeeded(GLenum target);
 
-  void OnWillModifyPixels();
-  void OnDidModifyPixels();
-
   void DumpLevelMemory(base::trace_event::ProcessMemoryDump* pmd,
                        uint64_t client_tracing_id,
                        const std::string& dump_name) const;
 
  private:
   friend class MailboxManagerImpl;
   friend class MailboxManagerSync;
   friend class MailboxManagerTest;
   friend class TextureDefinition;
   friend class TextureManager;
@@ skipping 26 matching lines @@
     GLenum target;
     GLint level;
     GLenum internal_format;
     GLsizei width;
     GLsizei height;
     GLsizei depth;
     GLint border;
     GLenum format;
     GLenum type;
     scoped_refptr<gfx::GLImage> image;
+    ImageState image_state;
     uint32 estimated_size;
   };
 
   struct FaceInfo {
     FaceInfo();
     ~FaceInfo();
 
     GLsizei num_mip_levels;
     std::vector<LevelInfo> level_infos;
   };
@@ skipping 100 matching lines @@
   //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP or
   //           GL_TEXTURE_EXTERNAL_OES or GL_TEXTURE_RECTANGLE_ARB
   //           GL_TEXTURE_2D_ARRAY or GL_TEXTURE_3D (for GLES3)
   //   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);
 
-  // Set the image for a particular level.
-  void SetLevelImage(
-      const FeatureInfo* feature_info,
-      GLenum target,
-      GLint level,
-      gfx::GLImage* image);
-
   // Appends a signature for the given level.
   void AddToSignature(
       const FeatureInfo* feature_info,
       GLenum target, GLint level, std::string* signature) const;
 
   void SetMailboxManager(MailboxManager* mailbox_manager);
 
   // Updates the unsafe textures count in all the managers referencing this
   // texture.
   void UpdateSafeToRenderFrom(bool cleared);
@@ skipping 401 matching lines @@
       default:
         NOTREACHED();
         return 0;
     }
   }
 
   size_t mem_represented() const {
     return memory_type_tracker_->GetMemRepresented();
   }
 
-  void SetLevelImage(
-      TextureRef* ref,
-      GLenum target,
-      GLint level,
-      gfx::GLImage* image);
+  void SetLevelImage(TextureRef* ref,
+                     GLenum target,
+                     GLint level,
+                     gfx::GLImage* image,
+                     Texture::ImageState state);
 
   size_t GetSignatureSize() const;
 
   void AddToSignature(
       TextureRef* ref,
       GLenum target,
       GLint level,
       std::string* signature) const;
 
   void AddObserver(DestructionObserver* observer) {
@@ skipping 150 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_