diff options
| author | Mathias Agopian <mathias@google.com> | 2011-08-25 18:38:24 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-08-25 18:38:24 -0700 |
| commit | ca07e34f13fd1c5df8deecc815fcb46f0a07052f (patch) | |
| tree | d3297154c724d032071017c760aa51921ad7e5d2 | |
| parent | cf2317ef13e35cf1bcd5ba27be686c7f2609ac38 (diff) | |
| download | frameworks_base-ca07e34f13fd1c5df8deecc815fcb46f0a07052f.zip frameworks_base-ca07e34f13fd1c5df8deecc815fcb46f0a07052f.tar.gz frameworks_base-ca07e34f13fd1c5df8deecc815fcb46f0a07052f.tar.bz2 | |
fix logging of eglMakeCurrent() errors
Change-Id: Ie22cabff822a8fb3186f082491234b9503b431c3
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 2 | ||||
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 926d424..5b592e0 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -810,9 +810,9 @@ public abstract class HardwareRenderer { if (!mEglContext.equals(sEgl.eglGetCurrentContext()) || !mEglSurface.equals(sEgl.eglGetCurrentSurface(EGL_DRAW))) { if (!sEgl.eglMakeCurrent(sEglDisplay, mEglSurface, mEglSurface, mEglContext)) { - fallback(true); Log.e(LOG_TAG, "eglMakeCurrent failed " + GLUtils.getEGLErrorString(sEgl.eglGetError())); + fallback(true); return SURFACE_STATE_ERROR; } else { return SURFACE_STATE_UPDATED; diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 1f0016a..7e85230 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -675,6 +675,9 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw, setGLHooksThreadSpecific(&gHooksNoContext); egl_tls_t::setContext(EGL_NO_CONTEXT); } + } else { + // this will LOGE the error + result = setError(c->cnx->egl.eglGetError(), EGL_FALSE); } return result; } |