ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

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

Browse Source 
* commit '3410a85b15a4d2579b5e77144f275a30ad880a65':
  Disable EGL hibernation due to jank
This commit is contained in:
Jesse Hall 2012-05-04 17:18:11 -07:00 committed by Android Git Automerger
commit 184cdc2000
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opengl/libs/Android.mk
View File

@ -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

2
opengl/libs/EGL/egl_display.cpp
View File

@ -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");

18
opengl/libs/EGL/egl_display.h
View File

@ -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() {}
@ -165,11 +170,12 @@ private:
void setDisplayValid(bool valid); void setDisplayValid(bool valid);
private: private:
Mutex mLock; Mutex mLock;
int32_t mWakeCount; int32_t mWakeCount;
bool mHibernating; bool mHibernating;
bool mAttemptHibernation; bool mAttemptHibernation;
bool mDpyValid; bool mDpyValid;
const bool mAllowHibernation;
}; };
HibernationMachine mHibernation; HibernationMachine mHibernation;
}; };