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

1 files changed, 1 insertions, 0 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 663923197f84..849c5563c4da 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -250,6 +250,7 @@ void OpenGLRenderer::resume() {
     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();