From b8f7eef4ef84d53d32d08a70dc7daec623cf7eab Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 7 Feb 2012 07:42:33 -0700 Subject: [PATCH] mesa: stop using _mesa_error_check_format_type() in glReadPixels Basically the same story as the previous commit. But we were already calling _mesa_source_buffer_exists() in ReadPixels(). Yeah, we were calling it twice. Signed-off-by: Brian Paul --- src/mesa/main/readpix.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index b753e40be27..9b9663af5ac 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -697,6 +697,8 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels ) { + GLenum err; + GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); @@ -718,8 +720,11 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, if (ctx->NewState) _mesa_update_state(ctx); - if (_mesa_error_check_format_type(ctx, format, type, GL_FALSE)) { - /* found an error */ + err = _mesa_error_check_format_and_type(ctx, format, type); + if (err != GL_NO_ERROR) { + _mesa_error(ctx, err, "glReadPixels(invalid format %s and/or type %s)", + _mesa_lookup_enum_by_nr(format), + _mesa_lookup_enum_by_nr(type)); return; }