Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix logging of eglMakeCurrent() errors"

Browse Source
This commit is contained in:
Mathias Agopian
2011-08-25 18:40:31 -07:00
committed by Android (Google) Code Review
parent 2daf331e68 ca07e34f13
commit 3efc794f85
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/HardwareRenderer.java
View File

@@ -810,9 +810,9 @@ public abstract class HardwareRenderer {
if (!mEglContext.equals(sEgl.eglGetCurrentContext()) || if (!mEglContext.equals(sEgl.eglGetCurrentContext()) ||
!mEglSurface.equals(sEgl.eglGetCurrentSurface(EGL_DRAW))) { !mEglSurface.equals(sEgl.eglGetCurrentSurface(EGL_DRAW))) {
if (!sEgl.eglMakeCurrent(sEglDisplay, mEglSurface, mEglSurface, mEglContext)) { if (!sEgl.eglMakeCurrent(sEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
fallback(true);
Log.e(LOG_TAG, "eglMakeCurrent failed " + Log.e(LOG_TAG, "eglMakeCurrent failed " +
GLUtils.getEGLErrorString(sEgl.eglGetError())); GLUtils.getEGLErrorString(sEgl.eglGetError()));
fallback(true);
return SURFACE_STATE_ERROR; return SURFACE_STATE_ERROR;
} else { } else {
return SURFACE_STATE_UPDATED; return SURFACE_STATE_UPDATED;

3
opengl/libs/EGL/eglApi.cpp
View File

@@ -675,6 +675,9 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
setGLHooksThreadSpecific(&gHooksNoContext); setGLHooksThreadSpecific(&gHooksNoContext);
egl_tls_t::setContext(EGL_NO_CONTEXT); egl_tls_t::setContext(EGL_NO_CONTEXT);
} }
} else {
// this will LOGE the error
result = setError(c->cnx->egl.eglGetError(), EGL_FALSE);
} }
return result; return result;
} }