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

Unified Diff: cc/texture_copier.cc

Issue 11368152: Disable scissor test during texture copies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « no previous file | cc/texture_copier_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_copier.cc
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index 5320c6587d03094c95d596deb960d7dd764ec221..ddb0f7a549df7dbcb857e0d4de246de22d897492 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -49,6 +49,8 @@ void AcceleratedTextureCopier::copyTexture(Parameters parameters)
{
TRACE_EVENT0("cc", "TextureCopier::copyTexture");
+ GLC(m_context, m_context->disable(GL_SCISSOR_TEST));
+
// Note: this code does not restore the viewport, bound program, 2D texture, framebuffer, buffer or blend enable.
GLC(m_context, m_context->bindFramebuffer(GL_FRAMEBUFFER, m_fbo));
GLC(m_context, m_context->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, parameters.destTexture, 0));
@@ -88,6 +90,8 @@ void AcceleratedTextureCopier::copyTexture(Parameters parameters)
GLC(m_context, m_context->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0));
GLC(m_context, m_context->bindFramebuffer(GL_FRAMEBUFFER, 0));
GLC(m_context, m_context->bindTexture(GL_TEXTURE_2D, 0));
+
+ GLC(m_context, m_context->enable(GL_SCISSOR_TEST));
}
void AcceleratedTextureCopier::flush()
« no previous file with comments | « no previous file | cc/texture_copier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698