projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eff66bc)
r600g/llvm: Add support for native isa for pre EG
authorVincent Lejeune <vljn@ovi.com>
Sat, 6 Apr 2013 16:12:26 +0000 (18:12 +0200)
committerVincent Lejeune <vljn@ovi.com>
Mon, 8 Apr 2013 13:11:59 +0000 (15:11 +0200)
This fixes bug 62756 :
https://bugs.freedesktop.org/show_bug.cgi?id=62756#c12

src/gallium/drivers/r600/r600_asm.c patch | blob | history
src/gallium/drivers/radeon/LLVM_REVISION.txt patch | blob | history

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index a0dc1deb8eba7d2e0b0a4ccdab52cf66b3c05cc0..26a848ad1aa26225d439da7011e00c0ba725a11d 100644 (file)
--- 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 dcce2fa2bf164cee89364b4fbf48c65f4e34bbc1..e26c652e96f62695f3e1ac2dc68ad6d34f3aced5 100644 (file)
--- a/src/gallium/drivers/radeon/LLVM_REVISION.txt
+++ b/src/gallium/drivers/radeon/LLVM_REVISION.txt
@@ -1 +1 @@
-@178928
+@179020