summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-10 22:41:58 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-10 22:41:58 +0000
commita19fd88e26b76a970649ff76c27076b5a64bd91c (patch)
treed1d12933449bc0b554941edd8e0e56f4f1b2db02 /webkit
parent1d753141e20ccf7b223fd750594327f77a084a1f (diff)
downloadchromium_src-a19fd88e26b76a970649ff76c27076b5a64bd91c.zip
chromium_src-a19fd88e26b76a970649ff76c27076b5a64bd91c.tar.gz
chromium_src-a19fd88e26b76a970649ff76c27076b5a64bd91c.tar.bz2
Delete copy_texture_to_parent_texture from GPU command buffer code.
Because we aren't using it for anything anymore. Review URL: http://codereview.chromium.org/7538008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc9
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.cc24
2 files changed, 3 insertions, 30 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 661003b..fc068f4 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -917,9 +917,7 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::unmapTexSubImage2DCHROMIUM(
void WebGraphicsContext3DInProcessCommandBufferImpl::
copyTextureToParentTextureCHROMIUM(WebGLId texture, WebGLId parentTexture) {
- // TODO(gmam): See if we can comment this in.
- // ClearContext();
- copyTextureToCompositor(texture, parentTexture);
+ NOTIMPLEMENTED();
}
void WebGraphicsContext3DInProcessCommandBufferImpl::
@@ -1610,10 +1608,7 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::deleteTexture(
void WebGraphicsContext3DInProcessCommandBufferImpl::copyTextureToCompositor(
WebGLId texture, WebGLId parentTexture) {
- // TODO(gmam): See if we can comment this in.
- // ClearContext();
- gl_->CopyTextureToParentTextureCHROMIUM(texture, parentTexture);
- gl_->Flush();
+ NOTIMPLEMENTED();
}
void WebGraphicsContext3DInProcessCommandBufferImpl::OnSwapBuffersComplete() {
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index 9bcea10..23bcb2a 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -681,29 +681,7 @@ void WebGraphicsContext3DInProcessImpl::unmapTexSubImage2DCHROMIUM(
void WebGraphicsContext3DInProcessImpl::copyTextureToParentTextureCHROMIUM(
WebGLId id, WebGLId id2) {
- if (!glGetTexLevelParameteriv)
- return;
-
- makeContextCurrent();
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, copy_texture_to_parent_texture_fbo_);
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_TEXTURE_2D,
- id,
- 0); // level
- glBindTexture(GL_TEXTURE_2D, id2);
- GLsizei width, height;
- glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
- glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
- glCopyTexImage2D(GL_TEXTURE_2D,
- 0, // level
- GL_RGBA,
- 0, 0, // x, y
- width,
- height,
- 0); // border
- glBindTexture(GL_TEXTURE_2D, bound_texture_);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, bound_fbo_);
+ NOTIMPLEMENTED();
}
WebString WebGraphicsContext3DInProcessImpl::