diff options
| author | Eric Anholt <[email protected]> | 2012-01-11 14:02:41 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-01-12 12:34:18 -0800 |
| commit | 6950a4faf650fe119ee97aa18b006eed099038be (patch) | |
| tree | 5ab04cd216825c506a9530cbf113cd2454c4825e /src/mesa/main/teximage.c | |
| parent | 86b7c6707f915b07347070901d602917bc25dd0f (diff) | |
mesa: Throw the required error for glCopyTex{Sub,}Image from multisample FBO.
Fixes piglit EXT_framebuffer_multisample/negative-copyteximage.
Reviewed-by: Brian Paul <[email protected]>
NOTE: This is a candidate for the 8.0 branch.
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 14 |
1 files changed, 14 insertions, 0 deletions
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) */ |