From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 27 Jul 2012 01:43:26 +0000 (-0700)
Subject: mesa: Generate an error when glCopyTexImage border is invalid
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59d965333c05534475b60042571366656b97ab9d;p=mesa.git

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>
---

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;
    }