diff options
| author | Kenneth Graunke <[email protected]> | 2012-11-08 02:24:08 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-11-19 11:48:52 -0800 |
| commit | f399a707c80e5d89f404c1bfacc73d16a32a88c3 (patch) | |
| tree | 6904cc64b33f036e7747f186cd091e53bbcffbe8 | |
| parent | 4e907018b2b7d18fee1359fa877079af45e012af (diff) | |
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 <[email protected]>
Reviewed-and-tested-by: Matt Turner <[email protected]>
| -rw-r--r-- | 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 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; } |