From 8b36958ceb23b8a40a622f950ddf8fe94583c143 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 22 Oct 2011 20:13:20 +0100 Subject: [PATCH] r600g: make if's use PRED_SETNE_INT no matter what. This is more correct for TGSI if, and with native ints enabled it fixes 25 piglit fails. Signed-off-by: Dave Airlie --- src/gallium/drivers/r600/r600_asm.c | 1 + src/gallium/drivers/r600/r600_shader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 7be6818..649750b 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -138,6 +138,7 @@ static inline unsigned int r600_bytecode_get_num_operands(struct r600_bytecode * case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETGT: case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETGE: case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE: + case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE_INT: case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4: case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_DOT4_IEEE: case EG_V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_CUBE: diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 8939143..e193996 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -3219,7 +3219,7 @@ static void break_loop_on_flag(struct r600_shader_ctx *ctx, unsigned fc_sp) static int tgsi_if(struct r600_shader_ctx *ctx) { - emit_logic_pred(ctx, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE)); + emit_logic_pred(ctx, CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE_INT)); r600_bytecode_add_cfinst(ctx->bc, CTX_INST(V_SQ_CF_WORD1_SQ_CF_INST_JUMP)); -- 2.7.4