Get rid of IR_CONT_IF_FALSE

diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 46d72e24e3c7229e4e301faf2f044c9e2893f5e1..310a9f12439d3b630293389b62747f82b9656e9b 100644 (file)
--- 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 95b154db687034a1eec3e1edf90d6c20c49f7975..dd17b4a1e0b35136516e36a1ae8b48f2ecfacc5a 100644 (file)
--- 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 a9a530aaf8f0a4b3cf9e1a83f15eccd53e57dfd1..a183ea62e2f1aed99d126470dea7df4bf3f531d3 100644 (file)
--- 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,