am 0ecf0b8d: Merge "Additional parameter validation for EGL functions" (3c0425cd) · Commits · e / os / android_frameworks_native-old

opengl/libs/EGL/eglApi.cpp

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -516,8 +516,11 @@ EGLContext eglCreateContext(EGLDisplay dpy, EGLConfig config,

	egl_connection_t* cnx = NULL;		egl_connection_t* cnx = NULL;
	const egl_display_ptr dp = validate_display_connection(dpy, cnx);		const egl_display_ptr dp = validate_display_connection(dpy, cnx);
	if (dpy) {		if (dp) {
	if (share_list != EGL_NO_CONTEXT) {		if (share_list != EGL_NO_CONTEXT) {
			if (!ContextRef(dp.get(), share_list).get()) {
			return setError(EGL_BAD_CONTEXT, EGL_NO_CONTEXT);
			}
	egl_context_t* const c = get_context(share_list);		egl_context_t* const c = get_context(share_list);
	share_list = c->context;		share_list = c->context;
	}		}
	@@ -601,7 +604,7 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
	// validate the context (if not EGL_NO_CONTEXT)		// validate the context (if not EGL_NO_CONTEXT)
	if ((ctx != EGL_NO_CONTEXT) && !_c.get()) {		if ((ctx != EGL_NO_CONTEXT) && !_c.get()) {
	// EGL_NO_CONTEXT is valid		// EGL_NO_CONTEXT is valid
	return EGL_FALSE;		return setError(EGL_BAD_CONTEXT, EGL_FALSE);
	}		}

	// these are the underlying implementation's object		// these are the underlying implementation's object
	@@ -622,12 +625,12 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
	impl_ctx = c->context;		impl_ctx = c->context;
	} else {		} else {
	// no context given, use the implementation of the current context		// no context given, use the implementation of the current context
	if (cur_c == NULL) {
	// no current context
	if (draw != EGL_NO_SURFACE \|\| read != EGL_NO_SURFACE) {		if (draw != EGL_NO_SURFACE \|\| read != EGL_NO_SURFACE) {
	// calling eglMakeCurrent( ..., !=0, !=0, EGL_NO_CONTEXT);		// calling eglMakeCurrent( ..., !=0, !=0, EGL_NO_CONTEXT);
	return setError(EGL_BAD_MATCH, EGL_FALSE);		return setError(EGL_BAD_MATCH, EGL_FALSE);
	}		}
			if (cur_c == NULL) {
			// no current context
	// not an error, there is just no current context.		// not an error, there is just no current context.
	return EGL_TRUE;		return EGL_TRUE;
	}		}
	@@ -635,12 +638,14 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,

	// retrieve the underlying implementation's draw EGLSurface		// retrieve the underlying implementation's draw EGLSurface
	if (draw != EGL_NO_SURFACE) {		if (draw != EGL_NO_SURFACE) {
			if (!_d.get()) return setError(EGL_BAD_SURFACE, EGL_FALSE);
	d = get_surface(draw);		d = get_surface(draw);
	impl_draw = d->surface;		impl_draw = d->surface;
	}		}

	// retrieve the underlying implementation's read EGLSurface		// retrieve the underlying implementation's read EGLSurface
	if (read != EGL_NO_SURFACE) {		if (read != EGL_NO_SURFACE) {
			if (!_r.get()) return setError(EGL_BAD_SURFACE, EGL_FALSE);
	r = get_surface(read);		r = get_surface(read);
	impl_read = r->surface;		impl_read = r->surface;
	}		}