From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 15 Jan 2010 23:56:33 +0000 (+0100)
Subject: r300g: fix the CS size when emitting invariant state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=37897a65e27842bbbfe32c37d2fcf775a5c127eb;p=mesa.git

r300g: fix the CS size when emitting invariant state
---

diff --git a/src/gallium/drivers/r300/r300_state_invariant.c b/src/gallium/drivers/r300/r300_state_invariant.c
index b0f309695c9..47d7e60a40d 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*/