From: Christian König <deathsimple@vodafone.de>
Date: Thu, 16 Dec 2010 21:23:48 +0000 (+0100)
Subject: r600g: fix tex and vtx joining
X-Git-Tag: mesa-7.11-rc1~2831
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc0f604241ee7b536f4c9867573024b8673b0998;p=platform%2Fupstream%2Fmesa.git

r600g: fix tex and vtx joining
---

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