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

gpu/command_buffer/service/texture_definition.cc

 // Copyright 2014 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_definition.h"
 
 #include <list>
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 18 matching lines @@
  public:
   explicit GLImageSync(const scoped_refptr<NativeImageBuffer>& buffer,
                        const gfx::Size& size);
 
   // Implement GLImage.
   void Destroy(bool have_context) override;
   gfx::Size GetSize() override;
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override;
+  bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
                        const gfx::Point& offset,
                        const gfx::Rect& rect) override;
-  void WillUseTexImage() override;
-  void WillModifyTexImage() override;
-  void DidModifyTexImage() override;
-  void DidUseTexImage() override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             gfx::OverlayTransform transform,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
 
  protected:
@@ skipping 31 matching lines @@
 
 bool GLImageSync::BindTexImage(unsigned target) {
   NOTREACHED();
   return false;
 }
 
 void GLImageSync::ReleaseTexImage(unsigned target) {
   NOTREACHED();
 }
 
+bool GLImageSync::CopyTexImage(unsigned target) {
+  return false;
+}
+
 bool GLImageSync::CopyTexSubImage(unsigned target,
                                   const gfx::Point& offset,
                                   const gfx::Rect& rect) {
   return false;
 }
 
-void GLImageSync::WillUseTexImage() {
-}
-
-void GLImageSync::DidUseTexImage() {
-}
-
-void GLImageSync::WillModifyTexImage() {
-}
-
-void GLImageSync::DidModifyTexImage() {
-}
-
 bool GLImageSync::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                        int z_order,
                                        gfx::OverlayTransform transform,
                                        const gfx::Rect& bounds_rect,
                                        const gfx::RectF& crop_rect) {
   NOTREACHED();
   return false;
 }
 
 void GLImageSync::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
@@ skipping 225 matching lines @@
     image_buffer_ = NativeImageBuffer::Create(texture->service_id());
     DCHECK(image_buffer_.get());
   }
 
   const Texture::FaceInfo& first_face = texture->face_infos_[0];
   if (image_buffer_.get()) {
     scoped_refptr<gfx::GLImage> gl_image(
         new GLImageSync(image_buffer_,
                         gfx::Size(first_face.level_infos[0].width,
                                   first_face.level_infos[0].height)));
-    texture->SetLevelImage(NULL, target_, 0, gl_image.get());
+    texture->SetLevelImage(target_, 0, gl_image.get(), Texture::BOUND);
   }
 
   const Texture::LevelInfo& level = first_face.level_infos[0];
   level_info_ = LevelInfo(level.target, level.internal_format, level.width,
                           level.height, level.depth, level.border, level.format,
                           level.type, level.cleared_rect);
 }
 
 TextureDefinition::~TextureDefinition() {
 }
 
 Texture* TextureDefinition::CreateTexture() const {
   GLuint texture_id;
   glGenTextures(1, &texture_id);
 
   Texture* texture(new Texture(texture_id));
   UpdateTextureInternal(texture);
 
   return texture;
 }
 
 void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
   gfx::ScopedTextureBinder texture_binder(target_, texture->service_id());
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t_);
 
   if (image_buffer_.get()) {
-    gfx::GLImage* existing_image = texture->GetLevelImage(target_, 0);
+    gfx::GLImage* existing_image = texture->GetLevelImage(target_, 0, nullptr);
     // Don't need to re-bind if already bound before.
     if (!existing_image || !image_buffer_->IsClient(existing_image)) {
       image_buffer_->BindToTexture(target_);
     }
   }
 
   if (defined_) {
     texture->face_infos_.resize(1);
     texture->face_infos_[0].level_infos.resize(1);
     texture->SetLevelInfo(NULL, level_info_.target, 0,
                           level_info_.internal_format, level_info_.width,
                           level_info_.height, level_info_.depth,
                           level_info_.border, level_info_.format,
                           level_info_.type, level_info_.cleared_rect);
   }
 
   if (image_buffer_.get()) {
     texture->SetLevelImage(
-        NULL,
-        target_,
-        0,
-        new GLImageSync(
-            image_buffer_,
-            gfx::Size(level_info_.width, level_info_.height)));
+        target_, 0,
+        new GLImageSync(image_buffer_,
+                        gfx::Size(level_info_.width, level_info_.height)),
+        Texture::BOUND);
   }
 
   texture->target_ = target_;
   texture->SetImmutable(immutable_);
   texture->min_filter_ = min_filter_;
   texture->mag_filter_ = mag_filter_;
   texture->wrap_s_ = wrap_s_;
   texture->wrap_t_ = wrap_t_;
   texture->usage_ = usage_;
 }
 
 void TextureDefinition::UpdateTexture(Texture* texture) const {
   GLuint old_service_id = 0u;
   if (image_buffer_.get() && g_avoid_egl_target_texture_reuse) {
     GLuint service_id = 0u;
     glGenTextures(1, &service_id);
     old_service_id = texture->service_id();
     texture->SetServiceId(service_id);
 
     DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), target_);
     GLint bound_id = 0;
     glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound_id);
     if (bound_id == static_cast<GLint>(old_service_id)) {
       glBindTexture(target_, service_id);
     }
-    texture->SetLevelImage(NULL, target_, 0, NULL);
+    texture->SetLevelImage(target_, 0, NULL, Texture::UNBOUND);
   }
 
   UpdateTextureInternal(texture);
 
   if (old_service_id) {
     glDeleteTextures(1, &old_service_id);
   }
 }
 
 bool TextureDefinition::Matches(const Texture* texture) const {
   DCHECK(target_ == texture->target());
   if (texture->min_filter_ != min_filter_ ||
       texture->mag_filter_ != mag_filter_ ||
       texture->wrap_s_ != wrap_s_ ||
       texture->wrap_t_ != wrap_t_ ||
       texture->SafeToRenderFrom() != SafeToRenderFrom()) {
     return false;
   }
 
   // Texture became defined.
   if (!image_buffer_.get() && texture->IsDefined())
     return false;
 
   // All structural changes should have orphaned the texture.
-  if (image_buffer_.get() && !texture->GetLevelImage(texture->target(), 0))
+  if (image_buffer_.get() &&
+      !texture->GetLevelImage(texture->target(), 0, nullptr)) {
     return false;
+  }
 
   return true;
 }
 
 bool TextureDefinition::SafeToRenderFrom() const {
   return level_info_.cleared_rect.Contains(
       gfx::Rect(level_info_.width, level_info_.height));
 }
 
 }  // namespace gles2
 }  // namespace gpu