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

Commit 3efc794f authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "fix logging of eglMakeCurrent() errors"

parents 2daf331e ca07e34f

core/java/android/view/HardwareRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

opengl/libs/EGL/eglApi.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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;

}