diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-09-19 17:25:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-19 17:25:50 +1000 |
| commit | ed4f740127d6896506a91c8c5b9c527a971e982b (patch) | |
| tree | 667a67bc3041475c3e889c60339f093a80b6d352 /src/gallium/drivers/r600/r600_asm.c | |
| parent | c5edfcc410bdf3dbe4f37418de8f0009746c9578 (diff) | |
r600g: only emit uses waterfall on r6xx hw.
Diffstat (limited to 'src/gallium/drivers/r600/r600_asm.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 93dc142011..8c01987318 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -696,7 +696,7 @@ static int r600_bc_cf_build(struct r600_bc *bc, struct r600_bc_cf *cf) bc->bytecode[id++] = S_SQ_CF_ALU_WORD1_CF_INST(cf->inst >> 3) | S_SQ_CF_ALU_WORD1_BARRIER(1) | - S_SQ_CF_ALU_WORD1_USES_WATERFALL(cf->r6xx_uses_waterfall) | + S_SQ_CF_ALU_WORD1_USES_WATERFALL(bc->chiprev == 0 ? cf->r6xx_uses_waterfall : 0) | S_SQ_CF_ALU_WORD1_COUNT((cf->ndw / 2) - 1); break; case V_SQ_CF_WORD1_SQ_CF_INST_TEX: |