Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9473881 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

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

* commit '2435f98d':
  Use the same interrupt/resume logic for all functor calls
parents 224daede 2435f98d

libs/hwui/OpenGLRenderer.cpp

+2 −4
Original line number Diff line number Diff line
@@ -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;