Merge branch 'mesa_7_6_branch'

Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/gallium/drivers/softpipe/sp_context.c
	src/gallium/drivers/softpipe/sp_tile_cache.c
	src/mesa/main/version.h

diff --cc docs/relnotes.html
index 7a87f58a82ff61e7a50c4915abce4fef35ba4005,d8cbc791eb752658ab5f5626a0287586ace4d7f8..b301ee046a70606e6e93a042e46d05f4e43fe9f1
--- 1/docs/relnotes.html
--- 2/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -13,7 -13,7 +13,8 @@@ The release notes summarize what's new 
  </p>
  
  <UL>
 +<LI><A HREF="relnotes-7.7.html">7.7 release notes</A>
+ <LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A>
  <LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
  <LI><A HREF="relnotes-7.5.2.html">7.5.2 release notes</A>
  <LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>

diff --cc src/gallium/drivers/softpipe/sp_tile_cache.c
index de479709858c214cb97bc18d890bd652df0b7ff0,5f7864e6714f04bbf88db384a56a07a59c0dfa1d..83fb4e0d151f6ed3c5b69bfbfdbe4a1b119e1556
--- 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,9 -127,14 +93,14 @@@ 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
+       /* set flags to indicate all the tiles are cleared */
+       memset(tc->clear_flags, 255, sizeof(tc->clear_flags));
+ #endif
     }
     return tc;
  }

diff --cc src/mesa/main/texstate.c
Simple merge