From 6950a4faf650fe119ee97aa18b006eed099038be Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Jan 2012 14:02:41 -0800 Subject: [PATCH] mesa: Throw the required error for glCopyTex{Sub,}Image from multisample FBO. Fixes piglit EXT_framebuffer_multisample/negative-copyteximage. Reviewed-by: Brian Paul NOTE: This is a candidate for the 8.0 branch. --- src/mesa/main/teximage.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index ce62248441d..39732522c55 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1909,6 +1909,13 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions, "glCopyTexImage%dD(invalid readbuffer)", dimensions); return GL_TRUE; } + + if (ctx->ReadBuffer->Visual.samples > 0) { + _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION, + "glCopyTexImage%dD(multisample FBO)", + dimensions); + return GL_TRUE; + } } /* Check border */ @@ -2008,6 +2015,13 @@ copytexsubimage_error_check1( struct gl_context *ctx, GLuint dimensions, "glCopyTexImage%dD(invalid readbuffer)", dimensions); return GL_TRUE; } + + if (ctx->ReadBuffer->Visual.samples > 0) { + _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION, + "glCopyTexSubImage%dD(multisample FBO)", + dimensions); + return GL_TRUE; + } } /* check target (proxies not allowed) */ -- 2.30.2