i965: Make the brw_inst helpers take a device_info instead of a context

Reviewed-by: Matt Turner <mattst88@gmail.com>

1 files changed, 11 insertions, 15 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
index 82d7b64..3b643f1 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
@@ -193,7 +193,6 @@ static void copy_bfc( struct brw_clip_compile *c )
 static void compute_offset( struct brw_clip_compile *c )
 {
    struct brw_compile *p = &c->func;
-   const struct brw_context *brw = p->brw;
    struct brw_reg off = c->reg.offset;
    struct brw_reg dir = c->reg.dir;
 
@@ -208,7 +207,7 @@ static void compute_offset( struct brw_clip_compile *c )
 
    brw_SEL(p, vec1(off),
            brw_abs(get_element(off, 0)), brw_abs(get_element(off, 1)));
-   brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
+   brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
 
    brw_MUL(p, vec1(off), vec1(off), brw_imm_f(c->key.offset_factor));
    brw_ADD(p, vec1(off), vec1(off), brw_imm_f(c->key.offset_units));
@@ -218,7 +217,6 @@ static void compute_offset( struct brw_clip_compile *c )
 static void merge_edgeflags( struct brw_clip_compile *c )
 {
    struct brw_compile *p = &c->func;
-   const struct brw_context *brw = p->brw;
    struct brw_reg tmp0 = get_element_ud(c->reg.tmp0, 0);
 
    brw_AND(p, tmp0, get_element_ud(c->reg.R0, 2), brw_imm_ud(PRIM_MASK));
@@ -234,20 +232,20 @@ static void merge_edgeflags( struct brw_clip_compile *c )
    brw_IF(p, BRW_EXECUTE_1);
    {
       brw_AND(p, vec1(brw_null_reg()), get_element_ud(c->reg.R0, 2), brw_imm_ud(1<<8));
-      brw_inst_set_cond_modifier(brw, brw_last_inst, BRW_CONDITIONAL_EQ);
+      brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_EQ);
       brw_MOV(p, byte_offset(c->reg.vertex[0],
                              brw_varying_to_offset(&c->vue_map,
                                                    VARYING_SLOT_EDGE)),
               brw_imm_f(0));
-      brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
+      brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
 
       brw_AND(p, vec1(brw_null_reg()), get_element_ud(c->reg.R0, 2), brw_imm_ud(1<<9));
-      brw_inst_set_cond_modifier(brw, brw_last_inst, BRW_CONDITIONAL_EQ);
+      brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_EQ);
       brw_MOV(p, byte_offset(c->reg.vertex[2],
                              brw_varying_to_offset(&c->vue_map,
                                                    VARYING_SLOT_EDGE)),
               brw_imm_f(0));
-      brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
+      brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
    }
    brw_ENDIF(p);
 }
@@ -275,7 +273,6 @@ static void emit_lines(struct brw_clip_compile *c,
 		       bool do_offset)
 {
    struct brw_compile *p = &c->func;
-   const struct brw_context *brw = p->brw;
    struct brw_indirect v0 = brw_indirect(0, 0);
    struct brw_indirect v1 = brw_indirect(1, 0);
    struct brw_indirect v0ptr = brw_indirect(2, 0);
@@ -295,10 +292,10 @@ static void emit_lines(struct brw_clip_compile *c,
 	 apply_one_offset(c, v0);
 	
 	 brw_ADD(p, c->reg.loopcount, c->reg.loopcount, brw_imm_d(-1));
-         brw_inst_set_cond_modifier(brw, brw_last_inst, BRW_CONDITIONAL_G);
+         brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_G);
       }
       brw_WHILE(p);
-      brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
+      brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
    }
 
    /* v1ptr = &inlist[nr_verts]
@@ -334,10 +331,10 @@ static void emit_lines(struct brw_clip_compile *c,
       brw_ENDIF(p);
 
       brw_ADD(p, c->reg.loopcount, c->reg.loopcount, brw_imm_d(-1));
-      brw_inst_set_cond_modifier(brw, brw_last_inst, BRW_CONDITIONAL_NZ);
+      brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_NZ);
    }
    brw_WHILE(p);
-   brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
+   brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
 }
 
 
@@ -346,7 +343,6 @@ static void emit_points(struct brw_clip_compile *c,
 			bool do_offset )
 {
    struct brw_compile *p = &c->func;
-   const struct brw_context *brw = p->brw;
 
    struct brw_indirect v0 = brw_indirect(0, 0);
    struct brw_indirect v0ptr = brw_indirect(2, 0);
@@ -378,10 +374,10 @@ static void emit_points(struct brw_clip_compile *c,
       brw_ENDIF(p);
 
       brw_ADD(p, c->reg.loopcount, c->reg.loopcount, brw_imm_d(-1));
-      brw_inst_set_cond_modifier(brw, brw_last_inst, BRW_CONDITIONAL_NZ);
+      brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_NZ);
    }
    brw_WHILE(p);
-   brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
+   brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
 }