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

Unified Diff: cc/gl_renderer.cc

Issue 11378004: Remove DirectRenderer::disableScissorTest, always leave GL_SCISSOR_TEST enabled in GlRenderer (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 | « cc/gl_renderer.h ('k') | cc/software_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/gl_renderer.cc
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 241bcfe246709b8d72ae27e9233dd55eaab4ac8e..882e9e6b94689f715ed8f5971f56bd5b508ce575 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -239,6 +239,7 @@ void GLRenderer::beginDrawingFrame(DrawingFrame& frame)
GLC(m_context, m_context->disable(GL_DEPTH_TEST));
GLC(m_context, m_context->disable(GL_CULL_FACE));
+ GLC(m_context, m_context->enable(GL_SCISSOR_TEST));
GLC(m_context, m_context->colorMask(true, true, true, true));
GLC(m_context, m_context->enable(GL_BLEND));
GLC(m_context, m_context->blendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
@@ -1022,7 +1023,6 @@ void GLRenderer::finishDrawingFrame(DrawingFrame& frame)
m_currentFramebufferLock.reset();
m_swapBufferRect.Union(gfx::ToEnclosingRect(frame.rootDamageRect));
- GLC(m_context, m_context->disable(GL_SCISSOR_TEST));
GLC(m_context, m_context->disable(GL_BLEND));
}
@@ -1352,15 +1352,9 @@ bool GLRenderer::bindFramebufferToTexture(DrawingFrame& frame, const ScopedTextu
void GLRenderer::enableScissorTestRect(const gfx::Rect& scissorRect)
danakj 2012/11/08 02:56:01 should this rename to setScissorTestRect then?
{
- GLC(m_context, m_context->enable(GL_SCISSOR_TEST));
GLC(m_context, m_context->scissor(scissorRect.x(), scissorRect.y(), scissorRect.width(), scissorRect.height()));
}
-void GLRenderer::disableScissorTest()
-{
- GLC(m_context, m_context->disable(GL_SCISSOR_TEST));
-}
-
void GLRenderer::setDrawViewportSize(const gfx::Size& viewportSize)
{
GLC(m_context, m_context->viewport(0, 0, viewportSize.width(), viewportSize.height()));
« no previous file with comments | « cc/gl_renderer.h ('k') | cc/software_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698