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

Commit 184cdc20 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am 3410a85b: Merge "Disable EGL hibernation due to jank" into jb-dev 

* commit '3410a85b':
  Disable EGL hibernation due to jank
parents 44c27a54 3410a85b

opengl/libs/Android.mk

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

LOCAL_CFLAGS += -fvisibility=hidden

LOCAL_CFLAGS += -DEGL_TRACE=1

LOCAL_CFLAGS += -DEGL_TRACE=1





ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true)

  LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION

endif



ifeq ($(TARGET_BOARD_PLATFORM),msm7k)

ifeq ($(TARGET_BOARD_PLATFORM),msm7k)

LOCAL_CFLAGS += -DADRENO130=1

LOCAL_CFLAGS += -DADRENO130=1

endif

endif

opengl/libs/EGL/egl_display.cpp

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

    if (mWakeCount == 0 && CC_UNLIKELY(mAttemptHibernation)) {

        egl_connection_t* const cnx = &gEGLImpl;

        egl_connection_t* const cnx = &gEGLImpl;

        mAttemptHibernation = false;

        mAttemptHibernation = false;

        if (mDpyValid &&

        if (mAllowHibernation && mDpyValid &&

                cnx->egl.eglHibernateProcessIMG &&

                cnx->egl.eglHibernateProcessIMG &&

                cnx->egl.eglAwakenProcessIMG) {

                cnx->egl.eglAwakenProcessIMG) {

            ALOGV("Hibernating\n");

            ALOGV("Hibernating\n");

opengl/libs/EGL/egl_display.h

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

        };





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

        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() {}

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

        bool       mHibernating;

        bool       mAttemptHibernation;

        bool       mAttemptHibernation;

        bool       mDpyValid;

        bool       mDpyValid;

        const bool mAllowHibernation;

    };

    };

    HibernationMachine mHibernation;

    HibernationMachine mHibernation;

};

};