diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-28 14:25:30 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-28 14:25:30 -0600 |
| commit | 393a93ea324701ef5a545ba99c7d627ab5f9097f (patch) | |
| tree | a13bf6fb39ccf6981e8b7d0224ba28df5b22fe3c /src/mesa/shader | |
| parent | 3e7d43cd480203f0f861345776454628df0d9a42 (diff) | |
Get rid of IR_CONT_IF_FALSE
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/slang/slang_emit.c | 6 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_ir.c | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_ir.h | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c index 46d72e24e3..310a9f1243 100644 --- a/src/mesa/shader/slang/slang_emit.c +++ b/src/mesa/shader/slang/slang_emit.c @@ -1216,7 +1216,6 @@ emit_loop(slang_emit_info *emitInfo, slang_ir_node *n) } else { assert(ir->Opcode == IR_CONT || - ir->Opcode == IR_CONT_IF_FALSE || ir->Opcode == IR_CONT_IF_TRUE); assert(inst->Opcode == OPCODE_CONT || inst->Opcode == OPCODE_BRA); @@ -1276,7 +1275,6 @@ emit_cont_break_if(slang_emit_info *emitInfo, slang_ir_node *n, struct prog_instruction *inst; assert(n->Opcode == IR_CONT_IF_TRUE || - n->Opcode == IR_CONT_IF_FALSE || n->Opcode == IR_BREAK_IF_TRUE || n->Opcode == IR_BREAK_IF_FALSE); @@ -1293,8 +1291,7 @@ emit_cont_break_if(slang_emit_info *emitInfo, slang_ir_node *n, if (emitInfo->EmitHighLevelInstructions) { if (emitInfo->EmitCondCodes) { gl_inst_opcode opcode - = (n->Opcode == IR_CONT_IF_TRUE || n->Opcode == IR_CONT_IF_FALSE) - ? OPCODE_CONT : OPCODE_BRK; + = (n->Opcode == IR_CONT_IF_TRUE) ? OPCODE_CONT : OPCODE_BRK; inst = new_instruction(emitInfo, opcode); inst->DstReg.CondMask = breakTrue ? COND_NE : COND_EQ; return inst; @@ -1681,7 +1678,6 @@ emit(slang_emit_info *emitInfo, slang_ir_node *n) case IR_LOOP: return emit_loop(emitInfo, n); case IR_BREAK_IF_FALSE: - case IR_CONT_IF_FALSE: return emit_cont_break_if(emitInfo, n, GL_FALSE); case IR_BREAK_IF_TRUE: case IR_CONT_IF_TRUE: diff --git a/src/mesa/shader/slang/slang_ir.c b/src/mesa/shader/slang/slang_ir.c index 95b154db68..dd17b4a1e0 100644 --- a/src/mesa/shader/slang/slang_ir.c +++ b/src/mesa/shader/slang/slang_ir.c @@ -334,10 +334,6 @@ _slang_print_ir_tree(const slang_ir_node *n, int indent) printf("BREAK_IF_TRUE\n"); _slang_print_ir_tree(n->Children[0], indent+3); break; - case IR_CONT_IF_FALSE: - printf("CONT_IF_FALSE\n"); - _slang_print_ir_tree(n->Children[0], indent+3); - break; case IR_CONT_IF_TRUE: printf("CONT_IF_TRUE\n"); _slang_print_ir_tree(n->Children[0], indent+3); diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/shader/slang/slang_ir.h index a9a530aaf8..a183ea62e2 100644 --- a/src/mesa/shader/slang/slang_ir.h +++ b/src/mesa/shader/slang/slang_ir.h @@ -75,7 +75,6 @@ typedef enum IR_BREAK_IF_TRUE, IR_BREAK_IF_FALSE, IR_CONT_IF_TRUE, - IR_CONT_IF_FALSE, /* Children[0] = the condition expression */ IR_MOVE, |