Delete copy_texture_to_parent_texture from GPU command buffer code.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2011 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/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 1025 matching lines @@
   void DoVertexAttrib2fv(GLuint index, const GLfloat *v);
   void DoVertexAttrib3fv(GLuint index, const GLfloat *v);
   void DoVertexAttrib4fv(GLuint index, const GLfloat *v);
 
   // Wrapper for glUseProgram
   void DoUseProgram(GLuint program);
 
   // Wrapper for glValidateProgram.
   void DoValidateProgram(GLuint program_client_id);
 
-  void DoCopyTextureToParentTextureCHROMIUM(
-      GLuint client_texture_id, GLuint parent_client_texture_id);
-
   void DoResizeCHROMIUM(GLuint width, GLuint height);
 
   void DoSetSurfaceCHROMIUM(GLint surface_id);
 
   // Gets the number of values that will be returned by glGetXXX. Returns
   // false if pname is unknown.
   bool GetNumValuesReturnedForGLGet(GLenum pname, GLsizei* num_values);
 
   // Gets the GLError through our wrapper.
   GLenum GetGLError();
@@ skipping 226 matching lines @@
   scoped_ptr<FrameBuffer> offscreen_target_frame_buffer_;
   scoped_ptr<Texture> offscreen_target_color_texture_;
   scoped_ptr<RenderBuffer> offscreen_target_color_render_buffer_;
   scoped_ptr<RenderBuffer> offscreen_target_depth_render_buffer_;
   scoped_ptr<RenderBuffer> offscreen_target_stencil_render_buffer_;
   GLenum offscreen_target_color_format_;
   GLenum offscreen_target_depth_format_;
   GLenum offscreen_target_stencil_format_;
   GLsizei offscreen_target_samples_;
 
-  GLuint copy_texture_to_parent_texture_fb_;
-
   // The copy that is saved when SwapBuffers is called.  It is also
   // used as the destination for multi-sample resolves.
   scoped_ptr<FrameBuffer> offscreen_saved_frame_buffer_;
   scoped_ptr<Texture> offscreen_saved_color_texture_;
   GLenum offscreen_saved_color_format_;
 
   scoped_ptr<Callback1<gfx::Size>::Type> resize_callback_;
   scoped_ptr<Callback0::Type> swap_buffers_callback_;
 
   // The format of the back buffer_
@@ skipping 346 matching lines @@
       clear_depth_(1.0f),
       mask_depth_(true),
       enable_scissor_test_(false),
       enable_depth_test_(false),
       enable_stencil_test_(false),
       state_dirty_(true),
       offscreen_target_color_format_(0),
       offscreen_target_depth_format_(0),
       offscreen_target_stencil_format_(0),
       offscreen_target_samples_(0),
-      copy_texture_to_parent_texture_fb_(0),
       offscreen_saved_color_format_(0),
       back_buffer_color_format_(0),
       back_buffer_has_depth_(false),
       back_buffer_has_stencil_(false),
       teximage2d_faster_than_texsubimage2d_(true),
       bufferdata_faster_than_buffersubdata_(true),
       current_decoder_error_(error::kNoError),
       use_shader_translator_(true),
       validators_(group_->feature_info()->validators()),
       feature_info_(group_->feature_info()),
@@ skipping 231 matching lines @@
     pending_offscreen_size_ = size;
     if (!UpdateOffscreenFrameBufferSize()) {
       LOG(ERROR) << "Could not allocate offscreen buffer storage.";
       Destroy();
       return false;
     }
 
     // Bind to the new default frame buffer (the offscreen target frame buffer).
     // This should now be associated with ID zero.
     DoBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-    glGenFramebuffersEXT(1, &copy_texture_to_parent_texture_fb_);
   }
 
   // OpenGL ES 2.0 implicitly enables the desktop GL capability
   // VERTEX_PROGRAM_POINT_SIZE and doesn't expose this enum. This fact
   // isn't well documented; it was discovered in the Khronos OpenGL ES
   // mailing list archives. It also implicitly enables the desktop GL
   // capability GL_POINT_SPRITE to provide access to the gl_PointCoord
   // variable in fragment shaders.
   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
     glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
@@ skipping 494 matching lines @@
       current_program_ = NULL;
     }
 
     if (attrib_0_buffer_id_) {
       glDeleteBuffersARB(1, &attrib_0_buffer_id_);
     }
     if (fixed_attrib_buffer_id_) {
       glDeleteBuffersARB(1, &fixed_attrib_buffer_id_);
     }
 
-    if (copy_texture_to_parent_texture_fb_)
-      glDeleteFramebuffersEXT(1, &copy_texture_to_parent_texture_fb_);
-
     if (offscreen_target_frame_buffer_.get())
       offscreen_target_frame_buffer_->Destroy();
     if (offscreen_target_color_texture_.get())
       offscreen_target_color_texture_->Destroy();
     if (offscreen_target_color_render_buffer_.get())
       offscreen_target_color_render_buffer_->Destroy();
     if (offscreen_target_depth_render_buffer_.get())
       offscreen_target_depth_render_buffer_->Destroy();
     if (offscreen_target_stencil_render_buffer_.get())
       offscreen_target_stencil_render_buffer_->Destroy();
@@ skipping 114 matching lines @@
   return true;
 }
 
 void GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
   // We can't resize the render buffers immediately because there might be a
   // partial frame rendered into them and we don't want the tail end of that
   // rendered into the reallocated storage. Defer until the next SwapBuffers.
   pending_offscreen_size_ = size;
 }
 
-void GLES2DecoderImpl::DoCopyTextureToParentTextureCHROMIUM(
-    GLuint client_texture_id,
-    GLuint parent_client_texture_id) {
-  if (parent_) {
-    TextureManager::TextureInfo* texture = texture_manager()->GetTextureInfo(
-        client_texture_id);
-    TextureManager::TextureInfo* parent_texture =
-        parent_->texture_manager()->GetTextureInfo(parent_client_texture_id);
-    if (!texture || !parent_texture) {
-      current_decoder_error_ = error::kInvalidArguments;
-      return;
-    }
-    ScopedFrameBufferBinder fb_binder(this, copy_texture_to_parent_texture_fb_);
-    glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
-                              GL_COLOR_ATTACHMENT0,
-                              GL_TEXTURE_2D,
-                              texture->service_id(),
-                              0);
-    ScopedTexture2DBinder tex_binder(this, parent_texture->service_id());
-    GLsizei width, height;
-    parent_texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height);
-    glCopyTexImage2D(GL_TEXTURE_2D,
-                     0,  // level
-                     GL_RGBA,
-                     0, 0,  // x, y
-                     width,
-                     height,
-                     0);  // border
-  }
-}
-
 void GLES2DecoderImpl::DoResizeCHROMIUM(GLuint width, GLuint height) {
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(TOUCH_UI)
   // Make sure that we are done drawing to the back buffer before resizing.
   glFinish();
 #endif
   if (resize_callback_.get()) {
     gfx::Size size(width, height);
     resize_callback_->Run(size);
   }
 }
@@ skipping 4225 matching lines @@
   return false;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu