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@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c
index 3dd423eadd7909b0b47f121202a3f6aad2b4402a..ceae282378e3c3dc65d25c0e0ae039f2d9ffe8ef 100644 (file)
--- 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 b89070b88c7dbd1c1e318ea287e80a6b8e60e821..b0f96c76f75dd96782d3600164928defaa1f026f 100644 (file)
--- 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--;