diff options
| author | John Reck <jreck@google.com> | 2013-09-10 14:08:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-10 14:08:12 -0700 |
| commit | 2f93af4574fbca9c94679744114ce40496aa69b8 (patch) | |
| tree | 35b0f5031d9de0b37444ef1b35f19155d3075442 /libs | |
| parent | efb6beb4388e51a2e29ec605c500801f7ff150e6 (diff) | |
| parent | 53760b4a97fb2f88e94da73d647ff80221b3c454 (diff) | |
| download | frameworks_base-2f93af4574fbca9c94679744114ce40496aa69b8.zip frameworks_base-2f93af4574fbca9c94679744114ce40496aa69b8.tar.gz frameworks_base-2f93af4574fbca9c94679744114ce40496aa69b8.tar.bz2 | |
am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
* commit '53760b4a97fb2f88e94da73d647ff80221b3c454':
Fix scissor for functor invocation
Diffstat (limited to 'libs')
| -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 dcd8d3e..0c3a81b 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 |