diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-21 09:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-21 09:05:28 +0100 |
| commit | 7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796 (patch) | |
| tree | 0d078a56d8bcd7ffa319c9d6926aef3db5a7052b /mesalib/src/mesa/main/texparam.c | |
| parent | 589f5feba1e7968b7318b02f4f2bdea81937f0e1 (diff) | |
| parent | 38eb7612c4b39dd69df4baf4450ba512e888effa (diff) | |
| download | vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.gz vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.bz2 vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Git update 21 nov 2012
Diffstat (limited to 'mesalib/src/mesa/main/texparam.c')
| -rw-r--r-- | mesalib/src/mesa/main/texparam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index 8ce054618..92c89102f 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/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; } |