diff options
| author | John Reck <jreck@google.com> | 2013-09-10 14:05:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-10 14:05:32 -0700 |
| commit | 53760b4a97fb2f88e94da73d647ff80221b3c454 (patch) | |
| tree | 5c5bc6bec53735270df6984dd0fad8533e4f45d8 | |
| parent | 19c727bbc6371924bfd2f85e804b5b6b093a8413 (diff) | |
| parent | 874ae2adf8c24c4b9d68f781239a95ad047e212a (diff) | |
| download | frameworks_base-53760b4a97fb2f88e94da73d647ff80221b3c454.zip frameworks_base-53760b4a97fb2f88e94da73d647ff80221b3c454.tar.gz frameworks_base-53760b4a97fb2f88e94da73d647ff80221b3c454.tar.bz2 | |
am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
* commit '874ae2adf8c24c4b9d68f781239a95ad047e212a':
Fix scissor for functor invocation
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 238d9a4..2066f69 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -471,12 +471,14 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) { info.height = getSnapshot()->height; getSnapshot()->transform->copyTo(&info.transform[0]); + bool dirtyClip = mDirtyClip; // setup GL state for functor if (mDirtyClip) { - setScissorFromClip(); setStencilFromClip(); // can issue draws, so must precede enableScissor()/interrupt() } - mCaches.enableScissor(); + if (mCaches.enableScissor() || dirtyClip) { + setScissorFromClip(); + } interrupt(); // call functor immediately after GL state setup |