Module: Mesa Branch: master Commit: d2b0338e3354fadc90a3751520f4aa44ba01954f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2b0338e3354fadc90a3751520f4aa44ba01954f
Author: Tom Stellard <[email protected]> Date: Wed Oct 17 19:21:48 2012 +0000 r600g: Remove special handling of PRED_SET* insructions for LLVM 3.2 The 3.2 version of the backend now sets all the correct fields for PRED_SET* instructions. --- src/gallium/drivers/r600/r600_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 053a988..58b7fb2 100644 --- 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
