Merge "egl: handle failed eglMakeCurrent EGL_NO_CONTEXT" into oc-dev (0e00045e) · Commits · e / os / android_frameworks_native-old

opengl/libs/EGL/eglApi.cpp

+14 −18

Original line number	Diff line number	Diff line
		@@ -829,19 +829,15 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
		egl_tls_t::setContext(EGL_NO_CONTEXT);
		}
		} else {

		if (cur_c != NULL) {
		// Force return to current context for drivers that cannot handle errors
		EGLBoolean restore_result = EGL_FALSE;

		// get a reference to the old current objects
		ContextRef _c2(dp.get(), cur_c);
		SurfaceRef _d2(dp.get(), cur_c->draw);
		SurfaceRef _r2(dp.get(), cur_c->read);

		if (cur_c == NULL) {
		restore_result = dp->makeCurrent(c, cur_c,
		EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT,
		EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
		} else {
		c = cur_c;
		impl_ctx = c->context;
		impl_draw = EGL_NO_SURFACE;
		@@ -857,7 +853,6 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
		restore_result = dp->makeCurrent(c, cur_c,
		cur_c->draw, cur_c->read, cur_c->context,
		impl_draw, impl_read, impl_ctx);
		}
		if (restore_result == EGL_TRUE) {
		_c2.acquire();
		_r2.acquire();
		@@ -865,6 +860,7 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
		} else {
		ALOGE("Could not restore original EGL context");
		}
		}
		// this will ALOGE the error
		egl_connection_t* const cnx = &gEGLImpl;
		result = setError(cnx->egl.eglGetError(), (EGLBoolean)EGL_FALSE);