From ffdffd834a9b0bc6866331e7ecca995d0eb1c041 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sat, 12 Jan 2013 01:05:44 -0800 Subject: [PATCH] readpix: allow implementation format/type For GLES2/3 allow reading of pixels with format/type based on: * GL_IMPLEMENTATION_COLOR_READ_FORMAT * GL_IMPLEMENTATION_COLOR_READ_TYPE Reviewed-by: Ian Romanick Signed-off-by: Jordan Justen --- src/mesa/main/readpix.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 994e5895e73..6b07563e982 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -773,7 +773,12 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, * combination is, and Mesa can handle anything valid. Just work instead. */ if (_mesa_is_gles(ctx)) { - if (ctx->Version < 30) { + if (ctx->API == API_OPENGLES2 && + _mesa_is_color_format(format) && + _mesa_get_color_read_format(ctx) == format && + _mesa_get_color_read_type(ctx) == type) { + err = GL_NO_ERROR; + } else if (ctx->Version < 30) { err = _mesa_es_error_check_format_and_type(format, type, 2); if (err == GL_NO_ERROR) { if (type == GL_FLOAT || type == GL_HALF_FLOAT_OES) { -- 2.11.0