Merge "Avoid waking EGL in getInitCount"

critsec · Android (Google) Code Review · commit 9d873d439f01 · 2012-04-09T22:43:34.000-07:00
diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
@@ -178,7 +178,7 @@ static jboolean jni_eglQuerySurface(JNIEnv *_env, jobject _this, jobject display
 
 static jint jni_getInitCount(JNIEnv *_env, jobject _clazz, jobject display) {
     EGLDisplay dpy = getDisplay(_env, display);
-    egl_display_t* eglDisplay = get_display(dpy); 
+    egl_display_t* eglDisplay = get_display_nowake(dpy);
     return eglDisplay ? eglDisplay->getRefsCount() : 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ static jboolean jni_eglQuerySurface(JNIEnv *_env, jobject _this, jobject display`
`178`	`178`
`179`	`179`	`static jint jni_getInitCount(JNIEnv *_env, jobject _clazz, jobject display) {`
`180`	`180`	`EGLDisplay dpy = getDisplay(_env, display);`
`181`		`- egl_display_t* eglDisplay = get_display(dpy);`
	`181`	`+ egl_display_t* eglDisplay = get_display_nowake(dpy);`
`182`	`182`	`return eglDisplay ? eglDisplay->getRefsCount() : 0;`
`183`	`183`	`}`
`184`	`184`