From: Matt Turner <mattst88@gmail.com>
Date: Mon, 5 May 2014 21:08:56 +0000 (-0700)
Subject: i965: Delete current_insn() function.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=255357f79b6bfba1583346a77f0bfa7cfc174883;p=mesa.git

i965: Delete current_insn() function.
---

diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index f10ad50e9c3..805c35b3937 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -90,11 +90,6 @@ struct brw_compile {
    int loop_stack_array_size;
 };
 
-static inline struct brw_instruction *current_insn( struct brw_compile *p)
-{
-   return &p->store[p->nr_insn];
-}
-
 void brw_pop_insn_state( struct brw_compile *p );
 void brw_push_insn_state( struct brw_compile *p );
 void brw_set_mask_control( struct brw_compile *p, unsigned value );
diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c b/src/mesa/drivers/dri/i965/test_eu_compact.c
index cc0c6e46812..26bf77bf2cd 100644
--- a/src/mesa/drivers/dri/i965/test_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/test_eu_compact.c
@@ -236,8 +236,8 @@ gen_f0_1_MOV_GRF_GRF(struct brw_compile *p)
 
    brw_push_insn_state(p);
    brw_set_predicate_control(p, true);
-   current_insn(p)->bits2.da1.flag_subreg_nr = 1;
-   brw_MOV(p, g0, g2);
+   struct brw_instruction *mov = brw_MOV(p, g0, g2);
+   mov->bits2.da1.flag_subreg_nr = 1;
    brw_pop_insn_state(p);
 }