aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-17 19:29:51 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-04-17 19:29:51 +0000
commitb72f203fc41a2cc65d009114e60480214084db7e (patch)
tree8dc2954ae80aaf186fda26c0386fe92e90f83d73
parentf11508d7f4aae52739b9c4f3bb2da2fd78fa23d9 (diff)
Fix reset of scissor state in onResetContext
Review URL: http://codereview.appspot.com/6061046/ git-svn-id: http://skia.googlecode.com/svn/trunk@3709 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/gpu/gl/GrGpuGL.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index a17f7d7446..09ddab3b16 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -516,6 +516,8 @@ void GrGpuGL::onResetContext() {
}
fHWBounds.fScissorRect.invalidate();
+ // set to true to force disableScissor to make a GL call.
+ fHWBounds.fScissorEnabled = true;
this->disableScissor();
fHWBounds.fViewportRect.invalidate();
@@ -1344,7 +1346,6 @@ void GrGpuGL::disableScissor() {
if (fHWBounds.fScissorEnabled) {
GL_CALL(Disable(GR_GL_SCISSOR_TEST));
fHWBounds.fScissorEnabled = false;
-// fHWBounds.fScissorRect.invalidate();
}
}