commit 6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4
author Chet Haase <chet@google.com> Wed Aug 15 14:40:36 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 15 14:40:36 2012 -0700
tree 06fa9b5b26f76397a14d01b17118cf52b249eb8e
parent e9c2f18c8ec9c5a09fce0d48a71bb2ce93ca75c4
parent 8025061c594e5171e1bf370d8fdd77e0e9a02b47

Merge "Restore scissor state correctly" into jb-mr1-dev

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 6639231..849c556 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -250,6 +250,7 @@
     glViewport(0, 0, snapshot->viewport.getWidth(), snapshot->viewport.getHeight());
     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
+    mCaches.scissorEnabled = glIsEnabled(GL_SCISSOR_TEST);
     mCaches.enableScissor();
     mCaches.resetScissor();
     dirtyClip();