Mesa (master): r300g: fix the CS size when emitting invariant state

[Corbin Simpson]

Module: Mesa
Branch: master
Commit: 37897a65e27842bbbfe32c37d2fcf775a5c127eb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=37897a65e27842bbbfe32c37d2fcf775a5c127eb

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Jan 16 00:56:33 2010 +0100

r300g: fix the CS size when emitting invariant state

---

 src/gallium/drivers/r300/r300_state_invariant.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_state_invariant.c b/src/gallium/drivers/r300/r300_state_invariant.c
index b0f3096..47d7e60 100644
--- a/src/gallium/drivers/r300/r300_state_invariant.c
+++ b/src/gallium/drivers/r300/r300_state_invariant.c
@@ -79,7 +79,8 @@ void r300_emit_invariant_state(struct r300_context* r300)
     END_CS;
 
     /* XXX unsorted stuff from surface_fill */
-    BEGIN_CS(44 + (caps->has_tcl ? 7 : 0) + (caps->is_r500 ? 4 : 0));
+    BEGIN_CS(44 + (caps->has_tcl ? 7 : 0) +
+             (caps->family >= CHIP_FAMILY_RV350 ? 4 : 0));
 
     if (caps->has_tcl) {
         /*Flushing PVS is required before the VAP_GB registers can be changed*/