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

* commit '2435f98d91c2760ba94bb7806d24e4c03e8d8fd9':
  Use the same interrupt/resume logic for all functor calls

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;