summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2012-07-26 18:43:26 -0700
committerIan Romanick <ian.d.romanick@intel.com>2012-08-23 10:15:30 -0700
commit59d965333c05534475b60042571366656b97ab9d (patch)
tree1cc76d1b77df240b7ebc92cccac9a841794ad72f
parent2dcb40bb44a813295e3133bcec66c0de1e5f5a34 (diff)
mesa: Generate an error when glCopyTexImage border is invalid
NOTE: This is a candidate for stable release branches. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
-rw-r--r--src/mesa/main/teximage.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8efa179724a..879a24e88aa 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2009,6 +2009,8 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
if (border < 0 || border > 1 ||
((target == GL_TEXTURE_RECTANGLE_NV ||
target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
+ _mesa_error(ctx, GL_INVALID_VALUE,
+ "glCopyTexImage%dD(border=%d)", dimensions, border);
return GL_TRUE;
}