diff options
author | Chris Craik <ccraik@google.com> | 2012-11-29 14:32:45 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 14:32:45 -0800 |
commit | c4aa38a1e38ff65460e98b4768fc76022a66621a (patch) | |
tree | a51f64d4765c6d5f6e010f03661b3725a0501d66 /libs | |
parent | 70a649ca510704ccee5c6795803b3ab56082dad4 (diff) | |
parent | c0da873ee25e1e67fd0454ebc2473a5c3cac002c (diff) | |
download | frameworks_base-c4aa38a1e38ff65460e98b4768fc76022a66621a.zip frameworks_base-c4aa38a1e38ff65460e98b4768fc76022a66621a.tar.gz frameworks_base-c4aa38a1e38ff65460e98b4768fc76022a66621a.tar.bz2 |
am c0da873e: am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
* commit 'c0da873ee25e1e67fd0454ebc2473a5c3cac002c':
Use the same interrupt/resume logic for all functor calls
Diffstat (limited to 'libs')
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 6787705..bc30738 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -339,6 +339,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) { size_t count = mFunctors.size(); if (count > 0) { + interrupt(); SortedVector<Functor*> functors(mFunctors); mFunctors.clear(); @@ -365,10 +366,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) { mFunctors.add(f); } } - // protect against functors binding to other buffers - mCaches.unbindMeshBuffer(); - mCaches.unbindIndicesBuffer(); - mCaches.activeTexture(0); + resume(); } return result; |