From: Brian Paul <brianp@vmware.com>
Date: Thu, 24 Sep 2009 22:01:26 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=940ca2e837efe45caae1cf1d9665f6736347705d;p=mesa.git

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
---

940ca2e837efe45caae1cf1d9665f6736347705d
diff --cc src/gallium/drivers/softpipe/sp_screen.c
index 6178c4ac7e3,2e2668dfe49..769425bd12c
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@@ -82,15 -82,13 +82,15 @@@ softpipe_get_param(struct pipe_screen *
     case PIPE_CAP_TEXTURE_SHADOW_MAP:
        return 1;
     case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
 -      return 12; /* max 2Kx2K */
 +      return 13; /* max 4Kx4K */
     case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
-       return 8;  /* max 128x128x128 */
+       return 9;  /* max 256x256x256 */
     case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
 -      return 12; /* max 2Kx2K */
 +      return 13; /* max 4Kx4K */
     case PIPE_CAP_TGSI_CONT_SUPPORTED:
        return 1;
 +   case PIPE_CAP_BLEND_EQUATION_SEPARATE:
 +      return 1;
     default:
        return 0;
     }
diff --cc src/mesa/main/enable.c
index 4bc54771e97,d1b21756fe1..4a00440ab1c
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@@ -231,10 -228,10 +231,10 @@@ enable_texture(GLcontext *ctx, GLboolea
  {
     const GLuint curr = ctx->Texture.CurrentUnit;
     struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
 -   const GLuint newenabled = (!state)
 -       ? (texUnit->Enabled & ~bit) :  (texUnit->Enabled | bit);
 +   const GLbitfield newenabled = state
 +      ? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit);
  
-    if (!ctx->DrawBuffer->Visual.rgbMode || texUnit->Enabled == newenabled)
+    if (texUnit->Enabled == newenabled)
         return GL_FALSE;
  
     FLUSH_VERTICES(ctx, _NEW_TEXTURE);