From: Brian Paul <brianp@vmware.com>
Date: Fri, 26 Jun 2009 23:07:07 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a18e209edb5348eb167e9d7184597031bbbbe622;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/gallium/drivers/softpipe/sp_screen.c
	src/mesa/main/version.h
---

a18e209edb5348eb167e9d7184597031bbbbe622
diff --cc docs/relnotes.html
index ad5b74bad3c,4764eb689d8..35a4c7385f7
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -20,8 -13,9 +13,10 @@@ The release notes summarize what's new 
  </p>
  
  <UL>
 +<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
  <LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
+ <LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>
+ <LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>
  <LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A>
  <LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A>
  <LI><A HREF="relnotes-7.4.html">7.4 release notes</A>
diff --cc src/gallium/drivers/softpipe/sp_screen.c
index 692deeb8fd3,cc39d33ede6..be76f1d4135
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@@ -86,7 -86,9 +86,9 @@@ softpipe_get_param(struct pipe_screen *
     case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
        return 8;  /* max 128x128x128 */
     case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
 -      return 12; /* max 2Kx2K */
 +      return 13; /* max 4Kx4K */
+    case PIPE_CAP_TGSI_CONT_SUPPORTED:
+       return 1;
     default:
        return 0;
     }