From: Brian Paul <brianp@vmware.com>
Date: Tue, 29 Sep 2009 15:46:49 +0000 (-0600)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=124f5875eae0b914d5c679fec6b25633907ad843;p=mesa.git

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
---

124f5875eae0b914d5c679fec6b25633907ad843
diff --cc docs/relnotes.html
index 7a87f58a82f,d8cbc791eb7..b301ee046a7
--- a/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 de479709858,5f7864e6714..83fb4e0d151
--- a/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;
  }