Merge branch 'mesa_7_6_branch'

diff --cc src/gallium/drivers/softpipe/sp_tile_cache.c
index 83fb4e0d151f6ed3c5b69bfbfdbe4a1b119e1556,b2195ec6b597e07595005bf367cfe90bb1cdecca..65872cecc4fdfd0fc4ada4af11de0e1b1453808b
--- 1/src/gallium/drivers/softpipe/sp_tile_cache.c
--- 2/src/gallium/drivers/softpipe/sp_tile_cache.c
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.c
@@@ -93,11 -127,16 +93,16 @@@ sp_create_tile_cache( struct pipe_scree
     if (tc) {
        tc->screen = screen;
        for (pos = 0; pos < NUM_ENTRIES; pos++) {
 -         tc->entries[pos].x =
 -         tc->entries[pos].y = -1;
 +         tc->entries[pos].addr.bits.invalid = 1;
        }
 +      tc->last_tile = &tc->entries[0]; /* any tile */
  
- #if TILE_CLEAR_OPTIMIZATION
+       /* XXX this code prevents valgrind warnings about use of uninitialized
+        * memory in programs that don't clear the surface before rendering.
+        * However, it breaks clearing in other situations (such as in
+        * progs/tests/drawbuffers, see bug 24402).
+        */
+ #if 0 && TILE_CLEAR_OPTIMIZATION
        /* set flags to indicate all the tiles are cleared */
        memset(tc->clear_flags, 255, sizeof(tc->clear_flags));
  #endif

diff --cc src/mesa/drivers/dri/r600/r700_state.c
Simple merge

diff --cc src/mesa/drivers/dri/radeon/radeon_common.c
Simple merge