projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8030cb0)
r600g: Remove special handling of PRED_SET* insructions for LLVM 3.2
authorTom Stellard <thomas.stellard@amd.com>
Wed, 17 Oct 2012 19:21:48 +0000 (19:21 +0000)
committerTom Stellard <thomas.stellard@amd.com>
Fri, 19 Oct 2012 21:25:01 +0000 (21:25 +0000)
The 3.2 version of the backend now sets all the correct fields for
PRED_SET* instructions.

src/gallium/drivers/r600/r600_shader.c patch | blob | history

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 053a9882f9c028f8f95752795104f0ad84d2b7bd..58b7fb2fb697f07c3da0922bb3b4ac6aeb3cd5b0 100644 (file)
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -330,6 +330,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx,
                        alu.src[src_idx].sel += 512;
        }
 
+#if HAVE_LLVM < 0x0302
        if (alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE) ||
            alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE) ||
            alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT) ||
@@ -340,6 +341,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx,
                alu.src[1].chan = 0;
                alu.last = 1;
        }
+#endif
 
        if (alu.execute_mask) {
                alu.pred_sel = 0;