From 86b7c6707f915b07347070901d602917bc25dd0f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Jan 2012 13:54:53 -0800 Subject: [PATCH] mesa: Throw the required error for glReadPixels() from a multisampled FBO. Fixes piglit EXT_framebuffer_multisample-negative-readpixels. Reviewed-by: Brian Paul NOTE: This is a candidate for the 8.0 branch. --- src/mesa/main/readpix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 0c0e5394d66..c1489d21109 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -782,6 +782,11 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, return; } + if (ctx->ReadBuffer->Name != 0 && ctx->ReadBuffer->Visual.samples > 0) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(multisample FBO)"); + return; + } + if (!_mesa_source_buffer_exists(ctx, format)) { _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)"); return; -- 2.30.2