[Mesa-dev] [PATCH 4/5] mesa: Throw the required error for glCopyTex{Sub, }Image from multisample FBO.

[Eric Anholt]

Fixes piglit EXT_framebuffer_multisample/negative-copyteximage.
---
 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 9475e84..d5e462b 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) */
-- 
1.7.7.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev