diff options
author | Dave Airlie <[email protected]> | 2016-04-07 04:47:32 +0100 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2017-06-26 16:23:21 +1000 |
commit | ccab3f7e1b9e8a8998e421a04c3bc111bd8985ae (patch) | |
tree | 8295cee229ff1ab935d6ff324f19ec61eb98be6a | |
parent | 043f16eba1ed1c4614570e8a6a312767e203e1a1 (diff) |
r600: don't merge GDS into VTX
We don't want vtx/tex instructions ending up in GDS sections.
Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r-- | src/gallium/drivers/r600/r600_asm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index e0de645c2e3..9db99158658 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, |