From: Kenneth Graunke Date: Thu, 8 Nov 2012 10:24:08 +0000 (-0800) Subject: mesa: Fix error code for glTexParameteri of TEXTURE_MAX_LEVEL. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f399a707c80e5d89f404c1bfacc73d16a32a88c3;p=mesa.git 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 Reviewed-and-tested-by: Matt Turner --- diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 8ce0546180c..92c89102f37 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; }