mesa: Branch 'master'

[Brian Paul]

 src/mesa/main/attrib.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 41fc55dd81ebf1def2d4a8df8fee849d6e97eaab (from 1a9483c95492bee3fbda131181945b6c878bf52f)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Apr 17 08:29:37 2007 -0600

    don't set GL_TEXTURE_MAX_LEVEL for GL_TEXTURE_RECTANGLE_ARB as that generates an error

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 0df8d23..e2cfb8a 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -765,7 +765,8 @@ pop_texture_group(GLcontext *ctx, const 
          _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, obj->MinLod);
          _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, obj->MaxLod);
          _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, obj->BaseLevel);
-         _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel);
+         if (target != GL_TEXTURE_RECTANGLE_ARB)
+            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel);
          if (ctx->Extensions.EXT_texture_filter_anisotropic) {
             _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT,
                                 obj->MaxAnisotropy);