diff options
| author | Eric Anholt <eric@anholt.net> | 2012-01-11 14:06:17 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-01-13 10:23:41 -0800 |
| commit | daa2545508202302208317ace78d328d60f4d35f (patch) | |
| tree | 600fb1792c62cce1977d5233853f2ded7b916254 | |
| parent | baaa30ad52ac6eba0ee444c33678ffd357883a4d (diff) | |
mesa: Throw the required error for glCopyPixels from multisample FBO.
Fixes piglit EXT_framebuffer_multisample/negative-copypixels.
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 9be6654c1f75bc402c807ec0caccebde032afa59)
| -rw-r--r-- | src/mesa/main/drawpix.c | 6 |
1 files changed, 6 insertions, 0 deletions
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, |