Mesa (master): i965: Drop the remaining default predication whacking.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: 1f3735bff08bdcd23a7f1f6565f072f3103d780b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f3735bff08bdcd23a7f1f6565f072f3103d780b

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Jun  5 22:59:10 2014 -0700

i965: Drop the remaining default predication whacking.

With my earlier cleaning in place (see git log brw_eu_emit.c), nothing
relies on the instruction emitters for IF/WHILE/JMPI disabling
predication.  Drop it in favor of making callers do the right thing
explicitly.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

---

 src/mesa/drivers/dri/i965/brw_clip_tri.c |    1 +
 src/mesa/drivers/dri/i965/brw_eu_emit.c  |    5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c
index 3dd423e..ceae282 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
@@ -443,6 +443,7 @@ void brw_clip_tri( struct brw_clip_compile *c )
       brw_ADD(p, c->reg.clipdistance_offset, c->reg.clipdistance_offset, brw_imm_w(sizeof(float)));
    }
    brw_WHILE(p);
+   brw_set_default_predicate_control(p, BRW_PREDICATE_NONE);
 }
 
 
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index b89070b..b0f96c7 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -1192,8 +1192,6 @@ struct brw_instruction *brw_JMPI(struct brw_compile *p,
    insn->header.mask_control = BRW_MASK_DISABLE;
    insn->header.predicate_control = predicate_control;
 
-   p->current->header.predicate_control = BRW_PREDICATE_NONE;
-
    return insn;
 }
 
@@ -1286,8 +1284,6 @@ brw_IF(struct brw_compile *p, unsigned execute_size)
    if (!p->single_program_flow)
       insn->header.thread_control = BRW_THREAD_SWITCH;
 
-   p->current->header.predicate_control = BRW_PREDICATE_NONE;
-
    push_if_stack(p, insn);
    p->if_depth_in_loop[p->loop_stack_depth]++;
    return insn;
@@ -1770,7 +1766,6 @@ struct brw_instruction *brw_WHILE(struct brw_compile *p)
       }
    }
    insn->header.compression_control = BRW_COMPRESSION_NONE;
-   p->current->header.predicate_control = BRW_PREDICATE_NONE;
 
    p->loop_stack_depth--;