Mesa (master): mesa: Generate an error when glCopyTexImage border is invalid

Ian Romanick idr at kemper.freedesktop.org
Thu Aug 23 17:20:51 UTC 2012


Module: Mesa
Branch: master
Commit: 59d965333c05534475b60042571366656b97ab9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59d965333c05534475b60042571366656b97ab9d

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Jul 26 18:43:26 2012 -0700

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 at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

---

 src/mesa/main/teximage.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8efa179..879a24e 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;
    }
 




More information about the mesa-commit mailing list