am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev

* commit 'a9473881eb066b41ea2fb3389b5c0031c2ab4f38':
  Use the same interrupt/resume logic for all functor calls
This commit is contained in:
Chris Craik
2012-11-29 14:26:33 -08:00
committed by Android Git Automerger

View File

@ -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;