Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

Issue 2639973002: Add target argument to Copy{Sub}TextureCHROMIUM entry point (Closed)
Patch Set: use dest_target instead of target Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
index 713c351f8cd66290fb73679d89f8dacea603abf7..f2130968515128a6ede4f3694133ea4b1cbdfa1c 100644
--- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
@@ -355,9 +355,11 @@ bool DrawingBuffer::finishPrepareTextureMailboxGpu(
// If we can't discard the backbuffer, create (or recycle) a buffer to put
// in the mailbox, and copy backbuffer's contents there.
colorBufferForMailbox = createOrRecycleColorBuffer();
- m_gl->CopySubTextureCHROMIUM(
- m_backColorBuffer->textureId, 0, colorBufferForMailbox->textureId, 0, 0,
- 0, 0, 0, m_size.width(), m_size.height(), GL_FALSE, GL_FALSE, GL_FALSE);
+ m_gl->CopySubTextureCHROMIUM(m_backColorBuffer->textureId, 0,
+ colorBufferForMailbox->parameters.target,
+ colorBufferForMailbox->textureId, 0, 0, 0, 0,
+ 0, m_size.width(), m_size.height(), GL_FALSE,
+ GL_FALSE, GL_FALSE);
}
// Put colorBufferForMailbox into its mailbox, and populate its
@@ -730,7 +732,7 @@ bool DrawingBuffer::copyToPlatformTexture(gpu::gles2::GLES2Interface* gl,
unpackPremultiplyAlphaNeeded = GL_TRUE;
gl->CopySubTextureCHROMIUM(
- sourceTexture, 0, texture, 0, destTextureOffset.x(),
+ sourceTexture, 0, GL_TEXTURE_2D, texture, 0, destTextureOffset.x(),
destTextureOffset.y(), sourceSubRectangle.x(), sourceSubRectangle.y(),
sourceSubRectangle.width(), sourceSubRectangle.height(), flipY,
unpackPremultiplyAlphaNeeded, unpackUnpremultiplyAlphaNeeded);

Powered by Google App Engine
This is Rietveld 408576698