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

Commit 3410a85b authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Disable EGL hibernation due to jank" into jb-dev

parents 23789ae9 201f3b2d

opengl/libs/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 
LOCAL_CFLAGS += -fvisibility=hidden

LOCAL_CFLAGS += -DEGL_TRACE=1



ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true)

  LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION

endif



ifeq ($(TARGET_BOARD_PLATFORM),msm7k)

LOCAL_CFLAGS += -DADRENO130=1

endif

opengl/libs/EGL/egl_display.cpp

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ void egl_display_t::HibernationMachine::decWakeCount(WakeRefStrength strength) { 
    if (mWakeCount == 0 && CC_UNLIKELY(mAttemptHibernation)) {

        egl_connection_t* const cnx = &gEGLImpl;

        mAttemptHibernation = false;

        if (mDpyValid &&

        if (mAllowHibernation && mDpyValid &&

                cnx->egl.eglHibernateProcessIMG &&

                cnx->egl.eglAwakenProcessIMG) {

            ALOGV("Hibernating\n");

opengl/libs/EGL/egl_display.h

+12 −6
Original line number Diff line number Diff line
@@ -155,7 +155,12 @@ private: 
        };



        HibernationMachine(): mWakeCount(0), mHibernating(false),

                mAttemptHibernation(false), mDpyValid(false)

                mAttemptHibernation(false), mDpyValid(false),

#if BOARD_ALLOW_EGL_HIBERNATION

                mAllowHibernation(true)

#else

                mAllowHibernation(false)

#endif

        {}

        ~HibernationMachine() {}
@@ -170,6 +175,7 @@ private: 
        bool       mHibernating;

        bool       mAttemptHibernation;

        bool       mDpyValid;

        const bool mAllowHibernation;

    };

    HibernationMachine mHibernation;

};