From ccab3f7e1b9e8a8998e421a04c3bc111bd8985ae Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 7 Apr 2016 04:47:32 +0100 Subject: [PATCH] r600: don't merge GDS into VTX We don't want vtx/tex instructions ending up in GDS sections. Signed-off-by: Dave Airlie --- src/gallium/drivers/r600/r600_asm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index e0de645..9db9915 100644 --- 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, -- 2.7.4