drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 20b9edd805 a9473881eb
commit c0da873ee2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/OpenGLRenderer.cpp
View File

@ -339,6 +339,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
size_t count = mFunctors.size(); size_t count = mFunctors.size();
if (count > 0) { if (count > 0) {
interrupt();
SortedVector<Functor*> functors(mFunctors); SortedVector<Functor*> functors(mFunctors);
mFunctors.clear(); mFunctors.clear();
@ -365,10 +366,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
mFunctors.add(f); mFunctors.add(f);
} }
} }
// protect against functors binding to other buffers resume();
mCaches.unbindMeshBuffer();
mCaches.unbindIndicesBuffer();
mCaches.activeTexture(0);
} }
return result; return result;