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>
This commit is contained in:
Dave Airlie 2016-04-07 04:47:32 +01:00
parent 043f16eba1
commit ccab3f7e1b
1 changed files with 3 additions and 2 deletions

View File

@ -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,