Mesa (master): mesa: Fix error code for glTexParameteri of TEXTURE_MAX_LEVEL.

Kenneth Graunke kwg at kemper.freedesktop.org
Mon Nov 19 21:28:12 UTC 2012


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Nov  8 02:24:08 2012 -0800

mesa: Fix error code for glTexParameteri of TEXTURE_MAX_LEVEL.

Calling glTexParameteri() with pname GL_TEXTURE_MAX_LEVEL and either a
target of GL_TEXTURE_RECTANGLE or a negative value previously generated
GL_INVALID_OPERATION.  However, GL_INVALID_VALUE seems more appropriate.

Fixes oglconform's api-error/negative.glTexParameter and es3conform's
sgis_texture_lod_basic_error.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-and-tested-by: Matt Turner <mattst88 at gmail.com>

---

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

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 8ce0546..92c8910 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -349,7 +349,7 @@ set_tex_parameteri(struct gl_context *ctx,
       if (texObj->MaxLevel == params[0])
          return GL_FALSE;
       if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
+         _mesa_error(ctx, GL_INVALID_VALUE,
                      "glTexParameter(param=%d)", params[0]);
          return GL_FALSE;
       }




More information about the mesa-commit mailing list