Module: Mesa Branch: master Commit: 5019af21453d0e9fc5b0f8c1c2bfeb29029882c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5019af21453d0e9fc5b0f8c1c2bfeb29029882c1
Author: Vincent Lejeune <v...@ovi.com> Date: Sat Apr 6 18:12:26 2013 +0200 r600g/llvm: Add support for native isa for pre EG This fixes bug 62756 : https://bugs.freedesktop.org/show_bug.cgi?id=62756#c12 --- src/gallium/drivers/r600/r600_asm.c | 6 +++++- src/gallium/drivers/radeon/LLVM_REVISION.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index a0dc1de..26a848a 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -1494,7 +1494,11 @@ static int r600_bytecode_cf_build(struct r600_bytecode *bc, struct r600_bytecode const struct cf_op_info *cfop = r600_isa_cf(cf->op); unsigned opcode = r600_isa_cf_opcode(bc->isa->hw_class, cf->op); - if (cfop->flags & CF_ALU) { + + if (cf->op == CF_NATIVE) { + bc->bytecode[id++] = cf->isa[0]; + bc->bytecode[id++] = cf->isa[1]; + } else if (cfop->flags & CF_ALU) { bc->bytecode[id++] = S_SQ_CF_ALU_WORD0_ADDR(cf->addr >> 1) | S_SQ_CF_ALU_WORD0_KCACHE_MODE0(cf->kcache[0].mode) | S_SQ_CF_ALU_WORD0_KCACHE_BANK0(cf->kcache[0].bank) | diff --git a/src/gallium/drivers/radeon/LLVM_REVISION.txt b/src/gallium/drivers/radeon/LLVM_REVISION.txt index dcce2fa..e26c652 100644 --- a/src/gallium/drivers/radeon/LLVM_REVISION.txt +++ b/src/gallium/drivers/radeon/LLVM_REVISION.txt @@ -1 +1 @@ -@178928 +@179020 _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
