diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-22 13:13:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-22 13:13:17 -0700 |
| commit | 1ff2c7fe91f25b85478e71f19a4528fc5fde00ba (patch) | |
| tree | b00271280c626ceffa14e3596d6f40ac1549f107 | |
| parent | fd2e67cfbfe27352b253212331a32b5be9d1bd67 (diff) | |
| parent | 12fd5db435043681371ca7e9694744d71b6ba271 (diff) | |
| download | frameworks_base-1ff2c7fe91f25b85478e71f19a4528fc5fde00ba.zip frameworks_base-1ff2c7fe91f25b85478e71f19a4528fc5fde00ba.tar.gz frameworks_base-1ff2c7fe91f25b85478e71f19a4528fc5fde00ba.tar.bz2 | |
am 12fd5db4: Merge "Don\'t clear the functor at every draw" into jb-dev
* commit '12fd5db435043681371ca7e9694744d71b6ba271':
Don't clear the functor at every draw
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 50f5d57..766a199 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -170,7 +170,6 @@ void OpenGLRenderer::prepare(bool opaque) { void OpenGLRenderer::prepareDirty(float left, float top, float right, float bottom, bool opaque) { mCaches.clearGarbage(); - mFunctors.clear(); mSnapshot = new Snapshot(mFirstSnapshot, SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag); @@ -303,6 +302,8 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) { status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) { interrupt(); + detachFunctor(functor); + if (mDirtyClip) { setScissorFromClip(); } |