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

Commit 3d4d2159 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "fix functor flag parsing, tweak process delay"

parents 5713c9cf 65924a3e

core/java/android/view/HardwareRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ public abstract class HardwareRenderer { 
        static final int SURFACE_STATE_SUCCESS = 1;

        static final int SURFACE_STATE_UPDATED = 2;



        static final int FUNCTOR_PROCESS_DELAY = 2;

        static final int FUNCTOR_PROCESS_DELAY = 4;



        static EGL10 sEgl;

        static EGLDisplay sEglDisplay;

libs/hwui/OpenGLRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) { 
            Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom);

            dirty.unionWith(localDirty);



            if (result == DrawGlInfo::kStatusInvoke) {

            if (result & DrawGlInfo::kStatusInvoke) {

                mFunctors.push(f);

            }

        }
@@ -300,7 +300,7 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) { 
        Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom);

        dirty.unionWith(localDirty);



        if (result == DrawGlInfo::kStatusInvoke) {

        if (result & DrawGlInfo::kStatusInvoke) {

            mFunctors.push(functor);

        }

    }