r600: don't merge GDS into VTX

We don't want vtx/tex instructions ending up in GDS sections.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index e0de645c2e3d38a0201452dcb8a1815193f31325..9db99158658f2cd47bcba1ec0b738b61a4a65450 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -1332,8 +1332,9 @@ static unsigned r600_bytecode_num_tex_and_vtx_instructions(const struct r600_byt
 static inline boolean last_inst_was_not_vtx_fetch(struct r600_bytecode *bc)
 {
        return !((r600_isa_cf(bc->cf_last->op)->flags & CF_FETCH) &&
-                       (bc->chip_class == CAYMAN ||
-                       bc->cf_last->op != CF_OP_TEX));
+                bc->cf_last->op != CF_OP_GDS &&
+                (bc->chip_class == CAYMAN ||
+                 bc->cf_last->op != CF_OP_TEX));
 }
 
 static int r600_bytecode_add_vtx_internal(struct r600_bytecode *bc, const struct r600_bytecode_vtx *vtx,