Index: gpu/command_buffer/service/gles2_cmd_decoder.cc |
=================================================================== |
--- gpu/command_buffer/service/gles2_cmd_decoder.cc (revision 94743) |
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc (working copy) |
@@ -1043,9 +1043,6 @@ |
// 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); |
@@ -1292,8 +1289,6 @@ |
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_; |
@@ -1660,7 +1655,6 @@ |
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), |
@@ -1912,8 +1906,6 @@ |
// 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, ©_texture_to_parent_texture_fb_); |
} |
// OpenGL ES 2.0 implicitly enables the desktop GL capability |
@@ -2428,9 +2420,6 @@ |
glDeleteBuffersARB(1, &fixed_attrib_buffer_id_); |
} |
- if (copy_texture_to_parent_texture_fb_) |
- glDeleteFramebuffersEXT(1, ©_texture_to_parent_texture_fb_); |
- |
if (offscreen_target_frame_buffer_.get()) |
offscreen_target_frame_buffer_->Destroy(); |
if (offscreen_target_color_texture_.get()) |
@@ -2565,37 +2554,6 @@ |
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. |