Mesa (master): r600g: fixed the bug with VTX fetches in TEX clauses for evergreen

[Tom Stellard]

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

Author: Adam Rak <adam.rak at streamnovation.com>
Date:   Tue Apr 17 15:56:02 2012 -0400

r600g: fixed the bug with VTX fetches in TEX clauses for evergreen

Signed-off-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/drivers/r600/r600_asm.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 39bab38..ccb8bc0 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -2026,13 +2026,12 @@ int r600_bytecode_build(struct r600_bytecode *bc)
 				}
 				break;
 			case EG_V_SQ_CF_WORD1_SQ_CF_INST_TEX:
-				if (bc->chip_class == CAYMAN) {
-					LIST_FOR_EACH_ENTRY(vtx, &cf->vtx, list) {
-						r = r600_bytecode_vtx_build(bc, vtx, addr);
-						if (r)
-							return r;
-						addr += 4;
-					}
+				LIST_FOR_EACH_ENTRY(vtx, &cf->vtx, list) {
+					assert(bc->chip_class >= EVERGREEN);
+					r = r600_bytecode_vtx_build(bc, vtx, addr);
+					if (r)
+						return r;
+					addr += 4;
 				}
 				LIST_FOR_EACH_ENTRY(tex, &cf->tex, list) {
 					r = r600_bytecode_tex_build(bc, tex, addr);