diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2014-03-31 02:04:00 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-04-01 08:37:06 -0600 |
| commit | f5904b732efd6ad1ec8273ce3c72dbf38df7076c (patch) | |
| tree | bb4b9380ddf04638ac970f931b845d6867278fdf /src/mesa/main/texparam.c | |
| parent | c13ff5a7632232b3e40782984c3d9b1f822609eb (diff) | |
| download | external_mesa3d-f5904b732efd6ad1ec8273ce3c72dbf38df7076c.zip external_mesa3d-f5904b732efd6ad1ec8273ce3c72dbf38df7076c.tar.gz external_mesa3d-f5904b732efd6ad1ec8273ce3c72dbf38df7076c.tar.bz2 | |
mesa: Allow setting GL_TEXTURE_MAX_LEVEL to 0 with GL_TEXTURE_RECTANGLE.
Currently, we raise an error when doing this which breaks a conformance
test from the OpenGL samples pack. Even if this is a bit silly it is not
an error.
From http://www.opengl.org/wiki/Rectangle_Texture:
"Rectangle textures contain exactly one image; they cannot have mipmaps.
Therefore, any texture parameters that depend on LODs are irrelevant
when used with rectangle textures; attempting to set these parameters to
any value other than 0 will result in an error."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76496
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/texparam.c')
| -rw-r--r-- | src/mesa/main/texparam.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index bfb2e1b..40790ff 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -352,7 +352,8 @@ 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) { + if (params[0] < 0 || + (texObj->Target == GL_TEXTURE_RECTANGLE_ARB && params[0] > 0)) { _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param=%d)", params[0]); return GL_FALSE; |