Mesa (master): r600g: fix tex and vtx joining

[Christian König]

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

Author: Christian König <deathsimple at vodafone.de>
Date:   Thu Dec 16 22:23:48 2010 +0100

r600g: fix tex and vtx joining

---

 src/gallium/drivers/r600/r600_asm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 3267245..1c13851 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -672,7 +672,7 @@ int r600_bc_add_vtx(struct r600_bc *bc, const struct r600_bc_vtx *vtx)
 	/* each fetch use 4 dwords */
 	bc->cf_last->ndw += 4;
 	bc->ndw += 4;
-	if ((bc->ndw / 4) > 7)
+	if ((bc->cf_last->ndw / 4) > 7)
 		bc->force_add_cf = 1;
 	return 0;
 }
@@ -701,7 +701,7 @@ int r600_bc_add_tex(struct r600_bc *bc, const struct r600_bc_tex *tex)
 	/* each texture fetch use 4 dwords */
 	bc->cf_last->ndw += 4;
 	bc->ndw += 4;
-	if ((bc->ndw / 4) > 7)
+	if ((bc->cf_last->ndw / 4) > 7)
 		bc->force_add_cf = 1;
 	return 0;
 }