diff options
| author | Chet Haase <chet@google.com> | 2012-08-15 14:40:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-15 14:40:36 -0700 |
| commit | 6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4 (patch) | |
| tree | 06fa9b5b26f76397a14d01b17118cf52b249eb8e | |
| parent | e9c2f18c8ec9c5a09fce0d48a71bb2ce93ca75c4 (diff) | |
| parent | 8025061c594e5171e1bf370d8fdd77e0e9a02b47 (diff) | |
| download | frameworks_base-6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4.zip frameworks_base-6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4.tar.gz frameworks_base-6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4.tar.bz2 | |
Merge "Restore scissor state correctly" into jb-mr1-dev
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ 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(); |