From 9be6654c1f75bc402c807ec0caccebde032afa59 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Jan 2012 14:06:17 -0800 Subject: [PATCH] mesa: Throw the required error for glCopyPixels from multisample FBO. Fixes piglit EXT_framebuffer_multisample/negative-copypixels. Reviewed-by: Brian Paul NOTE: This is a candidate for the 8.0 branch. --- src/mesa/main/drawpix.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 9f5b0b36eb7..01983d945ca 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -203,6 +203,12 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height, goto end; } + if (ctx->ReadBuffer->Name != 0 && ctx->ReadBuffer->Visual.samples > 0) { + _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION, + "glCopyPixels(multisample FBO)"); + goto end; + } + if (!_mesa_source_buffer_exists(ctx, type) || !_mesa_dest_buffer_exists(ctx, type)) { _mesa_error(ctx, GL_INVALID_OPERATION, -- 2.30.2